Remove  

the-djmaze · Feb 8, 2021 · 6691a3f · 6691a3f
1 parent 3fa9bc6
commit 6691a3f
Show file tree

Hide file tree

Showing 36 changed files with 12 additions and 112 deletions.
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
@@ -7,6 +7,12 @@
 	height: 1em;
 }
 
+.fontastic + span,
+[class^="icon-"] + span,
+[class*=" icon-"] + span {
+	margin-left: 0.5em;
+}
+
 [class^="icon-"],
 [class*=" icon-"] {
 	line-height: 1;

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -74,7 +74,6 @@ <h4 data-i18n="TAB_CONTACTS/ALERT_NOTICE"></h4>
 				<div class="controls">
 					<a class="btn" data-bind="command: testContactsCommand, css: { 'btn-success': testContactsSuccess, 'btn-danger': testContactsError }">
 						<i data-bind="css: {'icon-info': !testing(), 'icon-spinner': testing(), 'icon-white': testContactsSuccess() || testContactsError() }"></i>
-						&nbsp;&nbsp;
 						<span data-i18n="TAB_CONTACTS/BUTTON_TEST"></span>
 					</a>
 				</div>
@@ -94,7 +93,6 @@ <h4 data-i18n="TAB_CONTACTS/ALERT_NOTICE"></h4>
 				<div class="controls">
 					<a class="btn" data-bind="command: testContactsCommand, css: { 'btn-success': testContactsSuccess, 'btn-danger': testContactsError }">
 						<i data-bind="css: {'icon-info': !testing(), 'icon-spinner': testing(), 'icon-white': testContactsSuccess() || testContactsError() }"></i>
-						&nbsp;&nbsp;
 						<span data-i18n="TAB_CONTACTS/BUTTON_TEST"></span>
 					</a>
 				</div>

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -3,13 +3,11 @@
 	<div>
 		<a class="btn" data-bind="click: createDomain">
 			<i class="icon-plus"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></span>
 		</a>
 		&nbsp;&nbsp;
 		<a class="btn" data-bind="click: createDomainAlias">
 			<i class="icon-plus"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></span>
 		</a>
 		<br />
@@ -27,4 +25,4 @@
 			<tbody data-bind="template: { name: 'AdminSettingsDomainListItem', foreach: domains }"></tbody>
 		</table>
 	</div>
-</div>
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -103,7 +103,6 @@
 			<div class="controls">
 				<a class="btn" data-bind="command: saveNewAdminPasswordCommand, css: { 'btn-success': adminPasswordUpdateSuccess, 'btn-danger': adminPasswordUpdateError }">
 					<i class="fontastic" data-bind="css: {'icon-white': adminPasswordUpdateSuccess() || adminPasswordUpdateError() }">🔑></i>
-					&nbsp;&nbsp;
 					<span data-i18n="TAB_SECURITY/BUTTON_UPDATE_PASSWORD"></span>
 				</a>
 			</div>

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -226,28 +226,23 @@ <h3 data-bind="text: headerText"></h3>
 		   'btn-success': testingDone() && !testingImapError() && !testingSmtpError(),
 		   'btn-danger': testingDone() && (testingImapError() || testingSmtpError()) }">
 			<i data-bind="css: {'icon-info': !testing(), 'icon-spinner': testing(), 'icon-white': testingDone()}"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_TEST"></span>
 		</a>
 		<a class="btn button-white-list pull-left" data-bind="command: whiteListCommand, visible: 'main' === page()">
 			<i class="fontastic">👥</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></span>
 		</a>
 		<a class="btn button-white-list pull-left" data-bind="command: backCommand, visible: 'main' !== page()">
 			<i class="icon-left"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_BACK"></span>
 		</a>
 		<a class="btn buttonClose" data-bind="command: cancelCommand">
 			<i class="fontastic">✖</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: createOrAddCommand">
 			<i data-bind="css: edit() ? 'icon-ok' : 'icon-plus', visible: !saving()"></i>
 			<i class="icon-spinner" data-bind="visible: saving"></i>
