From 2289938486fa9fbcca89726eafd0a03fd888bfbc Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 23 Feb 2017 16:01:58 +0100
Subject: [PATCH] update button colours

---
 src/Umbraco.Web.UI.Client/src/less/buttons.less      |  5 +++--
 .../less/components/buttons/umb-button-group.less    | 12 ++++++++++++
 .../src/less/components/buttons/umb-button.less      |  7 ++++++-
 src/Umbraco.Web.UI.Client/src/less/navs.less         |  3 ++-
 src/Umbraco.Web.UI.Client/src/less/variables.less    |  4 ++--
 .../src/views/components/buttons/umb-button.html     |  2 +-
 .../src/views/components/editor/umb-editor-menu.html |  4 ++--
 7 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less
index 84b96292c2..966b0634ce 100644
--- a/src/Umbraco.Web.UI.Client/src/less/buttons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less
@@ -9,7 +9,7 @@
 // Core
 .btn {
   display: inline-block;
-  padding: 4px 12px;
+  padding: 6px 14px;
   margin-bottom: 0; // For input.btn
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
@@ -18,8 +18,9 @@
   cursor: pointer;
   background: @btnBackground;
   color: @black;
-  border: 1px solid @btnBorder;
+  border: none;
   box-shadow: none;
+  border-radius: 3px;
 
     // Hover/focus state
     &:hover,
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 4d5fd90fad..3424de2159 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
@@ -9,6 +9,18 @@
    left: auto;
 }
 
+.umb-button-group {
+
+    .umb-button__button {
+        border-radius: 3px 0px 0px 3px;
+    }
+
+    .umb-button-group__toggle {
+        border-radius: 0px 3px 3px 0;
+    }
+
+}
+
 // hack for umb-era-button
 .umb-era-button-group {
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
index 96bcfe077a..afe050e211 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
@@ -1,16 +1,21 @@
 .umb-button {
    position: relative;
    overflow: hidden;
+   display: inline;
 }
 
  .umb-button__button:focus {
    outline: none;
 }
 
+ .umb-button__button {
+    position: relative;
+    z-index: 1;
+ }
+
 .umb-button__content {
    opacity: 1;
    transition: opacity 0.25s ease;
-
    display: flex;
    flex-wrap: wrap;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/navs.less b/src/Umbraco.Web.UI.Client/src/less/navs.less
index 995857ec45..a2d15b07a2 100644
--- a/src/Umbraco.Web.UI.Client/src/less/navs.less
+++ b/src/Umbraco.Web.UI.Client/src/less/navs.less
@@ -116,6 +116,7 @@
   padding-left: 8px;
   margin-right: 2px;
   line-height: 14px; // keeps the overall height an even number
+  border-radius: 3px 3px 0 0;
 }
 
 // TABS
@@ -256,7 +257,7 @@
 }
 
 .nav-tabs .dropdown-menu {
-  .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
+  .border-radius(0 0 3px 3px); // remove the top rounded corners here since there is a hard edge above the menu
 }
 .nav-pills .dropdown-menu {
   .border-radius(6px); // make rounded corners match the pills
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 4765bfaf41..f088ed9b99 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -163,8 +163,8 @@
 @btnPrimaryBackground:              @green;
 @btnPrimaryBackgroundHighlight:     @green;
 
-@btnInfoBackground:                 @purple;
-@btnInfoBackgroundHighlight:        @purple;
+@btnInfoBackground:                 @purple-l1;
+@btnInfoBackgroundHighlight:        @purple-l1;
 
 @btnSuccessBackground:              @green;
 @btnSuccessBackgroundHighlight:     @green;
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
index fe13267be0..eb68a0c952 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
@@ -1,4 +1,4 @@
-<div class="btn-group umb-button">
+<div class="umb-button">
 
    <div class="icon-check umb-button__success" ng-class="{'-hidden': state !== 'success', '-white': style}"></div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index dbb145e533..25f9d8797c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -1,7 +1,7 @@
-<div class="btn-group pull-right">
+<div class="pull-right" style="position: relative;">
 
     <!-- options button -->
-    <a class="btn" href="#" ng-click="getOptions()" prevent-default data-toggle="dropdown">
+    <a class="btn btn-info" href="#" ng-click="getOptions()" prevent-default data-toggle="dropdown">
         <localize key="general_actions">Actions</localize>
         <span class="caret"></span>
     </a>