nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into matthew/dharma

Browse Source
This commit is contained in:
Matthew Hodgson
2018-08-03 17:15:00 -07:00
parent fe73953d9d 4c6d5f50e9
commit 4fbf34e05b
15 changed files with 213 additions and 6983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/css/views/globals/_MatrixToolbar.scss
View File

@@ -28,6 +28,12 @@ limitations under the License.
margin-top: -2px;
}
.mx_MatrixToolbar_error {
padding-left: 16px;
padding-right: 8px;
background-color: $warning-bg-color;
}
.mx_MatrixToolbar_content {
flex: 1;
}
@@ -59,4 +65,4 @@ limitations under the License.
.mx_MatrixToolbar_changelog {
white-space: pre;
}
}

1
res/themes/dark/css/_dark.scss
View File

@@ -19,6 +19,7 @@ $focus-brightness: 200%;
// red warning colour
$warning-color: #ff0064;
$warning-bg-color: #DF2A8B;
// groups
$info-plinth-bg-color: #454545;

2
res/themes/light/css/_base.scss
View File

@@ -27,6 +27,8 @@ $focus-brightness: 125%;
// red warning colour
$warning-color: #ff0064;
// background colour for warnings
$warning-bg-color: #DF2A8B;
$mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);