From 690a6314dfff40e30048fe1b1cf6389b95774b82 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Wed, 11 Aug 2021 08:20:54 +0200 Subject: [PATCH] Remove requirement to specify icon class in umb-icon directive (#10805) * Wrap legacy font icon so we can inherit font from parent element * Remove icon name from class attributes * Add back class as color is part of icon * Replace icon classes * Replace icon class * Use umb-icon * Remove icon classes * Remove icon classes * Update color for SVG icons * Inherit animation * Add icon add class to SVG as well * Update umb-icon inner wrapper * Fix issue with search icon styling in property editors dialog * Formatting * Adjust umb-icon with transclude * Change back to original back icon from font awesome * Adjust styling for font icon * Replace with umb-icon * Use umb-icon in packager * Use umb-icon in help drawer * Use umb-icon in treesource prevalue editor * Update font size * Replace with umb-icon * Replace icons with umb-icon * div isn't valid inside label element * Replace more icons * Use umb-search-filter component * Update to use umb-icon * Use end-closing tag for custom HTML element * Use umb-icon component * Use umb-icon component to replace icons * Replace with umb-icon * Replace icons with umb-icon * Replace more icons * Custom HTML element should have end-closing tag * Replace icons with umb-icon * Replace icons * Remove unused variable * Replace icon * Replace icons * Revert to `` element as it was causing issues with isolated scopes * Adjust umb-checkmark to work with umb-icon * Adjust lightbox styling * Remove unused helper class and it is already available as "self-center" in _flexbox.less * remove unused class from icon, shift margin to parent element Co-authored-by: Nathan Woulfe --- .../components/umbconfirmaction.directive.js | 2 +- .../components/umbicon.directive.js | 6 +- .../src/less/components/umb-icon.less | 31 +++-- .../src/less/components/umb-lightbox.less | 118 +++++++++--------- .../components/umb-package-local-install.less | 15 +-- .../src/less/components/umb-packages.less | 51 ++++---- .../src/less/components/umb-panel-group.less | 2 +- .../less/components/umb-search-filter.less | 2 +- .../src/less/dashboards/healthcheck.less | 20 +-- src/Umbraco.Web.UI.Client/src/less/navs.less | 17 +-- .../src/views/common/drawers/help/help.html | 13 +- .../compositions/compositions.html | 12 +- .../datatypeconfigurationpicker.html | 4 +- .../datatypepicker/datatypepicker.html | 6 +- .../datatypesettings/datatypesettings.html | 2 +- .../iconpicker/iconpicker.html | 2 +- .../itempicker/itempicker.html | 23 ++-- .../macroparameterpicker.html | 4 +- .../macropicker/macropicker.html | 2 +- .../mediaentryeditor/mediaentryeditor.html | 14 ++- .../mediapicker/mediapicker.html | 2 +- .../propertysettings/propertysettings.html | 16 +-- .../querybuilder/querybuilder.html | 6 +- .../sectionpicker/sectionpicker.html | 5 +- .../templatesections/templatesections.html | 34 ++--- .../treepicker/treepicker.html | 2 +- .../usergrouppicker/usergrouppicker.html | 2 +- .../overlays/itempicker/itempicker.html | 8 +- .../src/views/common/overlays/user/user.html | 7 +- .../application/umb-app-header.html | 4 +- .../application/umb-contextmenu.html | 6 +- .../components/application/umb-login.html | 2 +- .../application/umb-navigation.html | 2 +- .../components/application/umb-search.html | 4 +- .../application/umbtour/umb-tour-step.html | 2 +- .../components/blockcard/umb-block-card.html | 1 - .../views/components/buttons/umb-button.html | 10 +- .../views/components/buttons/umb-toggle.html | 4 +- .../content/umb-content-node-info.html | 4 +- .../content/umb-variant-content.html | 2 +- .../editor/umb-editor-content-header.html | 17 ++- .../components/editor/umb-editor-header.html | 10 +- .../components/editor/umb-editor-menu.html | 2 +- .../editor/umb-editor-navigation-item.html | 2 +- .../views/components/forms/umb-checkbox.html | 4 +- .../components/forms/umb-radiobutton.html | 2 +- .../components/forms/umb-search-filter.html | 2 +- .../components/imaging/umb-image-crop.html | 6 +- .../components/media/umb-media-node-info.html | 8 +- .../components/mediacard/umb-media-card.html | 4 +- .../components/overlays/umb-overlay.html | 14 ++- .../property/umb-property-actions.html | 2 +- .../components/tags/umb-tags-editor.html | 6 +- .../views/components/tree/umb-tree-item.html | 2 +- .../components/tree/umb-tree-search-box.html | 2 +- .../tree/umb-tree-search-results.html | 2 +- .../src/views/components/tree/umb-tree.html | 4 +- .../src/views/components/umb-checkmark.html | 4 +- .../views/components/umb-child-selector.html | 6 +- .../views/components/umb-color-swatches.html | 6 +- .../views/components/umb-confirm-action.html | 24 ++-- .../views/components/umb-content-grid.html | 2 +- .../components/umb-date-time-picker.html | 4 +- .../src/views/components/umb-file-icon.html | 2 +- .../src/views/components/umb-folder-grid.html | 2 +- .../views/components/umb-grid-selector.html | 8 +- .../views/components/umb-groups-builder.html | 32 ++--- .../src/views/components/umb-icon.html | 8 +- .../views/components/umb-layout-selector.html | 4 +- .../src/views/components/umb-lightbox.html | 7 +- .../components/umb-list-view-settings.html | 4 +- .../views/components/umb-locked-field.html | 4 +- .../src/views/components/umb-media-grid.html | 14 ++- .../views/components/umb-mini-list-view.html | 10 +- .../src/views/components/umb-mini-search.html | 2 +- .../views/components/umb-node-preview.html | 2 +- .../src/views/components/umb-table.html | 4 +- .../components/upload/umb-file-dropzone.html | 10 +- .../upload/umb-property-file-upload.html | 4 +- .../users/umb-user-group-preview.html | 2 +- .../src/views/content/create.html | 8 +- .../src/views/content/overlays/schedule.html | 8 +- .../src/views/content/rights.html | 2 +- .../src/views/content/sort.html | 16 +-- .../src/views/contentblueprints/create.html | 6 +- .../views/dashboard/content/redirecturls.html | 2 +- .../dashboard/forms/formsdashboardintro.html | 2 +- .../dashboard/settings/examinemanagement.html | 9 +- .../views/dashboard/settings/healthcheck.html | 16 +-- .../src/views/datatypes/create.html | 4 +- .../datatypes/datatype.delete.controller.js | 1 - .../src/views/datatypes/delete.html | 42 ++++++- .../views/datatypes/views/datatype.info.html | 6 +- .../src/views/dictionary/list.html | 5 +- .../src/views/documenttypes/create.html | 10 +- .../src/views/documenttypes/delete.html | 2 +- .../src/views/documenttypes/property.html | 4 +- .../src/views/languages/overview.html | 2 +- .../src/views/logviewer/overview.html | 4 +- .../src/views/logviewer/search.html | 22 ++-- .../macros/infiniteeditors/parameter.html | 2 +- .../src/views/macros/views/parameters.html | 2 +- .../src/views/media/create.html | 2 +- .../src/views/media/sort.html | 16 +-- .../src/views/mediatypes/create.html | 4 +- .../src/views/mediatypes/delete.html | 2 +- .../src/views/member/create.html | 2 +- .../src/views/membertypes/create.html | 7 +- .../src/views/membertypes/delete.html | 2 +- .../src/views/packages/edit.html | 6 +- .../src/views/packages/views/created.html | 2 +- .../views/packages/views/install-local.html | 12 +- .../src/views/packages/views/installed.html | 6 +- .../src/views/packages/views/repo.html | 12 +- .../src/views/partialviewmacros/create.html | 10 +- .../src/views/partialviews/create.html | 8 +- .../views/prevalueeditors/imagepicker.html | 4 +- .../prevalueeditors/mediafolderpicker.html | 6 +- .../views/prevalueeditors/multivalues.html | 2 +- .../src/views/prevalueeditors/treesource.html | 6 +- .../inlineblock/inlineblock.editor.html | 2 +- .../labelblock/labelblock.editor.html | 2 +- .../unsupportedblock.editor.html | 2 +- .../blocklist.blockconfiguration.html | 13 +- .../blocklist.blockconfiguration.overlay.html | 12 +- .../umb-block-list-property-editor.html | 19 ++- .../blocklist/umb-block-list-row.html | 6 +- .../colorpicker/colorpicker.prevalues.html | 2 +- .../datepicker/datepicker.html | 4 +- .../grid/dialogs/layoutconfig.html | 15 ++- .../grid/dialogs/rowconfig.html | 18 +-- .../propertyeditors/grid/editors/embed.html | 2 +- .../propertyeditors/grid/editors/macro.html | 2 +- .../propertyeditors/grid/editors/media.html | 2 +- .../src/views/propertyeditors/grid/grid.html | 27 ++-- .../propertyeditors/grid/grid.prevalues.html | 20 +-- .../imagecropper/imagecropper.html | 2 +- .../imagecropper/imagecropper.prevalues.html | 2 +- .../listview/includeproperties.prevalues.html | 4 +- .../listview/layouts.prevalues.html | 6 +- .../propertyeditors/listview/listview.html | 12 +- .../mediapicker/mediapicker.html | 8 +- .../umb-media-picker3-property-editor.html | 8 +- .../multipletextbox/multipletextbox.html | 4 +- .../nestedcontent.propertyeditor.html | 11 +- .../relatedlinks/relatedlinks.html | 8 +- .../propertyeditors/urllist/urllist.html | 2 +- .../src/views/scripts/create.html | 4 +- .../src/views/stylesheets/create.html | 6 +- .../views/stylesheets/views/rules/rules.html | 2 +- .../src/views/templates/edit.html | 2 +- .../src/views/users/views/groups/groups.html | 4 +- .../src/views/users/views/users/users.html | 2 +- 153 files changed, 651 insertions(+), 591 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js index 1dcccda481c6..665b8379461a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbconfirmaction.directive.js @@ -14,7 +14,7 @@ The prompt can be opened in four direction up, down, left or right.

- + - + @example **/ @@ -33,8 +33,8 @@ Icon with additional attribute. It can be treated like any other dom element icon: "@", svgString: "=?" }, - link: function (scope, element) { + if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) { const observer = new IntersectionObserver(_lazyRequestIcon, {rootMargin: "100px"}); const iconEl = element[0]; @@ -49,6 +49,7 @@ Icon with additional attribute. It can be treated like any other dom element scope.$watch("icon", function (newValue, oldValue) { if (newValue && oldValue) { + var newicon = newValue.split(" ")[0]; var oldicon = oldValue.split(" ")[0]; @@ -64,6 +65,7 @@ Icon with additional attribute. It can be treated like any other dom element observer.disconnect(); var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker + _requestIcon(icon); } }); diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less index 318ce0a563f8..e89ed96e7956 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less @@ -8,26 +8,43 @@ width: 100%; height: 100%; fill: currentColor; + animation: inherit; } - &.large{ - width: 32px; + &.large { + width: 32px; height: 32px; } - &.medium{ + + &.medium { width: 24px; height: 24px; } - &.small{ + + &.small { width: 14px; height: 14px; } - &:before, &:after { + &::before, + &::after { content: none !important; } - > i { - font-family: inherit; + &__inner { + // Clear pseudo classes + &::before, + &::after { + content: none !important; + } + + ng-transclude { + animation: inherit; + font-family: inherit; + + > span { + animation: inherit; + } + } } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less index 6238900bf6b5..3977da188a85 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less @@ -11,68 +11,74 @@ align-items: center; justify-content: center; flex-direction: column; -} -.umb-drawer-is-visible .umb-lightbox { - width: calc(~'100%' - ~'@{drawerWidth}'); - left: @drawerWidth; -} + &__backdrop { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: rgba(21, 21, 23, 0.7); + width: 100%; + height: 100%; + } -.umb-lightbox__backdrop { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: rgba(21, 21, 23, 0.7); - width: 100%; - height: 100%; -} + &__close { + position: absolute; + top: 20px; + right: 20px; + height: 40px; + width: 40px; -.umb-lightbox__close { - position: absolute; - top: 20px; - right: 20px; - height: 40px; - width: 40px; -} + .umb-icon { + font-size: 20px; + height: inherit; + width: inherit; + position: absolute; + top: 0; + left: 0; + } + } -.umb-lightbox__close i { - font-size: 20px; - height: inherit; - width: inherit; - position: absolute; - top: 0; - left: 0; -} + &__images { + position: relative; + z-index: 1000; + max-width: calc(~'100%' - 200px); // subtract the width of the two arrow buttons + } -.umb-lightbox__images { - position: relative; - z-index: 1000; - max-width: calc(~'100%' - 200px); // subtract the width of the two arrow buttons -} + &__image { + background: @white; + border-radius: 3px; + padding: 10px; + } -.umb-lightbox__image { - background: @white; - border-radius: 3px; - padding: 10px; -} + &__control { + background-color: @white; + width: 50px; + height: 50px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + position: absolute; -.umb-lightbox__control { - background-color: @white; - width: 50px; - height: 50px; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; - position: absolute; - &:hover { - .umb-lightbox__control-icon, &::before { - color: @ui-active-type-hover; + &:hover { + .umb-lightbox__control-icon, &::before { + color: @ui-active-type-hover; + } } } + + &__control-icon { + color: @ui-active-type; + font-size: 20px; + } +} + +.umb-drawer-is-visible .umb-lightbox { + width: calc(~'100%' - ~'@{drawerWidth}'); + left: @drawerWidth; } .umb-lightbox__control.-next { @@ -94,9 +100,3 @@ margin-left: -4px; } } - -.umb-lightbox__control-icon { - color: @ui-active-type; - font-size: 20px; - -} diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less index d229bc81b6e0..ead54ac49f0d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less @@ -22,20 +22,21 @@ align-items: center; margin-bottom: 30px; transition: 100ms box-shadow ease, 100ms border ease; - + &.drag-over { border-color: @ui-action-border-hover; border-style: solid; box-shadow: 0 3px 8px rgba(0,0,0, .1); transition: 100ms box-shadow ease, 100ms border ease; } -} -.umb-upload-local__dropzone i { - display: block; - color: @ui-action-type; - font-size: 110px; - line-height: 1; + .umb-icon { + display: block; + color: @ui-action-type; + font-size: 6.75rem; + line-height: 1; + margin: 0 auto; + } } .umb-upload-local__select-file { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less index f660da8f8bee..6485e37f1a6c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -136,35 +136,40 @@ justify-content: center; opacity: .6; margin-top: 10px; -} -.umb-package-numbers small { - padding: 0 5px; - display: flex; - align-items: center; - justify-content: center; -} + small { + padding: 0 5px; + display: flex; + align-items: center; + justify-content: center; + } -.umb-package-numbers i { - font-size: 14px; + .umb-icon { + font-size: 0.9rem; + } } -.umb-package-link:hover .umb-package-numbers { - opacity: 1; -} +.umb-package-link { + &:hover { + .umb-package-numbers { + opacity: 1; -.umb-package-link:hover .umb-package-numbers .icon-hearts { - color: @red !important; -} + .icon-hearts { + color: @red !important; + } + } + } -.umb-package-link .umb-package-cloud { - margin-top: 8px; - font-size: 11px; - height: 11px; // ensures vertical space is taken up even if "works on cloud" isn't visible -} + .umb-package-cloud { + margin-top: 0.5rem; + font-size: 0.75rem; + min-height: 1rem; // ensures vertical space is taken up even if "works on cloud" isn't visible -.umb-package-link .umb-package-cloud .icon-cloud { - color: #2eadaf !important; + .umb-icon { + color: @turquoise !important; + font-size: 0.9rem; + } + } } // Version @@ -182,7 +187,7 @@ .umb-packages-categories { display: flex; - user-select: center; + user-select: none; flex-wrap: wrap; } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less index 46d7f04af6be..27d09aaa1cf5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-panel-group.less @@ -75,7 +75,7 @@ flex: 0 0 50px; display: flex; justify-content: center; - padding: 0 20px; + padding: 0.25rem 20px; } .umb-panel-group__details-status-content { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less index b38f5937c727..63164870b257 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-search-filter.less @@ -20,7 +20,7 @@ html .umb-search-filter { // "icon-search" class it kept for backward compatibility .umb-icon, - .icon-search { + i.icon-search { color: @gray-8; position: absolute; top: 0; diff --git a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less index bf01c21dcaa0..57bc1f85188b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less +++ b/src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less @@ -75,27 +75,20 @@ font-size: 13px; } -.umb-healthcheck-message i { +.umb-healthcheck-message .umb-icon { font-size: 15px; margin-right: 3px; } .umb-healthcheck-details-link { - color: @turquoise-d1; -} + color: @turquoise-d1; -.umb-healthcheck-details-link:hover { - text-decoration: none; - color: @turquoise-d1; + &:hover { + color: @turquoise-d1; + text-decoration: none; + } } - -/* Helpers */ -.align-self-center { - align-self: center; -} - - /* Spacing for boxes */ .umb-air { flex: 0 0 auto; @@ -127,7 +120,6 @@ } .umb-healthcheck-status-icon { - font-size: 20px; margin-top: 2px; } diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less index 6dab771c9403..6839a42b239e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/navs.less +++ b/src/Umbraco.Web.UI.Client/src/less/navs.less @@ -2,14 +2,15 @@ // Navs // -------------------------------------------------- -.list-icons li{ - padding-left: 35px; - max-width: 300px -} - -.list-icons li > i.icon{ - margin-left: -25px; - padding-right: 7px; +.list-icons li { + padding-left: 35px; + max-width: 300px; + + > .umb-icon, + > i.icon { + margin-left: -25px; + padding-right: 7px; + } } .umb-icon.handle, diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html index 4f6b283fd8a2..82a37e6efbff 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html @@ -46,7 +46,7 @@
ng-click="tourGroup.open = !tourGroup.open" aria-expanded="{{tourGroup.open === undefined ? false : tourGroup.open }}"> - + {{tourGroup.group}} Other @@ -101,7 +101,7 @@
{{topic.name}} - + {{topic.description}} @@ -118,9 +118,9 @@
@@ -129,7 +129,7 @@
- +
Visit umbraco.tv
@@ -139,8 +139,7 @@
- - +
Visit our.umbraco.com
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html index 98db2b0336ef..7ec69018b64c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html @@ -49,7 +49,7 @@
  • - +  {{contentTypeEntity.contentType.name}}
    • @@ -59,7 +59,7 @@
    • - + {{group.containerPath}}
    diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html index cbc5b102cc4b..7146d6dc7c4b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypeconfigurationpicker/datatypeconfigurationpicker.html @@ -26,7 +26,7 @@
    @@ -36,7 +36,7 @@
  • diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html index d19f53735459..5a3f7e9fc6e6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html @@ -37,7 +37,7 @@

    {{key | umbCmsTitleCase}}

    ng-click="vm.viewOptionsForEditor(dataType)" title="{{dataType.name}}"> - + {{dataType.name}} @@ -65,7 +65,7 @@

    {{result.group | umbCmsTitleCase}}

    ng-click="vm.pickDataType(dataType)" title="{{dataType.name}}"> - + {{dataType.name}} @@ -86,7 +86,7 @@

    {{result.group | umbCmsTitleCase}}

    ng-click="vm.pickEditor(dataType)" title="{{dataType.name}}"> - + {{dataType.name}} diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html index 77cfc705a365..a4fef2874073 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html @@ -22,7 +22,7 @@
    - + using this editor will get updated with the new settings.
    diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html index 19fe67918960..41bf92b27e8e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html @@ -44,7 +44,7 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html index 43520b00da4e..f57254ad8552 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html @@ -9,7 +9,7 @@
    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html index c9da687f0d15..f56a6c8656ad 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html @@ -26,7 +26,7 @@ Choose a root node
    - +
    @@ -40,7 +40,7 @@
    • - +
      @@ -66,7 +66,7 @@
    • - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html index c6b5e0a4fbb5..54210a522a72 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.html @@ -5,7 +5,7 @@ ng-click="vm.openBlock(block)" ng-focus="block.focus"> - + {{block.label}}
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html index a5c499350552..65530f05951f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/labelblock/labelblock.editor.html @@ -3,6 +3,6 @@ ng-focus="block.focus" ng-class="{ '--active': block.active, '--error': parentForm.$invalid && valFormManager.isShowingValidation() }" val-server-property-class=""> - + {{block.label}} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html index 2252db374545..0c0d98105d30 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/unsupportedblock/unsupportedblock.editor.html @@ -1,6 +1,6 @@
    - + {{block.label}}
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html index 2bd4be15054a..de6a40941509 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.html @@ -1,13 +1,6 @@ -
    +
    -
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html index a15a2fda25f7..cc324f70d52f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html @@ -46,7 +46,7 @@
    @@ -67,7 +67,7 @@
    @@ -113,7 +113,7 @@
    @@ -130,10 +130,10 @@
    @@ -192,7 +192,7 @@
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html index a6c1eb219955..3a1ea38da128 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html @@ -14,7 +14,7 @@ ng-controller="Umbraco.PropertyEditors.BlockListPropertyEditor.CreateButtonController as inlineCreateButtonCtrl" ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)">
    - +
    @@ -36,15 +36,14 @@ Add content Add content -
    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html index f5ac69b9b8e6..548f3aed0bfb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html @@ -20,11 +20,11 @@ val-server="value" class="datepickerinput" /> - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html index 5e05f56b4819..457986bc19bd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html @@ -44,9 +44,9 @@ {{currentSection.grid}}
    - + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html index 312c15835162..29176f6840e4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html @@ -55,7 +55,7 @@ {{currentCell.grid}}
    @@ -83,11 +83,11 @@ - - - + + + @@ -109,7 +109,7 @@ - + ({{editor.alias}}) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html index 96731098163f..d3e14c5db1f6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html @@ -1,7 +1,7 @@
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html index 300ec91bcc51..9db4c324ec0c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html @@ -2,7 +2,7 @@
    @@ -207,7 +204,7 @@
    @@ -41,7 +41,7 @@

    @@ -82,7 +82,7 @@

    {{layout.label || layout.name}}

    @@ -91,7 +91,7 @@

    @@ -116,9 +116,9 @@

    ng-model="model.value.config">
  • - + {{configValue.label}}
    • @@ -127,7 +127,7 @@

      • @@ -143,9 +143,9 @@

      ng-model="model.value.styles">
    • - + {{style.label}}
      • @@ -154,7 +154,7 @@

        • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html index 9dc1a3b91ad9..d4c4714b6727 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html @@ -45,7 +45,7 @@ on-value-changed="focalPointChanged(left, top)" on-image-loaded="imageLoaded(isCroppable, hasDimensions)"> - +

    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html index 9589909639e1..7d08ce43e498 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html @@ -60,7 +60,7 @@
    - +

    {{item.alias}} ({{item.width}}px × {{item.height}}px)

    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html index 7d863f6730c9..5db348dbffa4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html @@ -27,7 +27,7 @@ - +
    @@ -54,7 +54,7 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html index 295345a8278b..95bdb3644fdc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html @@ -6,7 +6,7 @@
    - +
    @@ -16,7 +16,7 @@ ng-click="vm.openIconPicker(layout)" umb-auto-focus="{{layout.isSystem !== 1}}"> - + @@ -37,7 +37,7 @@
    @@ -53,12 +53,12 @@ @@ -69,7 +69,7 @@
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html index d523bc6f2da5..daf9566e2d4d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html @@ -15,7 +15,7 @@ ng-controller="Umbraco.PropertyEditors.MediaPicker3PropertyEditor.CreateButtonController as inlineCreateButtonCtrl" ng-mousemove="inlineCreateButtonCtrl.onMouseMove($event)">
    - +
    @@ -27,10 +27,10 @@ allowed-types="vm.allowedTypes">
    @@ -45,7 +45,7 @@ ng-disabled="!vm.allowAdd" ng-click="vm.addMediaAt(vm.model.value.length, $event)">
    - + Add
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html index d1c202b86743..9e90666eacd5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html @@ -9,11 +9,11 @@ focus-when="{{item.hasFocus}}" />
    - +
    - - +
    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html index abd0c6bc8178..387b7010c953 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html @@ -12,7 +12,7 @@ - + {{link.caption}}
    @@ -21,7 +21,7 @@ @@ -34,7 +34,7 @@
    @@ -73,7 +73,7 @@
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html index ef36aae593c8..268995d1e4c9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html @@ -2,7 +2,7 @@
    • - + {{value.linkText || value.url}}
      • diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html index b9f355f09289..e11c51068eb3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html @@ -8,13 +8,13 @@
      Create an item under {{current
        • diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html index cf0b6906ca63..eb63612263aa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/create.html @@ -8,19 +8,19 @@
        Create an item under {{current
          • diff --git a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html index 8187b8815296..72ae4dc483ce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html +++ b/src/Umbraco.Web.UI.Client/src/views/stylesheets/views/rules/rules.html @@ -9,7 +9,7 @@
          Rich text editor styles
          - +
          {{rule.name}}
          diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html index 255b2c4885fa..f909bc197f6c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html @@ -49,7 +49,7 @@ title="@general_remove" ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()"> - +
          diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html index 106a8c8454d6..205f500f40c5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html @@ -81,8 +81,8 @@ ng-class="{'-selected': group.selected, '-selectable': group.hasAccess && !group.isSystemUserGroup}">
          - - + +