gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-15 00:58:00 +00:00
parent 8bd66b93c5 9f61cb8137
commit 148ace93ca
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/skins/vector/css/_common.scss
View File

@ -132,6 +132,10 @@ textarea {
color: $secondary-accent-color; color: $secondary-accent-color;
} }
#mx_theme_tertiaryAccentColor {
color: $roomsublist-label-bg-color;
}
.mx_Dialog_wrapper { .mx_Dialog_wrapper {
position: fixed; position: fixed;
z-index: 4000; z-index: 4000;

6
src/skins/vector/css/themes/_dark.scss
View File

@ -34,7 +34,11 @@ $secondary-accent-color: $primary-bg-color;
// by overriding the key to something untintable // by overriding the key to something untintable
// XXX: this is a bit of a hack. // XXX: this is a bit of a hack.
#mx_theme_secondaryAccentColor { #mx_theme_secondaryAccentColor {
color: #2d2d2e ! important; // deliberately off by one color: #c0ff33 ! important; // deliberately off by one
}
#mx_theme_tertiaryAccentColor {
color: #c0ffee ! important;
} }
// used by RoomDirectory permissions // used by RoomDirectory permissions

6
src/skins/vector/themes/status/css/_status.scss
View File

@ -90,7 +90,11 @@ $secondary-accent-color: #586C7B;
// by overriding the key to something untintable // by overriding the key to something untintable
// XXX: this is a bit of a hack. // XXX: this is a bit of a hack.
#mx_theme_secondaryAccentColor { #mx_theme_secondaryAccentColor {
color: #586C7C ! important; // deliberately off by one color: #c0ffee ! important;
}
#mx_theme_tertiaryAccentColor {
color: #c0ffee ! important;
} }
// used by RoomDirectory permissions // used by RoomDirectory permissions

4
src/vector/index.html
View File

@ -27,7 +27,7 @@
if (match) { if (match) {
var title = match[1].charAt(0).toUpperCase() + match[1].slice(1); var title = match[1].charAt(0).toUpperCase() + match[1].slice(1);
%> %>
<link rel="stylesheet" disabled title="<%= title %>" href="<%= file %>"> <link rel="stylesheet" disabled="disabled" title="<%= title %>" href="<%= file %>">
<% } else { %> <% } else { %>
<link rel="stylesheet" href="<%= file %>"> <link rel="stylesheet" href="<%= file %>">
<% } <% }
@ -73,6 +73,6 @@
</audio> </audio>
<audio id="remoteAudio"/> <audio id="remoteAudio"/>
<!-- let CSS themes pass constants to the app --> <!-- let CSS themes pass constants to the app -->
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div> <div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
</body> </body>
</html> </html>