浏览代码

fix(toolbar): make darker for better text contrast (#2667)

* fix(toolbar): make darker for better text contrast

* squash: borrow some atlaskit colors
j8
virtuacoplenny 7 年前
父节点
当前提交
8bf69d30b7
共有 4 个文件被更改,包括 30 次插入10 次删除
  1. 17
    0
      css/_chat.scss
  2. 1
    1
      css/_side_toolbar_container.scss
  3. 8
    8
      css/_toolbars.scss
  4. 4
    1
      css/_variables.scss

+ 17
- 0
css/_chat.scss 查看文件

62
 .localuser {
62
 .localuser {
63
     color: #087dba;
63
     color: #087dba;
64
 }
64
 }
65
+.use-new-toolbox {
66
+    .chatmessage {
67
+        color: white;
68
+    }
69
+
70
+    .localuser {
71
+        color: #4C9AFF;
72
+    }
73
+
74
+    .remoteuser {
75
+        color: #B8C7E0;
76
+    }
77
+
78
+    #usermsg {
79
+        color: white;
80
+    }
81
+}
65
 
82
 
66
 .errorMessage {
83
 .errorMessage {
67
     color: red;
84
     color: red;

+ 1
- 1
css/_side_toolbar_container.scss 查看文件

2
  * Toolbar side panel main container element.
2
  * Toolbar side panel main container element.
3
  */
3
  */
4
 .use-new-toolbox #sideToolbarContainer {
4
 .use-new-toolbox #sideToolbarContainer {
5
-    background-color: rgba(40, 52, 71, 0.5);
5
+    background-color: $newToolbarBackgroundColor;
6
 
6
 
7
     /**
7
     /**
8
      * Make the sidebar flush with the top of the toolbar. Take the size of
8
      * Make the sidebar flush with the top of the toolbar. Take the size of

+ 8
- 8
css/_toolbars.scss 查看文件

265
  * TODO: when the old filmstrip has been removed, remove the "new-" prefix.
265
  * TODO: when the old filmstrip has been removed, remove the "new-" prefix.
266
  */
266
  */
267
 .new-toolbox {
267
 .new-toolbox {
268
-    background-color: rgba(40, 52, 71, 0.5);
268
+    background-color: $newToolbarBackgroundColor;
269
     bottom: calc((#{$newToolbarSize} * 2) * -1);
269
     bottom: calc((#{$newToolbarSize} * 2) * -1);
270
     box-sizing: border-box;
270
     box-sizing: border-box;
271
     display: flex;
271
     display: flex;
316
     }
316
     }
317
 
317
 
318
     i:hover {
318
     i:hover {
319
-        background-color: rgba(40, 52, 71, 0.7);
319
+        background-color: $newToolbarButtonHoverColor;
320
     }
320
     }
321
 
321
 
322
     i.toggled {
322
     i.toggled {
323
-        background: rgba(40, 52, 71, 1);
323
+        background: $newToolbarButtonToggleColor;
324
     }
324
     }
325
 
325
 
326
     i.toggled:hover {
326
     i.toggled:hover {
327
-        background-color: rgba(40, 52, 71, 1);
327
+        background-color: $newToolbarButtonHoverColor;
328
     }
328
     }
329
 
329
 
330
     i.disabled {
330
     i.disabled {
422
 }
422
 }
423
 
423
 
424
 .filmstrip-toolbox {
424
 .filmstrip-toolbox {
425
-    background-color: rgba(40, 52, 71, 0.5);
425
+    background-color: $newToolbarBackgroundColor;
426
     box-sizing: border-box;
426
     box-sizing: border-box;
427
     display: flex;
427
     display: flex;
428
     flex-direction: column;
428
     flex-direction: column;
438
     }
438
     }
439
 
439
 
440
     i:hover {
440
     i:hover {
441
-        background-color: rgba(40, 52, 71, 0.7);
441
+        background-color: $newToolbarButtonHoverColor;
442
     }
442
     }
443
 
443
 
444
     i.toggled {
444
     i.toggled {
445
-        background: rgba(40, 52, 71, 1);
445
+        background: $newToolbarButtonToggleColor;
446
     }
446
     }
447
 
447
 
448
     i.toggled:hover {
448
     i.toggled:hover {
449
-        background-color: rgba(40, 52, 71, 1);
449
+        background-color: $newToolbarButtonHoverColor;
450
     }
450
     }
451
 
451
 
452
     .icon-hangup {
452
     .icon-hangup {

+ 4
- 1
css/_variables.scss 查看文件

36
 $alwaysOnTopToolbarSize: 30px;
36
 $alwaysOnTopToolbarSize: 30px;
37
 $defaultToolbarSize: 50px;
37
 $defaultToolbarSize: 50px;
38
 $defaultFilmStripOnlyToolbarSize: 37px;
38
 $defaultFilmStripOnlyToolbarSize: 37px;
39
-$newToolbarSize: 50px;
39
+$newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
40
+$newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
41
+$newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
40
 $newToolbarFontSize: 1.9em;
42
 $newToolbarFontSize: 1.9em;
43
+$newToolbarSize: 50px;
41
 $secToolbarFontSize: 1.9em;
44
 $secToolbarFontSize: 1.9em;
42
 $secToolbarLineHeight: 45px;
45
 $secToolbarLineHeight: 45px;
43
 $toolbarAvatarPadding: 10px;
46
 $toolbarAvatarPadding: 10px;

正在加载...
取消
保存