diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-03 15:01:52 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-03 15:10:55 +0200 |
commit | 2303a803aa19c2857efac9f2af2223ccae5757e2 (patch) | |
tree | fd00a3c766d78f698c89df4ff60d145bc776e061 /client/src/sass | |
parent | f2e05ffea78255dd431dbddfffff89ac9ff69bdc (diff) | |
download | PeerTube-2303a803aa19c2857efac9f2af2223ccae5757e2.tar.gz PeerTube-2303a803aa19c2857efac9f2af2223ccae5757e2.tar.zst PeerTube-2303a803aa19c2857efac9f2af2223ccae5757e2.zip |
fix likes bar, grid adjustment and menu width
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 21 | ||||
-rw-r--r-- | client/src/sass/include/_bootstrap.scss | 20 |
2 files changed, 38 insertions, 3 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 38b7ea8d4..8e663d32f 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -302,12 +302,23 @@ table { | |||
302 | font-weight: $font-semibold; | 302 | font-weight: $font-semibold; |
303 | } | 303 | } |
304 | 304 | ||
305 | @media screen and (max-width: 1000px) { | ||
306 | .main-col { | ||
307 | &.expanded { | ||
308 | .margin-content { | ||
309 | margin-left: $expanded-horizontal-margins/2; | ||
310 | margin-right: $expanded-horizontal-margins/2; | ||
311 | } | ||
312 | } | ||
313 | } | ||
314 | } | ||
315 | |||
305 | @media screen and (max-width: 900px) { | 316 | @media screen and (max-width: 900px) { |
306 | .main-col { | 317 | .main-col { |
307 | &, &.expanded { | 318 | &.expanded { |
308 | .margin-content { | 319 | .margin-content { |
309 | margin-left: 50px; | 320 | margin-left: $expanded-horizontal-margins/3; |
310 | margin-right: 50px; | 321 | margin-right: $expanded-horizontal-margins/3; |
311 | } | 322 | } |
312 | 323 | ||
313 | .sub-menu { | 324 | .sub-menu { |
@@ -327,6 +338,10 @@ table { | |||
327 | z-index: 10000; | 338 | z-index: 10000; |
328 | } | 339 | } |
329 | 340 | ||
341 | menu { | ||
342 | width: $menu-width; | ||
343 | } | ||
344 | |||
330 | .main-col { | 345 | .main-col { |
331 | margin-left: 0; | 346 | margin-left: 0; |
332 | 347 | ||
diff --git a/client/src/sass/include/_bootstrap.scss b/client/src/sass/include/_bootstrap.scss index a8777af71..4abc887ad 100644 --- a/client/src/sass/include/_bootstrap.scss +++ b/client/src/sass/include/_bootstrap.scss | |||
@@ -4,6 +4,26 @@ $zindex-modal: 10005; | |||
4 | $modal-footer-border-width: 0; | 4 | $modal-footer-border-width: 0; |
5 | $modal-md: 600px; | 5 | $modal-md: 600px; |
6 | 6 | ||
7 | $grid-breakpoints: ( | ||
8 | // Extra small screen / phone | ||
9 | xs: 0, | ||
10 | // Small screen / phone | ||
11 | sm: 576px, | ||
12 | // Medium screen / tablet | ||
13 | md: 768px, | ||
14 | // Large screen / desktop | ||
15 | lg: 900px, | ||
16 | // Extra large screen / wide desktop | ||
17 | xl: 1200px | ||
18 | ); | ||
19 | |||
20 | $container-max-widths: ( | ||
21 | sm: 420px, | ||
22 | md: 720px, | ||
23 | lg: 900px, | ||
24 | xl: 1140px | ||
25 | ); | ||
26 | |||
7 | $input-btn-focus-width: 0; | 27 | $input-btn-focus-width: 0; |
8 | $input-btn-focus-color: inherit; | 28 | $input-btn-focus-color: inherit; |
9 | $input-focus-border-color: #ced4da; | 29 | $input-focus-border-color: #ced4da; |