Browse Source

fix(toolbar): adjust sizings and colors

j8
Leonard Kim 7 years ago
parent
commit
45adf3e26a

+ 2
- 2
css/_filmstrip.scss View File

@@ -7,7 +7,7 @@
7 7
 
8 8
 .use-new-toolbox {
9 9
     .filmstrip.reduce-height {
10
-        bottom: $newToolbarSize;
10
+        bottom: $newToolbarSizeWithPadding;
11 11
     }
12 12
 
13 13
     .filmstrip {
@@ -15,7 +15,7 @@
15 15
     }
16 16
 
17 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 View File

@@ -6,9 +6,9 @@
6 6
 
7 7
     /**
8 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 12
     left: 0;
13 13
 
14 14
     .side-toolbar-close {

+ 20
- 12
css/_toolbars.scss View File

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

+ 2
- 1
css/_variables.scss View File

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

+ 1
- 1
css/_vertical_filmstrip_overrides.scss View File

@@ -28,7 +28,7 @@
28 28
             transition: height .3s ease-in;
29 29
 
30 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 View File

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

Loading…
Cancel
Save