Merge remote-tracking branch 'zawadzki/new-design'

[wolnelektury.git] / src / wolnelektury / static / scss / main / menu.scss

diff --git a/src/wolnelektury/static/scss/main/menu.scss b/src/wolnelektury/static/scss/main/menu.scss
old mode 100755 (executable)
new mode 100644 (file)
index c2f708a..18aa4bd
--- a/src/wolnelektury/static/scss/main/menu.scss
+++ b/src/wolnelektury/static/scss/main/menu.scss
@@ -92,14 +92,18 @@ body.menu-on {
 }
 
 
-
+#main-menu {
+    display: none;
+}
 
 @media screen and (min-width: 1024px) {
     #user-info {
         @include mono;
         position: absolute;
-        right: 150px;
-        top: 4px;
+        right: 0px;
+        top: 3px;
+        margin: 0;
+        @include size(line-height, 43px);
         @include size(font-size, 10px);
         list-style: none;
 
@@ -115,7 +119,12 @@ body.menu-on {
         }
     }
 
+    #main-menu-side {
+        display: none;
+    }
+    
     #main-menu {
+        display: block;
         list-style: none;
         padding: 0;
         margin: 0;
@@ -127,16 +136,20 @@ body.menu-on {
 
         li {
             display: inline-block;
-            @include size(width, 20%);
+            @include size(width, 16.6%);
+
+            &.active {
+                background-color: white;
+            }
 
             a {
                 text-align: center;
                 display: block;
                 @include size(line-height, 13px);
                 @include size(padding, 18px 0 15px);
-                @include size(border-bottom, 3px solid #e2e2e2);
+                //@include size(border-bottom, 3px solid #e2e2e2);
                 color: #0c7076;
-                @include size(font-size, 11px);
+                @include size(font-size, 15px);
                 @include mono;
 
                 &.active {