-			&nbsp;&nbsp;
 			<span data-bind="visible: !edit()" data-i18n="POPUPS_DOMAIN/BUTTON_ADD"></span>
 			<span data-bind="visible: edit()" data-i18n="POPUPS_DOMAIN/BUTTON_UPDATE"></span>
 		</a>

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
@@ -38,13 +38,11 @@ <h3 data-i18n="POPUPS_DOMAIN_ALIAS/TITLE_ADD_DOMAIN_ALIAS"></h3>
 	<div class="modal-footer">
 		<a class="btn buttonClose" data-bind="command: cancelCommand">
 			<i class="fontastic">✖</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: createCommand">
 			<i class="icon-plus" data-bind="visible: !saving()"></i>
 			<i class="icon-spinner" data-bind="visible: saving"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_ADD"></span>
 		</a>
 	</div>

diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
@@ -25,12 +25,10 @@ <h4>
 	<div class="modal-footer">
 		<a class="btn buttonClose" data-bind="command: cancelCommand">
 			<i class="fontastic">✖</i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></span>
 		</a>
 		<a class="btn buttonClear" data-bind="command: saveCommand, visible: hasConfiguration">
 			<i class="icon-ok"></i>
-			&nbsp;&nbsp;
 			<span data-i18n="POPUPS_PLUGIN/BUTTON_SAVE"></span>
 		</a>
 	</div>

diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html
@@ -11,12 +11,10 @@
 		<div class="modal-footer">
 			<button class="btn buttonYes" data-bind="click: yesClick">
 				<i class="icon-ok"></i>
-				&nbsp;&nbsp;
 				<span data-bind="text: yesButton"></span>
 			</button>
 			<button class="btn buttonNo" data-bind="click: noClick">
 				<i class="fontastic">✖</i>
-				&nbsp;&nbsp;
 				<span data-bind="text: noButton"></span>
 			</button>
 		</div>

diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
@@ -4,7 +4,6 @@
 		'icon-checkbox-unchecked': !value()
 	}"></i>
 <!-- ko if: labeled -->
-	&nbsp;&nbsp;
 	<span class="sub-label i18n" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
 <!-- /ko -->
 </span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -75,57 +75,49 @@
 							<li class="e-item" role="presentation" data-bind="click: listUnsetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_UNSET_SEEN"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_SEEN"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_FLAG"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listUnsetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_UNSET_FLAG"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetAllSeen, css: {'disabled': !hasMessages()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									&nbsp;&nbsp;
 									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_ALL_SEEN"></span>
 								</a>
 							</li>
 						</div>
 						<li class="e-item dividerbar" role="presentation" data-bind="visible: allowComposer, command: multyForwardCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">↞</i>
-								&nbsp;&nbsp;
 								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_MULTY_FORWARD"></span>
 							</a>
 						</li>
 						<li class="e-item dividerbar" role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">🗑</i>
-								&nbsp;&nbsp;
 								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></span>
 							</a>
 						</li>
 						<li class="e-item" role="presentation" data-bind="visible: allowDangerousActions, command: clearCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">🔥</i>
-								&nbsp;&nbsp;
 								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER"></span>
 							</a>
 						</li>
@@ -155,15 +147,13 @@
 					<div class="content-wrapper">
 						<div class="listThreadUidDesc" data-bind="visible: '' !== messageListEndThreadUid(), click: cancelThreadUid">
 							<i class="icon-left" data-bind="click: cancelThreadUid"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></span>
 						</div>
 						<div class="listSearchDesc" data-bind="visible: '' !== messageListSearchDesc()">
 							<span data-bind="text: messageListSearchDesc"></span>
 						</div>
 						<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && '' === messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea">
 							<i class="icon-down e-icon"></i>
-							&nbsp;&nbsp;
 							<span class="i18n" data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
 						</div>
 						<div class="listClear" data-bind="visible: clearListIsVisible()">

diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -7,14 +7,12 @@
 						<i class="fontastic">✖</i>
 					</a>
 				</div>
-				<div class="btn-group">&nbsp;</div>
 				<div class="btn-group" data-bind="visible: isDraftFolder(), tooltip: 'MESSAGE/BUTTON_EDIT'">
 					<a class="btn btn-success buttonEdit" data-bind="command: messageEditCommand">
 						<i class="fontastic icon-white">🖉</i>
 					</a>
 				</div>
-				<div class="btn-group" data-bind="visible: !usePreviewPane()">&nbsp;</div>
-				<div class="btn-group" data-bind="visible: !usePreviewPane()">
+				<div class="btn-group">
 					<a class="btn button-archive" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled(), command: archiveCommand, tooltip: 'GLOBAL/TO_ARCHIVE'">
 						<i class="icon-archive"></i>
 					</a>
