From 08a8e0793e62b59a347d6c208786f30c960504c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Jan 2019 09:30:42 +0100 Subject: [PATCH] Design & color changes for 2019 brand colors --- .../application/umbtour.directive.js | 2 +- .../components/buttons/umbbutton.directive.js | 2 +- .../components/tree/umbtree.directive.js | 10 -------- .../src/common/services/editor.service.js | 2 +- .../application/umb-language-picker.less | 4 ++-- .../src/less/components/overlays.less | 4 +++- .../less/components/tree/umb-tree-item.less | 6 ++--- .../src/less/components/tree/umb-tree.less | 24 ++++++++++++------- .../src/less/variables.less | 8 +++---- .../common/overlays/user/user.controller.js | 15 ++++++------ .../src/views/common/overlays/user/user.html | 4 ++-- .../nodename/nodename.html | 2 +- .../doctypename/doctypename.html | 2 +- .../propertyname/propertyname.html | 2 +- .../tabname/tabname.html | 2 +- .../foldername/foldername.html | 2 +- .../uploadimages/uploadimages.html | 2 +- .../components/application/umb-tour.html | 8 +++---- .../src/views/content/notify.html | 2 +- .../src/views/content/protect.html | 4 ++-- .../src/views/content/rights.html | 2 +- .../propertyeditors/listview/listview.html | 4 ++-- .../src/views/users/views/users/users.html | 10 ++++---- 23 files changed, 61 insertions(+), 62 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js index 2970c52bbb..b749518660 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js @@ -137,7 +137,7 @@ In the following example you see how to run some custom logic before a step goes
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js index 8ad71226ba..6038eb1ec0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js @@ -14,7 +14,7 @@ Use this directive to render an umbraco button. The directive can be used to gen diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less index aabc4c4506..c950b01602 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less @@ -51,9 +51,9 @@ .umb-language-picker__dropdown a:hover, .umb-language-picker__dropdown a:focus { - background: @gray-10; + background: @ui-option-hover; text-decoration: none; - color:@ui-light-active-type-hover; + color:@ui-option-type-hover; } .umb-language-picker__dropdown a.umb-language-picker__dropdown-item--current { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less index b2d6cda9b1..6e9c79a0c2 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less @@ -15,8 +15,10 @@ } .umb-overlay .umb-overlay-header { - background: @gray-10; + //background: @gray-10; border-bottom: 1px solid @purple-l3; + //background: @blueExtraDark; + //color:@u-white; padding: 10px; margin-top: 0; flex-grow: 0; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less index a0ea622d6b..21e5f13880 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less @@ -58,7 +58,7 @@ i { background: @ui-active-type; - border-color: @ui-active; + //border-color: @ui-active; transition: opacity 120ms ease; } } @@ -67,7 +67,7 @@ .umb-tree-icon, ins { color: @ui-active-type !important; - background-color: @ui-active; - border-color: @ui-active; + //background-color: @ui-active; + //border-color: @ui-active; } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less index 905b3abb87..8da00f5d0f 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less @@ -87,6 +87,21 @@ body.touch .umb-tree { } } +// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog. +.umb-tree-item > .umb-tree-item__inner.active { + background: @ui-selected; + color: @ui-selected-type; + a { + color: @ui-selected-type; + } + &:hover { + background: @ui-selected-hover; + color: @ui-selected-type-hover; + a { + color: @ui-selected-type-hover; + } + } +} .umb-tree-root, .umb-tree-item__inner { padding: 0; position: relative; @@ -100,15 +115,6 @@ body.touch .umb-tree { color: @ui-option-type; } - // active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog. - &.active { - background: @ui-selected; - color: @ui-selected-type; - a { - color: @ui-selected-type; - } - } - &:hover { background: @ui-option-hover; diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index dd5788fa11..14d76c2251 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -140,10 +140,10 @@ @ui-active-type: @blueExtraDark; @ui-active-type-hover: @blueMid; -@ui-selected: @blue; -@ui-selected-hover: @blueMid; -@ui-selected-type: @u-white; -@ui-selected-type-hover: @u-white; +@ui-selected: @brownLight; +@ui-selected-hover: ligthen(@brownLight, 10); +@ui-selected-type: @blueMid; +@ui-selected-type-hover: @blueMid; @ui-light-border: @pinkLight; @ui-light-type: @gray-4; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js index 3147989821..5ed87f073b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js @@ -2,17 +2,18 @@ angular.module("umbraco") .controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout, dashboardResource, userService, historyService, eventsService, externalLoginInfo, authResource, currentUserResource, formHelper, localizationService) { $scope.history = historyService.getCurrent(); - $scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion; + //$scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion; $scope.showPasswordFields = false; $scope.changePasswordButtonState = "init"; - $scope.model.subtitle = "Umbraco version" + " " + $scope.version; - + $scope.model.title = "user.name"; + //$scope.model.subtitle = "Umbraco version" + " " + $scope.version; + /* if(!$scope.model.title) { localizationService.localize("general_user").then(function(value){ $scope.model.title = value; }); } - + */ $scope.externalLoginProviders = externalLoginInfo.providers; $scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl; var evts = []; @@ -45,7 +46,7 @@ angular.module("umbraco") $location.path(link); $scope.model.close(); }; - + /* //Manually update the remaining timeout seconds function updateTimeout() { $timeout(function () { @@ -58,7 +59,7 @@ angular.module("umbraco") }, 1000, false); // 1 second, do NOT execute a global digest } - + */ function updateUserInfo() { //get the user userService.getCurrentUser().then(function (user) { @@ -68,7 +69,7 @@ angular.module("umbraco") $scope.remainingAuthSeconds = $scope.user.remainingAuthSeconds; $scope.canEditProfile = _.indexOf($scope.user.allowedSections, "users") > -1; //set the timer - updateTimeout(); + //updateTimeout(); authResource.getCurrentUserLinkedLogins().then(function(logins) { //reset all to be un-linked diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html index 754b170f23..404b4d8dd2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html @@ -4,11 +4,11 @@
-

+

- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html index a0b4b529e8..3ae8943560 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html @@ -19,7 +19,7 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html index 5748f65a95..2c255706c8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html @@ -19,7 +19,7 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html index baa0d3da9a..0dfa084878 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html @@ -19,7 +19,7 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html index 1a9bd41226..063f332e1d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html @@ -19,7 +19,7 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html index e7e8750823..0e13b9b645 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html @@ -19,7 +19,7 @@
- +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html index b801d63cca..b756d23b50 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html @@ -31,11 +31,11 @@
- +
- +
@@ -55,7 +55,7 @@ - + @@ -76,7 +76,7 @@

Please go back and start the tour again.

- + diff --git a/src/Umbraco.Web.UI.Client/src/views/content/notify.html b/src/Umbraco.Web.UI.Client/src/views/content/notify.html index 8e2f860661..43f14d519f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/notify.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/notify.html @@ -42,7 +42,7 @@ type="button" action="vm.save(vm.notifyOptions)" state="vm.saveState" - button-style="success"> + button-style="action"> diff --git a/src/Umbraco.Web.UI.Client/src/views/content/protect.html b/src/Umbraco.Web.UI.Client/src/views/content/protect.html index ae4a15e8c1..77584dac12 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/protect.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/protect.html @@ -127,7 +127,7 @@
@@ -144,7 +144,7 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rights.html b/src/Umbraco.Web.UI.Client/src/views/content/rights.html index 35f3d34260..31c7c628c0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/rights.html @@ -75,7 +75,7 @@ label-key="prompt_stay" action="vm.stay()" type="button" - button-style="success"> + button-style="action"> diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html index 77576cac6a..abf571cfbf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html @@ -5,7 +5,7 @@
- + @@ -37,7 +37,7 @@
- + Create diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html index 0075342a36..4b6f77e696 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html @@ -11,7 +11,7 @@ @@ -392,7 +392,7 @@ @@ -536,7 +536,7 @@