update button colours

This commit is contained in:
Mads Rasmussen
2017-02-23 16:01:58 +01:00
parent 2b8db9d1b5
commit 2289938486
7 changed files with 28 additions and 9 deletions

View File

@@ -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,

View File

@@ -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 {

View File

@@ -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;
}

View File

@@ -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

View File

@@ -163,8 +163,8 @@
@btnPrimaryBackground: @green;
@btnPrimaryBackgroundHighlight: @green;
@btnInfoBackground: @purple;
@btnInfoBackgroundHighlight: @purple;
@btnInfoBackground: @purple-l1;
@btnInfoBackgroundHighlight: @purple-l1;
@btnSuccessBackground: @green;
@btnSuccessBackgroundHighlight: @green;

View File

@@ -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>

View File

@@ -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>