From 60f91d95e9c54d681f09845d988b886a363b26b8 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 6 Apr 2017 16:09:46 +0200 Subject: [PATCH 1/6] add separator to button groups with toggle --- src/Umbraco.Web.UI.Client/src/less/buttons.less | 5 ++++- .../src/less/components/buttons/umb-button-group.less | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less index fc06cedc87..e76ffc682c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/buttons.less +++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less @@ -65,7 +65,10 @@ -webkit-box-shadow:none; } - +.btn-group .btn.dropdown-toggle { + border-left-width: 1px; + border-left-style: solid; +} // Button Sizes // -------------------------------------------------- diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less index 3424de2159..f56c32996b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less @@ -35,6 +35,9 @@ padding-right: 10px; padding-left: 10px; border-radius: 0 3px 3px 0; + border-left-style: solid; + border-left-width: 1px; + border-left-color: rgba(0,0,0,0.1); } .umb-era-button.umb-button-group__toggle .caret { From a728f475aac2985d376728c9e4ef06aff51df5fc Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 6 Apr 2017 16:11:03 +0200 Subject: [PATCH 2/6] remove margin from editor sub header in content mini editor --- .../src/less/components/umb-mini-editor.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less index 345a6bd682..55baebda42 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less @@ -30,4 +30,9 @@ padding: 0 20px; } + // Hacks to fix editors inside the mini editors + .umb-editor-sub-header { + margin-top: 0; + } + } \ No newline at end of file From 847ef34281973ce26cb82117b473fe3df4ec7451 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 6 Apr 2017 16:12:55 +0200 Subject: [PATCH 3/6] adjust colors on header and footer in content mini editor to match main editor --- .../src/less/components/umb-mini-editor.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less index 55baebda42..68266e9483 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-editor.less @@ -3,7 +3,7 @@ .umb-panel-header { padding: 20px; background: @gray-10; - border-bottom: 1px solid @gray-8; + border-bottom: 1px solid @purple-l3; height: 59px; .umb-headline { @@ -25,8 +25,8 @@ .umb-panel-footer { background: @gray-10; - border-top: 1px solid @gray-8; - height: 51px; + border-top: 1px solid @purple-l3; + height: 52px; padding: 0 20px; } From 8d7891d20355de1ce6d36a17710f14fed50ddc47 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 6 Apr 2017 16:18:27 +0200 Subject: [PATCH 4/6] remove negative margin --- .../src/less/components/buttons/umb-button-group.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less index f56c32996b..1bd896022c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less @@ -1,7 +1,6 @@ .umb-button-group__toggle { padding-left: 8px; padding-right: 8px; - margin-left: -1px; } .umb-button-group__sub-buttons.-align-right { From fc862f8434b136b697b38f7440f1c0f8cbd3f279 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 6 Apr 2017 16:24:22 +0200 Subject: [PATCH 5/6] remove border radius from alerts --- src/Umbraco.Web.UI.Client/src/less/alerts.less | 2 +- src/Umbraco.Web.UI.Client/src/less/variables.less | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/alerts.less b/src/Umbraco.Web.UI.Client/src/less/alerts.less index c575f58f0c..47ee38a70f 100644 --- a/src/Umbraco.Web.UI.Client/src/less/alerts.less +++ b/src/Umbraco.Web.UI.Client/src/less/alerts.less @@ -11,7 +11,7 @@ margin-bottom: @baseLineHeight; background-color: @warningBackground; border: 1px solid @warningBorder; - .border-radius(@baseBorderRadius); + .border-radius(@alertBorderRadius); } .alert, .alert h4, diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 68db985e63..ed415decee 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -327,6 +327,8 @@ @infoBackground: @turquoise-d1; @infoBorder: transparent; +@alertBorderRadius: 0; + // SD: Had to duplicate the above but prefix with 'form' inversed colors // because we cannot share the above alert colors with forms otherwise we end up with white // text and giant red backgrounds. From 2ee1df3dec7f26f79e69c9b5813d2ab1f1a75f49 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 6 Apr 2017 16:25:09 +0200 Subject: [PATCH 6/6] update orange warning color to yellow --- src/Umbraco.Web.UI.Client/src/less/variables.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index ed415decee..c173f122cb 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -58,6 +58,7 @@ @red-l3: #FFB2B0; @red-washed: #FFECEB; +@yellow-d2: #F0AC00; @yellow-d1: #FFC011; @yellow: #FFCE38; @yellow-l1: #FFD861; @@ -312,7 +313,7 @@ // alerts // ------------------------- @warningText: @white; -@warningBackground: @orange; +@warningBackground: @yellow-d2; @warningBorder: transparent; @errorText: @white;