TASK: fix even more icons in Neos.Neos

neos · Apr 19, 2018 · 23c72ca · 23c72ca
1 parent a886f04
commit 23c72ca
Show file tree

Hide file tree

Showing 31 changed files with 97 additions and 88 deletions.
diff --git a/Resources/Private/Partials/Module/Shared/EditUser.html b/Resources/Private/Partials/Module/Shared/EditUser.html
@@ -122,7 +122,7 @@
 						<td class="neos-action">
 							<div class="neos-pull-right">
 								<button type="button" class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'clickToDelete', source: 'Modules', package: 'Neos.Neos')}" data-toggle="modal" href="#electronicAddress-{index}">
-									<i class="fas fa-trash icon-white"></i>
+									<i class="fas fa-trash-alt icon-white"></i>
 								</button>
 								<div class="neos-hide" id="electronicAddress-{index}">
 									<div class="neos-modal-centered">

diff --git a/Resources/Private/Styles/Foundation/_buttons.scss b/Resources/Private/Styles/Foundation/_buttons.scss
@@ -64,8 +64,8 @@ button,
 		@include opacity(.65);
 	}
 
-	&[class^="icon-"],
-	&[class*=" icon-"] {
+	&[class^="fa-"],
+	&[class*=" fa-"] {
 		font-family: FontAwesome;
 	}
 

diff --git a/Resources/Private/Styles/Foundation/_dropdowns.scss b/Resources/Private/Styles/Foundation/_dropdowns.scss
@@ -87,8 +87,8 @@
 				color: #fff;
 			}
 
-			[class^="icon-"],
-			[class*=" icon-"] {
+			[class^="fa-"],
+			[class*=" fa-"] {
 				margin: 0 $relatedMargin;
 				line-height: $unit;
 				vertical-align: top;
@@ -161,8 +161,8 @@
 					color: #fff;
 				}
 
-				[class^="icon-"],
-				[class*=" icon-"] {
+				[class^="fa-"],
+				[class*=" fa-"] {
 					margin: 0 $relatedMargin;
 					line-height: $unit;
 					vertical-align: top;

diff --git a/Resources/Private/Styles/Foundation/_navs.scss b/Resources/Private/Styles/Foundation/_navs.scss
@@ -75,8 +75,8 @@
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: $linkColor;
 }
-.neos-nav-list [class^="icon-"],
-.neos-nav-list [class*=" icon-"] {
+.neos-nav-list [class^="fa-"],
+.neos-nav-list [class*=" fa-"] {
   margin-right: 2px;
 }
 // Dividers (basically an hr) within the dropdown

diff --git a/Resources/Private/Styles/Inspector/_Inspector.scss b/Resources/Private/Styles/Inspector/_Inspector.scss
@@ -608,8 +608,8 @@
 			@include box-sizing(border-box);
 			font-size: 14px;
 
-			[class^="icon-"],
-			[class*=" icon-"] {
+			[class^="fa-"],
+			[class*=" fa-"] {
 				vertical-align: top;
 			}
 

diff --git a/Resources/Private/Styles/_General.scss b/Resources/Private/Styles/_General.scss
@@ -32,7 +32,7 @@ a {
 	}
 }
 
-[class^="icon-"], [class*=" icon-"] {
+[class^="fa-"], [class*=" fa-"] {
 	@include icon-font($baseIconFontFamily, 14px);
 	text-align: center;
 }

diff --git a/Resources/Private/Styles/_InlineEditing.scss b/Resources/Private/Styles/_InlineEditing.scss
@@ -32,8 +32,8 @@
 	}
 
 	/** Reset stuff fron Neos icons **/
-	[class^="icon-"],
-	[class*=" icon-"] {
+	[class^="fa-"],
+	[class*=" fa-"] {
 		width: inherit;
 		height: inherit;
 		line-height: inherit;

diff --git a/Resources/Private/Styles/_Notifications.scss b/Resources/Private/Styles/_Notifications.scss
@@ -76,7 +76,7 @@
 			padding: 0;
 			margin: 0;
 			font-family: FontAwesome;
-			font-weight: normal;
+			font-weight: 900;
 			font-style: normal;
 			text-decoration: inherit;
 			-webkit-font-smoothing: antialiased;
@@ -94,6 +94,7 @@
 				right: 0;
 				cursor: pointer;
 				font-size: 18px;
+				@extend .fas;
 				@extend .#{$fa-css-prefix}-times-circle;
 
 				&:hover {

diff --git a/Resources/Private/Templates/Module/Administration/Sites/Edit.html b/Resources/Private/Templates/Module/Administration/Sites/Edit.html
@@ -86,7 +86,7 @@ <h2>{site.name}</h2>
 											</f:else>
 										</f:if>
 										<button class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'clickToDelete', value: 'Click to delete')}" data-toggle="modal" href="#{site.nodeName}-{number}" data-neos-toggle="tooltip">
-											<i class="fas fa-trash icon-white"></i>
+											<i class="fas fa-trash-alt icon-white"></i>
 										</button>
 										<div class="neos-hide" id="{site.nodeName}-{number}">
 											<div class="neos-modal-centered">

diff --git a/Resources/Private/Templates/Module/Administration/Sites/Index.html b/Resources/Private/Templates/Module/Administration/Sites/Index.html
@@ -61,7 +61,7 @@
 											</f:else>
 										</f:if>
 										<button class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'clickToDelete', value: 'Click to delete')}" data-toggle="modal" href="#{site.nodeName}" data-neos-toggle="tooltip">
-											<i class="fas fa-trash icon-white"></i>
+											<i class="fas fa-trash-alt icon-white"></i>
 										</button>
 										<div class="neos-hide" id="{site.nodeName}">
 											<div class="neos-modal-centered">

diff --git a/Resources/Private/Templates/Module/Administration/Users/Index.html b/Resources/Private/Templates/Module/Administration/Users/Index.html
@@ -30,11 +30,11 @@
 
 							<f:if condition="{currentUser} === {user}">
 								<f:then>
-									<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'users.tooltip.cannotDeleteYourself', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash icon-white"></i></button>
+									<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'users.tooltip.cannotDeleteYourself', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash-alt icon-white"></i></button>
 								</f:then>
 								<f:else>
 									<button class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'users.tooltip.delete', source: 'Modules', package: 'Neos.Neos')}" data-toggle="modal" href="#user-{index}" data-neos-toggle="tooltip">
