diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html index c4cc44fc0e..9e6b5c22fb 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html @@ -56,7 +56,7 @@ - Customize + Customize diff --git a/src/Umbraco.Web.UI.Client/src/less/buttons.less b/src/Umbraco.Web.UI.Client/src/less/buttons.less index d175541e17..24c6aed9cd 100644 --- a/src/Umbraco.Web.UI.Client/src/less/buttons.less +++ b/src/Umbraco.Web.UI.Client/src/less/buttons.less @@ -64,8 +64,6 @@ } - - .btn-group>.btn+.dropdown-toggle { box-shadow: none; -webkit-box-shadow:none; @@ -163,7 +161,8 @@ input[type="button"] { .btn-danger.active, .btn-success.active, .btn-info.active, -.btn-inverse.active { +.btn-inverse.active, +.btn-neutral.active { color: rgba(255,255,255,.75); } @@ -192,7 +191,23 @@ input[type="button"] { .btn-inverse { .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight); } +// Neutral appears as lighter gray +.btn-neutral { + .buttonBackground(@btnNeutralBackground, @btnNeutralBackgroundHighlight); + color: #656565; + // Hover/focus state + &:hover, + &:focus { + color: #656565; + } + &.disabled, + &[disabled] { + color:#656565; + .opacity(65); + } + +} // Cross-browser Jank // -------------------------------------------------- diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less index 298f4f4728..2842a656ca 100644 --- a/src/Umbraco.Web.UI.Client/src/less/installer.less +++ b/src/Umbraco.Web.UI.Client/src/less/installer.less @@ -288,4 +288,8 @@ select { width:100%; overflow:auto; border:none; +} + +.control-customize{ + margin:2px 0 0 0; } \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index f5155e9939..f96a676bc1 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -102,8 +102,6 @@ @btnBackgroundHighlight: #e4e4e4; @btnBorder: #ccc; -//@btnPrimaryBackground: #297aff; -//@btnPrimaryBackgroundHighlight: #297aff; @btnPrimaryBackground: #53a93f; @btnPrimaryBackgroundHighlight: #53a93f; @@ -122,6 +120,9 @@ @btnInverseBackground: #444; @btnInverseBackgroundHighlight: @grayDarker; +@btnNeutralBackground: #f5f5f5; +@btnNeutralBackgroundHighlight: #f5f5f5; + // Forms // -------------------------