From cce8017155aef0b0ae21062bbf588448e4fa2b56 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 9 Aug 2019 11:21:44 +1000 Subject: [PATCH] reverts whitespaces changes, grid changes, thumbnail changes --- .../components/umbnodepreview.directive.js | 2 +- .../src/less/components/card.less | 70 +------------------ .../itempicker/itempicker.controller.js | 4 -- .../overlays/itempicker/itempicker.html | 52 ++++---------- .../propertyeditors/grid/grid.controller.js | 7 -- .../src/views/propertyeditors/grid/grid.html | 7 +- .../nestedcontent/nestedcontent.controller.js | 8 --- 7 files changed, 20 insertions(+), 130 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js index 4fb7abea9f..9f1f7a0d2e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js @@ -100,7 +100,7 @@ function link(scope, el, attr, ctrl) { if (!scope.editLabelKey) { - scope.editLabelKey = "general_edit"; + scope.editLabelKey = "general_edit"; } userService.getCurrentUser().then(function (u) { var isAdmin = u.userGroups.indexOf('admin') !== -1; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less index ce6119c1d1..bf9957c6b0 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/card.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less @@ -8,15 +8,7 @@ background: white; width: 100%; - .title { - padding: 12px; - color: @gray-3; - border-bottom: 1px solid @gray-8; - font-weight: 400; - font-size: 16px; - text-transform: none; - margin: 0 -10px 10px -10px; - } + .title{padding: 12px; color: @gray-3; border-bottom: 1px solid @gray-8; font-weight: 400; font-size: 16px; text-transform: none; margin: 0 -10px 10px -10px;} } @@ -34,19 +26,8 @@ } .umb-card-content { - .item-title { - color: @blackLight; - font-weight: 400; - border: none; - font-size: 16px; - text-transform: none; - margin-bottom: 3px; - } - - p { - color: @gray-3; - margin-bottom: 1px; - } + .item-title{color: @blackLight; font-weight: 400; border: none; font-size: 16px; text-transform: none; margin-bottom: 3px;} + p{color: @gray-3; margin-bottom: 1px;} } .umb-card-actions { @@ -152,51 +133,6 @@ } } -.umb-card-grid.-detailed { - .umb-card-grid-item { - padding-top: 0; - - > div { - padding: 10px; - text-align: left; - font-size: 0; - overflow: hidden; - } - } - - li { - flex: 0 0 auto; - max-width: 50%; - width: 50%; - } - - .umb-card-grid-item--title { - font-size: 15px; - font-weight: 700; - } - - .umb-card-grid-item--description { - font-size: 12px; - display: block; - } - - .umb-card-grid-item--thumbnail, - i { - max-width: 120px; - margin-right: 10px; - float: left; - border-radius:3px; - } - - i { - width: 120px; - height: 80px; - display: flex; - justify-content: center; - align-items: center; - font-size: 60px; - } -} .umb-card-grid .umb-card-grid-item:hover, .umb-card-grid .umb-card-grid-item:focus { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js index 0eb8b8f099..967b68aee5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js @@ -14,10 +14,6 @@ function ItemPickerOverlay($scope, localizationService) { } } - $scope.hasThumbs = function () { - return $scope.model.availableItems.some(x => x.thumbnail); - }; - $scope.selectItem = function (item) { $scope.model.selectedItem = item; $scope.submitForm($scope.model); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html index 4d6b251ece..b16734cf47 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html @@ -1,30 +1,26 @@
-
+
- + localize="placeholder" + placeholder="@placeholders_filter" + umb-auto-focus + no-dirty-check />
-
- Paste from clipboard -
-
-
- Create new -
+
Create new
- -
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index 5790a5764a..e5ad83e450 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -307,29 +307,22 @@ angular.module("umbraco") $scope.openEditorOverlay = function (event, area, index, key) { var title = ""; localizationService.localize("grid_insertControl").then(function (value) { - if (area.$allowedEditors.length > 1) { title = value; $scope.editorOverlay = { view: "itempicker", filter: area.$allowedEditors.length > 15, title: title, - size: area.$allowedEditors.some(x => x.thumbnail) ? 'large' : 'small', availableItems: area.$allowedEditors, event: event, show: true, submit: function (model) { if (model.selectedItem) { - console.log(model.selectedItem); $scope.addControl(model.selectedItem, area, index); $scope.editorOverlay.show = false; $scope.editorOverlay = null; } } }; - } else { - console.log(area.$allowedEditors[0]); - $scope.addControl(area.$allowedEditors[0], area, index); - } }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index e3704713cb..6b739a9b86 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -226,11 +226,7 @@
-
- - - {{ area.$allowedEditors[0].name }} -
+
@@ -304,7 +300,6 @@ ng-if="editorOverlay.show" model="editorOverlay" view="editorOverlay.view" - size="editorOverlay.size" position="target"> diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js index c3da4894ab..2fa9244076 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js @@ -185,7 +185,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop alias: scaffold.contentTypeAlias, name: scaffold.contentTypeName, icon: iconHelper.convertFromLegacyIcon(scaffold.icon), - thumbnail: scaffold.thumbnail, description: scaffold.documentType.description }); }); @@ -194,11 +193,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop return; } - if ($scope.overlayMenu.availableItems.some(x => x.thumbnail)) { - $scope.overlayMenu.size = 'large'; - } else { $scope.overlayMenu.size = $scope.overlayMenu.availableItems.length > 6 ? "medium" : "small"; - } $scope.overlayMenu.pasteItems = []; var availableNodesForPaste = clipboardService.retriveDataOfType("elementType", contentTypeAliases); @@ -434,9 +429,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop }); } - // pass the thumbnail on to the scaffold - scaffold.thumbnail = contentType.thumbnail; - // Store the scaffold object $scope.scaffolds.push(scaffold); }