-										<i class="fas fa-trash icon-white"></i>
+										<i class="fas fa-trash-alt icon-white"></i>
 									</button>
 									<div class="neos-hide" id="user-{index}">
 										<div class="neos-modal-centered">

diff --git a/Resources/Private/Templates/Module/Administration/Users/Show.html b/Resources/Private/Templates/Module/Administration/Users/Show.html
@@ -96,12 +96,12 @@ <h2>{neos:backend.translate(id: 'users.show.subtitle', value: 'Details for user'
 		<f:if condition="{currentUser} === {user}">
 			<f:then>
 				<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'users.show.cannotDeleteYourself', value: 'You are logged in as this user and you cannot delete yourself.', source: 'Modules', package: 'Neos.Neos')}">
-					<i class="fas fa-trash icon-white"></i> {neos:backend.translate(id: 'users.show.deleteUser', value: 'Delete User', source: 'Modules', package: 'Neos.Neos')}
+					<i class="fas fa-trash-alt icon-white"></i> {neos:backend.translate(id: 'users.show.deleteUser', value: 'Delete User', source: 'Modules', package: 'Neos.Neos')}
 				</button>
 			</f:then>
 			<f:else>
 				<button class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'users.show.clickToDeleteUser', value: 'Click here to delete this user', source: 'Modules', package: 'Neos.Neos')}" data-toggle="modal" href="#delete">
-					<i class="fas fa-trash icon-white"></i> {neos:backend.translate(id: 'users.show.deleteUser', value: 'Delete User', source: 'Modules', package: 'Neos.Neos')}
+					<i class="fas fa-trash-alt icon-white"></i> {neos:backend.translate(id: 'users.show.deleteUser', value: 'Delete User', source: 'Modules', package: 'Neos.Neos')}
 				</button>
 			</f:else>
 		</f:if>

diff --git a/Resources/Private/Templates/Module/Management/Workspaces/Index.html b/Resources/Private/Templates/Module/Management/Workspaces/Index.html
@@ -96,22 +96,22 @@
 
 								<f:if condition="{userWorkspace} === {workspace}">
 									<f:then>
-										<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'workspaces.help.cantDeletePersonalWorkspace', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash icon-white"></i></button>
+										<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'workspaces.help.cantDeletePersonalWorkspace', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash-alt icon-white"></i></button>
 									</f:then>
 									<f:else>
 										<f:if condition="{changesCounts.total} != 0">
 											<f:then>
-												<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'workspaces.help.workspaceContainsChanges', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash icon-white"></i></button>
+												<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'workspaces.help.workspaceContainsChanges', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash-alt icon-white"></i></button>
 											</f:then>
 											<f:else>
 												<f:if condition="{dependentWorkspacesCount} != 0">
 													<f:then>
