diff options
-rw-r--r-- | client/src/app/menu/menu.component.scss | 17 | ||||
-rw-r--r-- | client/src/sass/application.scss | 17 |
2 files changed, 13 insertions, 21 deletions
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 4ef330b2f..c725580d1 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -20,16 +20,12 @@ menu { | |||
20 | color: $menu-color; | 20 | color: $menu-color; |
21 | display: flex; | 21 | display: flex; |
22 | flex-direction: column; | 22 | flex-direction: column; |
23 | width: 100%; | ||
23 | 24 | ||
24 | &:focus, &:hover { | 25 | &:focus, &:hover { |
25 | overflow-y: auto; | 26 | overflow-y: auto; |
26 | } | 27 | } |
27 | 28 | ||
28 | .top-menu { | ||
29 | flex-grow: 1; | ||
30 | width: $menu-width; | ||
31 | } | ||
32 | |||
33 | .logged-in-block { | 29 | .logged-in-block { |
34 | height: 100px; | 30 | height: 100px; |
35 | background-color: rgba(255, 255, 255, 0.15); | 31 | background-color: rgba(255, 255, 255, 0.15); |
@@ -230,3 +226,14 @@ menu { | |||
230 | } | 226 | } |
231 | } | 227 | } |
232 | } | 228 | } |
229 | |||
230 | @media screen and (max-width: 400px) { | ||
231 | .menu-wrapper { | ||
232 | width: 100% !important; | ||
233 | z-index: 10000; | ||
234 | } | ||
235 | |||
236 | .top-menu { | ||
237 | width: 100%; | ||
238 | } | ||
239 | } | ||
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index b92036de7..c380fe5bf 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -338,15 +338,6 @@ table { | |||
338 | } | 338 | } |
339 | 339 | ||
340 | @media screen and (max-width: 600px) { | 340 | @media screen and (max-width: 600px) { |
341 | .menu-wrapper { | ||
342 | width: 100% !important; | ||
343 | z-index: 10000; | ||
344 | } | ||
345 | |||
346 | menu { | ||
347 | width: $menu-width; | ||
348 | } | ||
349 | |||
350 | .main-col { | 341 | .main-col { |
351 | margin-left: 0; | 342 | margin-left: 0; |
352 | 343 | ||
@@ -367,10 +358,4 @@ table { | |||
367 | } | 358 | } |
368 | } | 359 | } |
369 | } | 360 | } |
370 | } | 361 | } \ No newline at end of file |
371 | |||
372 | @media screen and (max-width: 400px) { | ||
373 | menu { | ||
374 | width: 100%; | ||
375 | } | ||
376 | } | ||