浏览代码

fix(toolbar): adjust sizings and colors

j8
Leonard Kim 7 年前
父节点
当前提交
45adf3e26a

+ 2
- 2
css/_filmstrip.scss 查看文件

7
 
7
 
8
 .use-new-toolbox {
8
 .use-new-toolbox {
9
     .filmstrip.reduce-height {
9
     .filmstrip.reduce-height {
10
-        bottom: $newToolbarSize;
10
+        bottom: $newToolbarSizeWithPadding;
11
     }
11
     }
12
 
12
 
13
     .filmstrip {
13
     .filmstrip {
15
     }
15
     }
16
 
16
 
17
     .filmstrip__videos.hidden {
17
     .filmstrip__videos.hidden {
18
-        bottom: calc(-196px - #{$newToolbarSize});
18
+        bottom: calc(-196px - #{$newToolbarSizeWithPadding});
19
     }
19
     }
20
 }
20
 }
21
 
21
 

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

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
9
-     * the toolbar, plus its padding, and subtract from 100%.
9
+     * the toolbar and subtract from 100%.
10
      */
10
      */
11
-    height: calc(100% - #{$newToolbarSize} - 10px);
11
+    height: calc(100% - #{$newToolbarSizeWithPadding});
12
     left: 0;
12
     left: 0;
13
 
13
 
14
     .side-toolbar-close {
14
     .side-toolbar-close {

+ 20
- 12
css/_toolbars.scss 查看文件

21
 
21
 
22
 .use-new-toolbox {
22
 .use-new-toolbox {
23
     .cxGWJB{
23
     .cxGWJB{
24
-        bottom: calc(#{$newToolbarSize} + 15px);
24
+        bottom: calc(#{$newToolbarSizeWithPadding});
25
     }
25
     }
26
     .gXSEsl:nth-child(n+2) {
26
     .gXSEsl:nth-child(n+2) {
27
-        transform: translateX(0) translateY(100%) translateY(calc(#{$newToolbarSize} + 25px));
28
-        -ms-transform: translateX(0) translateY(100%) translateY(calc(#{$newToolbarSize} + 25px));
29
-        -webkit-transform: translateX(0) translateY(100%) translateY(calc(#{$newToolbarSize} + 25px));
27
+        transform: translateX(0) translateY(100%) translateY(16px);
28
+        -ms-transform: translateX(0) translateY(100%) translateY(16px);
29
+        -webkit-transform: translateX(0) translateY(100%) translateY(16px);
30
     }
30
     }
31
 }
31
 }
32
 
32
 
281
     box-sizing: border-box;
281
     box-sizing: border-box;
282
     display: flex;
282
     display: flex;
283
     justify-content: space-between;
283
     justify-content: space-between;
284
-    padding: 5px 20px;
284
+    padding: 16px 8px;
285
     position: absolute;
285
     position: absolute;
286
     transition: bottom .3s ease-in;
286
     transition: bottom .3s ease-in;
287
     width: 100%;
287
     width: 100%;
321
         border-radius: 5px;
321
         border-radius: 5px;
322
         cursor: pointer;
322
         cursor: pointer;
323
         display: block;
323
         display: block;
324
+        font-size: inherit;
324
         height: 100%;
325
         height: 100%;
325
         line-height: inherit;
326
         line-height: inherit;
326
         width: 100%;
327
         width: 100%;
361
 
362
 
362
         .overflow-menu-item {
363
         .overflow-menu-item {
363
             align-items: center;
364
             align-items: center;
365
+            color: #B8C7E0;
364
             cursor: pointer;
366
             cursor: pointer;
365
             display: flex;
367
             display: flex;
366
-            padding: 5px 10px;
368
+            font-size: 14px;
369
+            height: 32px;
370
+            padding: 5px 12px;
367
 
371
 
368
             &:hover {
372
             &:hover {
369
-                background: rgba(0255, 255, 255, 0.2);
373
+                background: #313D52;
370
             }
374
             }
371
 
375
 
372
             &.unclickable {
376
             &.unclickable {
382
 
386
 
383
             i {
387
             i {
384
                 display: inline;
388
                 display: inline;
389
+                font-size: 24px;
385
             }
390
             }
386
 
391
 
387
             i:hover {
392
             i:hover {
389
             }
394
             }
390
 
395
 
391
             img {
396
             img {
392
-                max-width: 18px;
393
-                max-height: 18px;
397
+                max-width: 24px;
398
+                max-height: 24px;
394
             }
399
             }
395
         }
400
         }
396
 
401
 
406
         color: $toolbarButtonColor;
411
         color: $toolbarButtonColor;
407
         cursor: pointer;
412
         cursor: pointer;
408
         display: inline-block;
413
         display: inline-block;
409
-        font-size: $newToolbarFontSize;
410
         line-height: $newToolbarSize;
414
         line-height: $newToolbarSize;
411
-        margin: 0 10px;
415
+        margin: 0 8px;
412
         text-align: center;
416
         text-align: center;
413
     }
417
     }
414
 
418
 
417
 
421
 
418
         .badge-round {
422
         .badge-round {
419
             bottom: 9px;
423
             bottom: 9px;
424
+            font-size: 12px;
425
+            line-height: 20px;
426
+            min-width: 20px;
420
             position: absolute;
427
             position: absolute;
421
             right: 9px;
428
             right: 9px;
422
         }
429
         }
428
 
435
 
429
     .toolbox-icon {
436
     .toolbox-icon {
430
         height: $newToolbarSize;
437
         height: $newToolbarSize;
438
+        font-size: 36px;
431
         width: $newToolbarSize;
439
         width: $newToolbarSize;
432
     }
440
     }
433
 }
441
 }
442
     i {
450
     i {
443
         cursor: pointer;
451
         cursor: pointer;
444
         display: block;
452
         display: block;
445
-        font-size: $newToolbarFontSize;
453
+        font-size: 1.9em;
446
         height: 37px;
454
         height: 37px;
447
         line-height: 37px;
455
         line-height: 37px;
448
         width: 37px;
456
         width: 37px;

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

40
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
40
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
41
 $newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
41
 $newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
42
 $newToolbarFontSize: 1.9em;
42
 $newToolbarFontSize: 1.9em;
43
-$newToolbarSize: 50px;
43
+$newToolbarSize: 56px;
44
+$newToolbarSizeWithPadding: calc(56px + 32px);
44
 $secToolbarFontSize: 1.9em;
45
 $secToolbarFontSize: 1.9em;
45
 $secToolbarLineHeight: 45px;
46
 $secToolbarLineHeight: 45px;
46
 $toolbarAvatarPadding: 10px;
47
 $toolbarAvatarPadding: 10px;

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

28
             transition: height .3s ease-in;
28
             transition: height .3s ease-in;
29
 
29
 
30
             &.reduce-height {
30
             &.reduce-height {
31
-                height: calc(100% - #{$newToolbarSize});
31
+                height: calc(100% - #{$newToolbarSizeWithPadding});
32
             }
32
             }
33
         }
33
         }
34
     }
34
     }

+ 4
- 0
css/modals/invite/_info.scss 查看文件

1
+.use-new-toolbox {
2
+    font-size: 14px;
3
+}
4
+
1
 .info-dialog {
5
 .info-dialog {
2
     cursor: default;
6
     cursor: default;
3
     display: flex;
7
     display: flex;

正在加载...
取消
保存