From 5e4b0ef26a69ff8fdfefd1ddd37b7e7f45b0ae55 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 29 Sep 2021 14:06:07 +0200
Subject: [PATCH] templates: Move spaces into conditions for cleaner html

When looking at raw html it always looks like something is missing when
there are trailing or leading spaces on attributes.
Just move the space into the conditions and it looks better.

Change-Id: I2a8d3246c43b8345eb819eae5887a39f68cfbdc0
---
 includes/templates/Button.mustache       | 2 +-
 includes/templates/Footer__row.mustache  | 2 +-
 includes/templates/Menu.mustache         | 6 +++---
 includes/templates/SearchBox.mustache    | 8 ++++----
 includes/templates/StickyHeader.mustache | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/includes/templates/Button.mustache b/includes/templates/Button.mustache
index 4263af868..e611477a0 100644
--- a/includes/templates/Button.mustache
+++ b/includes/templates/Button.mustache
@@ -2,7 +2,7 @@
 {{^href}}<button{{/href}}
 	{{#id}}id="{{.}}"{{/id}}
 	{{#event}}data-event-name="{{.}}"{{/event}}
-	class="mw-ui-button {{#is-quiet}}mw-ui-quiet{{/is-quiet}} {{#icon}}mw-ui-icon mw-ui-icon-element mw-ui-icon-{{.}}{{/icon}} {{class}}">
+	class="mw-ui-button{{#is-quiet}} mw-ui-quiet{{/is-quiet}}{{#icon}} mw-ui-icon mw-ui-icon-element mw-ui-icon-{{.}}{{/icon}} {{class}}">
 	{{{html-vector-button-icon}}}
 	<span>{{label}}</span>
 {{#href}}</a>{{/href}}
diff --git a/includes/templates/Footer__row.mustache b/includes/templates/Footer__row.mustache
index a51119b9b..e39cecb7a 100644
--- a/includes/templates/Footer__row.mustache
+++ b/includes/templates/Footer__row.mustache
@@ -1,4 +1,4 @@
-<ul id="{{id}}" {{#className}}class="{{.}}"{{/className}}>
+<ul id="{{id}}"{{#className}} class="{{.}}"{{/className}}>
 	{{#array-items}}
 	<li id="{{id}}">{{{html}}}</li>
 	{{/array-items}}
diff --git a/includes/templates/Menu.mustache b/includes/templates/Menu.mustache
index 1e7c7265d..c0c488438 100644
--- a/includes/templates/Menu.mustache
+++ b/includes/templates/Menu.mustache
@@ -2,7 +2,7 @@
 	See @typedef MenuDefinition
 }}
 {{! `role` is unnecessary but kept to support selectors in any gadgets or user styles. }}
-<nav id="{{id}}" {{#class}}class="{{.}}"{{/class}} aria-labelledby="{{id}}-label" role="navigation" {{{html-tooltip}}}
+<nav id="{{id}}"{{#class}} class="{{.}}"{{/class}} aria-labelledby="{{id}}-label" role="navigation" {{{html-tooltip}}}
 	 {{{html-user-language-attributes}}}>
 	{{#is-dropdown}}
 	<input type="checkbox"
@@ -10,9 +10,9 @@
 		role="button"
 		aria-haspopup="true"
 		data-event-name="ui.dropdown-{{id}}"
-		class="{{#checkbox-class}}{{.}}{{/checkbox-class}} vector-menu-checkbox" aria-labelledby="{{id}}-label" />
+		class="{{#checkbox-class}}{{.}} {{/checkbox-class}}vector-menu-checkbox" aria-labelledby="{{id}}-label" />
 	{{/is-dropdown}}
-	<h3 id="{{id}}-label" aria-label="{{aria-label}}" {{#heading-class}}class="{{.}}"{{/heading-class}} {{^is-legacy}}aria-hidden="true"{{/is-legacy}}>
+	<h3 id="{{id}}-label" aria-label="{{aria-label}}"{{#heading-class}} class="{{.}}"{{/heading-class}}{{^is-legacy}} aria-hidden="true"{{/is-legacy}}>
 		{{{html-vector-heading-icon}}}
 		<span>{{label}}</span>
 		{{#is-dropdown}}
diff --git a/includes/templates/SearchBox.mustache b/includes/templates/SearchBox.mustache
index 784f7c4d4..85a0df341 100644
--- a/includes/templates/SearchBox.mustache
+++ b/includes/templates/SearchBox.mustache
@@ -1,11 +1,11 @@
 {{!
  See @typedef SearchData
 }}
-<div {{#is-primary}}id="p-search"{{/is-primary}} role="search" class="{{class}} vector-search-box">
+<div{{#is-primary}} id="p-search"{{/is-primary}} role="search" class="{{class}} vector-search-box">
 	<div>
 		{{#is-legacy}}
 			<h3 {{{html-user-language-attributes}}}>
-				<label {{#is-primary}}for="searchInput"{{/is-primary}}>{{msg-search}}</label>
+				<label{{#is-primary}} for="searchInput"{{/is-primary}}>{{msg-search}}</label>
 			</h3>
 		{{/is-legacy}}
 		<form action="{{form-action}}" id="{{form-id}}"
@@ -29,9 +29,9 @@
 						* The mediawiki.searchSuggest module, after doing tests for the broken browsers, removes
 							the 'fulltext' button and handles 'fulltext' search itself; this will reveal the 'go'
 							button and cause it to be used.	!}}
-				<input {{#is-primary}}id="mw-searchButton"{{/is-primary}}
+				<input{{#is-primary}} id="mw-searchButton"{{/is-primary}}
 					{{{html-button-fulltext-attributes}}} value="{{msg-searchbutton}}" />
-				<input {{#is-primary}}id="searchButton"{{/is-primary}}
+				<input{{#is-primary}} id="searchButton"{{/is-primary}}
 					{{{html-button-go-attributes}}} value="{{msg-searcharticle}}" />
 			</div>
 		</form>
diff --git a/includes/templates/StickyHeader.mustache b/includes/templates/StickyHeader.mustache
index fb306c906..31dc8ca1d 100644
--- a/includes/templates/StickyHeader.mustache
+++ b/includes/templates/StickyHeader.mustache
@@ -1,5 +1,5 @@
 <header id="vector-sticky-header"
-	class="vector-sticky-header {{#is-visible}}vector-sticky-header-visible{{/is-visible}}">
+	class="vector-sticky-header{{#is-visible}} vector-sticky-header-visible{{/is-visible}}">
 	<div class="vector-sticky-header-start">
 		<div class="vector-sticky-header-icon-start">
 			{{#data-button-start}}