Merge branch 'design_dialogs' into staging
commit
bfd2ca85b5
|
@ -282,12 +282,16 @@
|
|||
border-radius: 0;
|
||||
|
||||
color: @alertify-btn-fg;
|
||||
border: 1px solid @colortheme_alertify-cancel-border;
|
||||
border: 1px solid @alertify-btn-fg;
|
||||
|
||||
&.no-margin {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
&:hover, &:active {
|
||||
background-color: @alertify-light-bg;
|
||||
}
|
||||
|
||||
&.safe, &.danger {
|
||||
color: @colortheme_old-base;
|
||||
white-space: normal;
|
||||
|
@ -321,10 +325,16 @@
|
|||
}
|
||||
}
|
||||
|
||||
&:hover, &:active {
|
||||
background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-cancel, 10%), lighten(@colortheme_alertify-cancel, 10%));
|
||||
&.cancel {
|
||||
border-color: @colortheme_alertify-cancel-border;
|
||||
color: @colortheme_alertify-cancel-border;
|
||||
&:hover, &:hover {
|
||||
background-color: fade(@colortheme_alertify-cancel-border, 25%);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
&:focus {
|
||||
//border: 1px dotted @alertify-base;
|
||||
box-shadow: 0px 0px 5px @colortheme_alertify-primary;
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
@colortheme_alertify-disabled-text: #ffffff;
|
||||
@colortheme_alertify-disabled-border: #6c757d;
|
||||
@colortheme_alertify-cancel: @colortheme_modal-bg;
|
||||
@colortheme_alertify-cancel-border: #ccc;
|
||||
@colortheme_alertify-cancel-border: #949494;
|
||||
|
||||
@colortheme_notification-log: fade(@colortheme_logo-1, 90%);
|
||||
@colortheme_notification-color: #fff;;
|
||||
|
|
Loading…
Reference in New Issue