-														<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'workspaces.help.cantDeleteWorkspaceHasDependencies', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash icon-white"></i></button>
+														<button class="neos-button neos-button-danger neos-disabled" title="{neos:backend.translate(id: 'workspaces.help.cantDeleteWorkspaceHasDependencies', source: 'Modules', package: 'Neos.Neos')}" data-neos-toggle="tooltip"><i class="fas fa-trash-alt icon-white"></i></button>
 													</f:then>
 													<f:else>
 														<f:if condition="{canManage}">
 															<button class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'workspaces.deleteWorkspace', source: 'Modules', package: 'Neos.Neos')}" data-toggle="modal" href="#workspace-{workspacesIterator.index}" data-neos-toggle="tooltip">
-																<i class="fas fa-trash icon-white"></i>
+																<i class="fas fa-trash-alt icon-white"></i>
 															</button>
 															<div class="neos-hide" id="workspace-{workspacesIterator.index}">
 																<div class="neos-modal-centered">

diff --git a/Resources/Private/Templates/Module/Management/Workspaces/Show.html b/Resources/Private/Templates/Module/Management/Workspaces/Show.html
@@ -70,11 +70,11 @@
 										<td class="neos-action">
 											<f:if condition="{canPublishToBaseWorkspace}">
 												<button form="postHelper" formaction="{f:uri.action(action: 'publishNode', arguments: {node: change.node.contextPath, selectedWorkspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-success neos-pull-right" title="{neos:backend.translate(id: 'publish', source: 'Main', package: 'Neos.Neos')}" data-neos-toggle="tooltip">
-													<i class="fas fa-ok icon-white"></i>
+													<i class="fas fa-check icon-white"></i>
 												</button>
 											</f:if>
 											<button form="postHelper" formaction="{f:uri.action(action: 'discardNode', arguments: {node: change.node.contextPath, selectedWorkspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-danger neos-pull-right" title="{neos:backend.translate(id: 'discard', source: 'Main', package: 'Neos.Neos')}" data-neos-toggle="tooltip" data-placement="bottom">
-												<i class="fas fa-trash icon-white"></i>
+												<i class="fas fa-trash-alt icon-white"></i>
 											</button>
 										</td>
 									</tr>
@@ -97,7 +97,7 @@
 						<div class="neos-modal-footer">
 							<a href="#" class="neos-button" data-dismiss="modal">{neos:backend.translate(id: 'cancel', source: 'Main', package: 'Neos.Neos')}</a>
 							<button form="postHelper" formaction="{f:uri.action(action: 'discardWorkspace', arguments: {workspace: selectedWorkspace})}" type="submit" class="neos-button neos-button-danger">
-								<i class="fas fa-trash icon-white"></i>
+								<i class="fas fa-trash-alt icon-white"></i>
 								{neos:backend.translate(id: 'workspaces.discardAllChanges', source: 'Modules', package: 'Neos.Neos')}
 							</button>
 						</div>
@@ -172,10 +172,10 @@
 
 <f:section name="actions">
 	<div class="neos-footer">
-		<div class="pull-left">
+		<div class="neos-pull-left">
 			<f:link.action action="index" class="neos-button">{neos:backend.translate(id: 'back', source: 'Main', package: 'Neos.Neos')}</f:link.action>
 		</div>
-		<div class="pull-right">
+		<div class="neos-pull-right">
 			<f:if condition="{canPublishToBaseWorkspace}">
 				<f:then>
 					<button type="submit" name="moduleArguments[action]" value="publish" class="neos-button neos-hidden neos-disabled batch-action" disabled="disabled">{neos:backend.translate(id: 'workspaces.publishSelectedChanges', source: 'Modules', package: 'Neos.Neos')}</button>

