From ff8f9083ec7b143333376577531c251d631460a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 13 Feb 2019 11:37:09 +0100 Subject: [PATCH] Dimmed overlay on property preview + removed background from "add property group" + adjust sizes for umb-panel-header and added hovers. --- .../src/less/components/editor.less | 3 +- .../less/components/umb-group-builder.less | 46 ++++++++++++------- src/Umbraco.Web.UI.Client/src/less/panel.less | 13 ++++-- 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less index d576c33b67..f165c0c865 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less @@ -75,6 +75,7 @@ .umb-editor-header__back { color: @gray-6; + margin-bottom: 1px; transition: color 0.1s ease-in-out; } @@ -95,7 +96,7 @@ input.umb-editor-header__name-input { margin-bottom: 0; font-weight: bold; box-sizing: border-box; - height: 32px; + height: 30px; line-height: 32px; width: 100%; padding: 0 10px; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less index 331fd9eb66..d8c7224d57 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less @@ -16,10 +16,6 @@ box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16); } -.umb-group-builder__group.-active { - border-color: @ui-active; -} - .umb-group-builder__group.-inherited { border-color: @gray-9; animation: fadeIn 0.5s; @@ -33,6 +29,7 @@ align-items: center; cursor: pointer; border: 1px dashed @gray-7; + background-color: transparent; color: @ui-action-type; font-weight: bold; position: relative; @@ -253,24 +250,38 @@ input.umb-group-builder__group-title-input:disabled:hover { } .umb-group-builder__property-preview { - flex: 1; - height: 30px; - overflow: hidden; - position: relative; - padding: 35px 10px 25px 10px; - background-color: @gray-10; + flex: 1; + height: 30px; + overflow: hidden; + position: relative; + padding: 35px 10px 25px 10px; + border-radius: 3px; + cursor: pointer; + + &::after { + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + background: rgba(0,0,0,0.1); + transition: opacity 120ms; + } } .umb-group-builder__property-preview:hover { - cursor: pointer; + &::after { + opacity: .8; + } } .umb-group-builder__property-preview:focus { - outline: none; + outline: none; } -.umb-group-builder__property-preview.-not-clickable:hover { - cursor: auto; +.umb-group-builder__property-preview.-not-clickable { + cursor: auto; } .umb-group-builder__property-preview .help-inline { @@ -312,8 +323,8 @@ input.umb-group-builder__group-title-input:disabled:hover { .umb-group-builder__property-tags { position: absolute; z-index: 20; - top: 0; - left: 0; + top: 4px; + left: 4px; display: flex; flex-direction: row; } @@ -326,9 +337,10 @@ input.umb-group-builder__group-title-input:disabled:hover { .umb-group-builder__property-tag { font-size: 12px; background-color: @gray-8; - margin-left: 10px; + margin-left: 4px; padding: 0 4px; display: flex; + border-radius: 3px; } .umb-group-builder__property-tag:first-child { diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index ae930d6fb0..29b05558cf 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -346,10 +346,16 @@ justify-content: center; align-items: center; background: @white; - border: 1px solid @gray-8; + border: 1px solid @ui-action-disgrete-border; animation: fadeIn 0.5s; border-radius: 3px; width: 50px; + &:hover { + .icon { + opacity: 0.8; + } + border-color: @ui-action-disgrete-border-hover; + } } .umb-panel-header-title-wrapper { @@ -382,8 +388,9 @@ } .umb-panel-header-icon .icon { - font-size: 30px; - color: @gray-7; + font-size: 30px; + color: @gray-7; + transition: opacity 120ms; } .umb-panel-header-icon-text {