Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it: will do this separately
This commit is contained in:
parent
00405e7f22
commit
7d161de35b
77 changed files with 3526 additions and 598 deletions
|
@ -181,6 +181,8 @@ $imagebody-giflabel-border: rgba(0, 0, 0, 0.2);
|
|||
// unused?
|
||||
$progressbar-color: #000;
|
||||
|
||||
$room-warning-bg-color: #fff8e3;
|
||||
|
||||
// ***** Mixins! *****
|
||||
|
||||
@define-mixin mx_DialogButton {
|
||||
|
@ -213,3 +215,11 @@ $progressbar-color: #000;
|
|||
font-size: 15px;
|
||||
padding: 0px 1.5em 0px 1.5em;
|
||||
}
|
||||
|
||||
@define-mixin mx_DialogButton_secondary {
|
||||
// flip colours for the secondary ones
|
||||
font-weight: 600;
|
||||
border: 1px solid $accent-color ! important;
|
||||
color: $accent-color;
|
||||
background-color: $accent-fg-color;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue