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 174a896..b75ab62
--- 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;
 
 @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;
 
         @include size(font-size, 10px);
         list-style: none;
 


@@ -115,7 +119,12 @@ body.menu-on {
         }
     }
 
         }
     }
 

+    #main-menu-side {
+        display: none;
+    }
+    

     #main-menu {
     #main-menu {

+        display: block;

         list-style: none;
         padding: 0;
         margin: 0;
         list-style: none;
         padding: 0;
         margin: 0;


@@ -127,7 +136,7 @@ body.menu-on {
 
         li {
             display: inline-block;
 
         li {
             display: inline-block;

-            @include size(width, 20%);
+            @include size(width, 14.2%);

 
             &.active {
                 background-color: white;
 
             &.active {
                 background-color: white;


@@ -140,7 +149,7 @@ body.menu-on {
                 @include size(padding, 18px 0 15px);
                 //@include size(border-bottom, 3px solid #e2e2e2);
                 color: #0c7076;
                 @include size(padding, 18px 0 15px);
                 //@include size(border-bottom, 3px solid #e2e2e2);
                 color: #0c7076;

-                @include size(font-size, 11px);
+                @include size(font-size, 15px);

                 @include mono;
 
                 &.active {
                 @include mono;
 
                 &.active {