@@ -28,8 +26,7 @@
 						<i class="fontastic">🗑</i>
 					</a>
 				</div>
-				<div class="btn-group">&nbsp;</div>
-				<div class="btn-group hide-on-mobile" data-bind="visible: !usePreviewPane()">
+				<div class="btn-group">
 					<a class="btn btn-thin buttonUp" data-bind="command: goUpCommand">
 						<i class="icon-left-middle"></i>
 					</a>
@@ -84,35 +81,30 @@
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: replyCommand">
 											<i class="fontastic">←</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_REPLY"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: replyAllCommand">
 											<i class="fontastic">↞</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_REPLY_ALL"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: forwardCommand">
 											<i class="fontastic">→</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_FORWARD"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: editAsNewCommand">
 											<i class="fontastic">🖉</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: forwardAsAttachmentCommand">
 											<i class="fontastic">→</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_FORWARD_AS_ATTACHMENT"></span>
 										</a>
 									</li>
@@ -121,35 +113,30 @@
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: archiveCommand">
 											<i class="icon-archive"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/TO_ARCHIVE"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && !isSpamFolder() && !isSpamDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: spamCommand">
 											<i class="fontastic">⚠</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/SPAM"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && isSpamFolder() && !isSpamDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: notSpamCommand">
 											<i class="icon-check-mark-circle-two"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/NOT_SPAM"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: deleteCommand">
 											<i class="fontastic">🗑</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="GLOBAL/DELETE"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: message() && message().hasUnsubsribeLinks()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewUnsubscribeLink()">
 											<i class="fontastic">✖</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></span>
 										</a>
 									</li>
@@ -158,28 +145,24 @@
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="click: function () { if (message()) { message().printMessage(); }} ">
 											<i class="fontastic">🖨</i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/MENU_PRINT"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="click: function () { if (message()) { message().viewPopupMessage(); }}">
 											<i class="icon-popup"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
 										</a>
 									</li>
 									<li class="e-item dividerbar" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewViewLink()">
 											<i class="icon-file-code"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/MENU_VIEW_ORIGINAL"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewDownloadLink()">
 											<i class="icon-download"></i>
-											&nbsp;&nbsp;
 											<span class="i18n" data-i18n="MESSAGE/MENU_DOWNLOAD_ORIGINAL"></span>
 										</a>
 									</li>
@@ -303,12 +286,10 @@
 									<div class="bodySubHeader">
 										<div class="showImages" data-bind="visible: message() && message().hasImages(), click: function() { showImages(message()); }">
 											<i class="fontastic">🖼</i>
-											&nbsp;&nbsp;
 											<span class="i18n text" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></span>
 										</div>
 										<div class="readReceipt" data-bind="visible: message() && !isDraftOrSentFolder() && '' !== message().readReceipt() && !message().isReadReceipt(), click: function() { readReceipt(message()); }">
 											<i class="icon-mail"></i>
-											&nbsp;&nbsp;
 											<span class="i18n text" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></span>
 										</div>
 										<div class="attachmentsPlace" data-bind="visible: message() && message().attachments().hasVisible(),
@@ -369,7 +350,6 @@
 												<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
 												<i class="icon-file-zip" data-bind="visible: !downloadAsZipError(),
 													css: {'icon-file-zip': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
-												&nbsp;&nbsp;
 												<span class="g-ui-link" data-bind="click: downloadAsZip">
 													<span class="i18n" data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
 												</span>

diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -38,9 +38,8 @@ <h3>
 		<div class="modal-footer">
 			<a class="btn buttonAddAccount" data-bind="command: addAccountCommand">
 				<i data-bind="visible: isNew, css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<i data-bind="visible: !isNew(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				&nbsp;&nbsp;
 				<span data-bind="visible: isNew" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_ADD_ACCOUNT"></span>
+				<i data-bind="visible: !isNew(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
 				<span data-bind="visible: !isNew()" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span>
 			</a>
 		</div>

diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
@@ -98,7 +98,6 @@ <h3>
 	<div class="modal-footer">
 		<button type="submit" class="btn buttonAdvSearch" data-bind="command: searchCommand">
 			<i class="fontastic">🔎</i>
-			&nbsp;&nbsp;
 			<span class="i18n" data-i18n="GLOBAL/SEARCH"></span>
 		</a>
 	</div>