imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge

Browse source
This commit is contained in:
David Baker 2019-01-03 18:05:38 +00:00
parent 7d161de35b
commit 982e037822
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/structures/_RightPanel.scss
View file

@ -57,10 +57,6 @@ limitations under the License.
pointer-events: none;
}
.mx_RightPanel_headerButton_badgeHighlight .mx_RightPanel_headerButton_badge {
color: $warning-color;
}
.mx_RightPanel_headerButton_highlight {
border-color: $button-bg-color;
}

10
res/themes/dharma/css/_dharma.scss
View file

@ -186,6 +186,8 @@ $lightbox-border-color: #ffffff;
// unused?
$progressbar-color: #000;
$room-warning-bg-color: #fff8e3;
/*** form elements ***/
// .mx_textinput is a container for a text input
@ -320,3 +322,11 @@ input[type=search]::-webkit-search-results-decoration {
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;
}