diff --git a/Resources/Public/JavaScript/Content/Components/AbstractPositionSelectorButton.js b/Resources/Public/JavaScript/Content/Components/AbstractPositionSelectorButton.js
@@ -108,7 +108,7 @@ function (
 			// Set position to either `into`, `before` or `after` when using
 			position: Ember.required(),
 
-			tagName: 'span',
+			tagName: 'button',
 
 			type: null, // "new" or "paste"
 

diff --git a/Resources/Public/JavaScript/Content/Components/Button.js b/Resources/Public/JavaScript/Content/Components/Button.js
@@ -26,7 +26,7 @@ define(
 			icon: '',
 			iconClass: function() {
 				var icon = this.get('icon');
-				return icon !== '' ? 'icon-' + icon : '';
+				return icon !== '' ? 'fas fa-' + icon : '';
 			}.property('icon'),
 
 			/**

diff --git a/Resources/Public/JavaScript/Content/Components/SaveIndicator.html b/Resources/Public/JavaScript/Content/Components/SaveIndicator.html
@@ -2,6 +2,6 @@
 	<button class="neos-button neos-indicator neos-indicator-saving"><span class="icon-white fas fa-sync-alt"></span> {{translate id="saving" fallback="Saving..."}}</button>
 {{else}}
 	{{#if view.lastSuccessfulTransfer}}
-		<button class="neos-button neos-indicator neos-indicator-saved" {{bindAttr title="view.lastSuccessfulTransferLabel"}}><span class="icon-white fas fa-ok"></span> {{translate id="saved" fallback="Saved"}}</button>
+		<button class="neos-button neos-indicator neos-indicator-saved" {{bindAttr title="view.lastSuccessfulTransferLabel"}}><span class="icon-white fas fa-check"></span> {{translate id="saved" fallback="Saved"}}</button>
 	{{/if}}
 {{/if}}
diff --git a/Resources/Public/JavaScript/Content/Inspector/Editors/ImageEditorCrop.html b/Resources/Public/JavaScript/Content/Inspector/Editors/ImageEditorCrop.html
@@ -12,7 +12,7 @@
 		{{view Ember.Select contentBinding="view.aspectRatioOptions" optionLabelPath="content.label" optionValuePath="content.key" valueBinding="view.selection"}}
 		{{#if view.aspectRatioAllowCustom}}
 			{{input valueBinding="view.aspectRatioWidth" type="number"}}
-			<button {{action "exchangeAspectRatio" target="view"}}><i class="fas fa-exchange"></i></button>
+			<button {{action "exchangeAspectRatio" target="view"}}><i class="fas fa-exchange-alt"></i></button>
 			{{input valueBinding="view.aspectRatioHeight" type="number"}}
 		{{else}}
 			<input {{bindAttr value="view.aspectRatioWidth"}} type="number" readonly="readonly" />

diff --git a/Resources/Public/JavaScript/Content/Navigate/ContextStructureTree.html b/Resources/Public/JavaScript/Content/Navigate/ContextStructureTree.html
@@ -8,7 +8,7 @@
 				<i class="fas fa-sync-alt"></i>
 			</button>
 			<button class="neos-button neos-node-tree-delete-node" title="{{translate id='delete' fallback='Delete'}}" {{bindAttr disabled="view.currentFocusedNodeCantBeModified"}} {{action "showDeleteNodeDialog" target="view"}} data-neos-tooltip data-placement="top">
-				<i class="fas fa-trash"></i>
+				<i class="fas fa-trash-alt"></i>
 			</button>
 
 			{{view view.PastePositionSelectorButton}}

diff --git a/Resources/Public/JavaScript/Content/Navigate/NodeTree.html b/Resources/Public/JavaScript/Content/Navigate/NodeTree.html
@@ -4,7 +4,7 @@
 			<i class="fas fa-sync-alt"></i>
 		</button>
 		<button id="neos-node-tree-delete-node" class="neos-button" title="{{translate id='delete' fallback='Delete'}}" {{bindAttr disabled="view.currentFocusedNodeCantBeModified"}} {{action "showDeleteNodeDialog" target="view"}} data-neos-tooltip data-placement="top">
-			<i class="fas fa-trash"></i>
+			<i class="fas fa-trash-alt"></i>
 		</button>
 
 		{{view view.PastePositionSelectorButton}}
@@ -35,7 +35,7 @@
 		</div>
 		<div id="neos-node-tree-search">
 			{{view view.searchField valueBinding="view.searchTerm"}}
-			<span {{bindAttr class="view.searchTermIsEmpty:icon-search:icon-remove-sign"}} {{action "clearSearchTerm" target="view"}}></span>
+			<span {{bindAttr class="view.searchTermIsEmpty:icon-search:fas fa-times-circle"}} {{action "clearSearchTerm" target="view"}}></span>
 		</div>
 	</div>
 </div>

diff --git a/Resources/Public/JavaScript/ContentModule-built.js b/Resources/Public/JavaScript/ContentModule-built.js
diff --git a/Resources/Public/JavaScript/InlineEditing/InlineEditingHandles.html b/Resources/Public/JavaScript/InlineEditing/InlineEditingHandles.html
@@ -18,7 +18,7 @@
 			{{view view.PastePositionSelectorButton}}
 
 			<button class="neos-button action-remove" title="{{translate id='delete' fallback='Delete'}}" {{bindAttr disabled="view.currentFocusedNodeCanBeModified"}} {{action "remove" target="view"}} tabindex="-1" neos-data-tooltip>
-				<i class="fas fa-trash"></i>
+				<i class="fas fa-trash-alt"></i>
 			</button>
 		{{/if}}
 	</div>

diff --git a/Resources/Public/JavaScript/Shared/Notification.js b/Resources/Public/JavaScript/Shared/Notification.js
@@ -38,7 +38,7 @@ function(
 				},
 				titleClass: 'neos-title',
 				messageClass: 'neos-message',
-				closeHtml: '<i class="icon-remove"></i>',
+				closeHtml: '<i class="fas fa-times"></i>',
 				closeButton: false,
 				positionClass: 'neos-notification-top',
 				showMethod: 'slideDown',

diff --git a/Resources/Public/Library/fontawesome/scss/fa-brands.scss b/Resources/Public/Library/fontawesome/scss/fa-brands.scss
@@ -17,5 +17,5 @@
 }
 
 .fab {
-  font-family: 'FontAwesome Brand';
+  font-family: 'FontAwesome Brand' !important;
 }
diff --git a/Resources/Public/Library/fontawesome/scss/fa-regular.scss b/Resources/Public/Library/fontawesome/scss/fa-regular.scss
@@ -17,6 +17,6 @@
 }
 
 .far {
-  font-family: 'FontAwesome';
-  font-weight: 400;
+  font-family: 'FontAwesome' !important;
+  font-weight: 400 !important;
 }
diff --git a/Resources/Public/Library/fontawesome/scss/fa-solid.scss b/Resources/Public/Library/fontawesome/scss/fa-solid.scss
@@ -20,5 +20,5 @@
 .fa,
 .fas {
   font-family: 'FontAwesome' !important;
-  font-weight: 900;
+  font-weight: 900 !important;
 }
diff --git a/Resources/Public/Library/jquery-with-dependencies.js b/Resources/Public/Library/jquery-with-dependencies.js
@@ -28883,7 +28883,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 "class": "neos-select2-container"
             }).html([
                 "<a href='javascript:void(0)' onclick='return false;' class='neos-select2-choice' tabindex='-1'>",
-                "   <span class='neos-select2-chosen'>&nbsp;</span><abbr class='neos-select2-search-choice-close'><i class='icon-remove'></i></abbr>",
+                "   <span class='neos-select2-chosen'>&nbsp;</span><abbr class='neos-select2-search-choice-close'><i class='fas fa-times'></i></abbr>",
                 "   <span class='neos-select2-arrow'><b></b></span>",
                 "</a>",
                 "<input class='neos-select2-focusser neos-select2-offscreen' type='text'/>",
@@ -29882,7 +29882,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 enabledItem = $(
                     "<li class='neos-select2-search-choice'>" +
                     "    <div></div>" +
-                    "    <a href='#' onclick='return false;' class='neos-select2-search-choice-close'><i class='icon-remove'></i></a>" +
+                    "    <a href='#' onclick='return false;' class='neos-select2-search-choice-close'><i class='fas fa-times'></i></a>" +
                     "</li>"),
                 disabledItem = $(
                     "<li class='neos-select2-search-choice neos-select2-locked'>" +

diff --git a/Resources/Public/Library/select2.js b/Resources/Public/Library/select2.js
@@ -1808,7 +1808,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 "class": "neos-select2-container"
             }).html([
                 "<a href='javascript:void(0)' onclick='return false;' class='neos-select2-choice' tabindex='-1'>",
-                "   <span class='neos-select2-chosen'>&nbsp;</span><abbr class='neos-select2-search-choice-close'><i class='icon-remove'></i></abbr>",
+                "   <span class='neos-select2-chosen'>&nbsp;</span><abbr class='neos-select2-search-choice-close'><i class='fas fa-times'></i></abbr>",
                 "   <span class='neos-select2-arrow'><b></b></span>",
                 "</a>",
                 "<input class='neos-select2-focusser neos-select2-offscreen' type='text'/>",
@@ -2807,7 +2807,7 @@ the specific language governing permissions and limitations under the Apache Lic
                 enabledItem = $(
                     "<li class='neos-select2-search-choice'>" +
                     "    <div></div>" +
-                    "    <a href='#' onclick='return false;' class='neos-select2-search-choice-close'><i class='icon-remove'></i></a>" +
+                    "    <a href='#' onclick='return false;' class='neos-select2-search-choice-close'><i class='fas fa-times'></i></a>" +
                     "</li>"),
                 disabledItem = $(
                     "<li class='neos-select2-search-choice neos-select2-locked'>" +