From 04435d44ae981aed31b045290b86db683d91a735 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@iMac-de-Nicolas.local>
Date: Thu, 22 Feb 2018 12:58:02 +0100
Subject: [PATCH 1/2] suite

---
 .DS_Store                                    |  Bin 10244 -> 0 bytes
 app/assets/stylesheets/public.scss           | 1009 +-----------------
 app/assets/stylesheets/public/menus.css.scss |    3 +-
 app/views/layouts/public.html.haml           |    3 +
 public/.DS_Store                             |  Bin 8196 -> 0 bytes
 5 files changed, 54 insertions(+), 961 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 public/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index dfb50a3ca835200faa15cc66765bb387c7e318be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
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
AZ~y=R

diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss
index 109961d..e0c029f 100644
--- a/app/assets/stylesheets/public.scss
+++ b/app/assets/stylesheets/public.scss
@@ -6,9 +6,10 @@ $blue: #2BAADA;
 $dark_orange: #E94F25;
 $dark_gray:#363636;
 $title_font : "Lato", sans-serif;
-$sans_serif_font:"Lato", Arial, sans-serif;
+$sans_serif_font:'Mukta Malar', Arial, sans-serif;
 $serif_font : "Roboto Slab", serif;
 $cursive_font : 'Galada', cursive;
+$sans_serif:'Lato', Arial, sans-serif;
 
 @import "jquery.bxslider";
 
@@ -48,105 +49,8 @@ b, strong{
 }
 
 
-.article_comments{
-  margin:auto;
-  max-width:650px;
-  
-  .form_place{
-    
-    .cancel{
-      display:none;
-    }
-  }
-  
-}
-.comment{
-  .header{
-    font-style:italic;
-    margin-bottom:0;
-  }
 
 
-  blockquote{
-    margin:0;
-    margin-top:5px;
-    padding:0;
-    background:rgba(245,244,244,1);
-    padding:1px 10px;
-  }
-  
-}
-
-.child_comments{
-  padding-left:30px;
-  
-}
-
-.comment_form_container{
-  padding:10px;
-  margin-top:20px;
-  background: rgba(250,250,250,1);
-  margin-bottom:20px;
-  fieldset{
-    border:0;
-    padding:0;
-  }
-  .input{
-    
-    &.has-error{
-      
-     
-      .form-control{
-        border: 1px solid red;
-      }
-    }
-    .control-label{
-      display:block;
-      font-size:0.9em;
-      
-    }
-    .form-control{
-      display:block;
-      box-sizing:border-box;
-      width:100%;
-      padding:5px;
-      font-size:1em;
-      
-    }
-    .help-block{
-      display:block;
-      color:red;
-      font-size:0.9em;
-      
-      
-    }
-    
-  }
-  
-  .btn{
-    box-sizing:border-box;
-    width:100%;
-    font-size:1em;
-    padding:10px 20px;
- 
-    border:1px solid gray;
-    
-    display:inline-block;
-    color:white;
-    width:auto;
-    font-size:1em;
-    background:orange;
-    border-color:transparent;
-    margin:0 !important;
-    margin-top:10px !important;
-    cursor:pointer;
-    &:hover{
-      background:rgba(80,80,80,1);
-      
-    }
-  }
-  
-}
 
 #large{
   
@@ -229,7 +133,7 @@ b, strong{
 
 
 body{
-  font-family:"lato", Arial, sans-serif;
+  font-family:$sans_serif, Arial, sans-serif;
   
   line-height:1.4em;
   text-align:left;
@@ -375,60 +279,49 @@ h1{
 
 
 
-.socials_links{
-  position:fixed;
-  bottom:300px;
-  right:0;
-  
-  .link{
-    display:block;
-  
-    width:50px;
-    text-align:center;
-    padding:12px 0;
-    position:relative;
-  
-  
-    color:white !important;
-    font-size:1.2em;
-    &.twitter{
-      background:rgba(54,174,218,1);
-    }
-  
-    &.facebook{
-    
-      background:rgba(60,90,150,1);
-    }
-  
-  
-  
-  }
 
-  .top_link{
-    opacity:0;
-    transition-duration:0.5s;
-    padding:3px 7px;
-    font-size:2.5em;
-    display:block;
-    cursor:pointer;
-    color:rgba(215,215,215,1);
-    &:hover{
-      color:rgba(180,180,180,1);
-    }
-  }
-
-
-}
 
 
 
 
 
 .menu_item_content{
-  //min-height:500px;
+
   padding-bottom:50px;
   position:relative;
   
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    margin-left:60px;
+    
+    li {
+      padding-left: 1em; 
+      text-indent: -30px;
+    }
+
+    li::before {
+      content: "• ";
+      color: $orange;
+      line-height:0.7em;
+      font-size:40px; /* or whatever color you prefer */
+      position:relative;
+      top:4px;
+    }
+  }
+  ol{
+    padding: 0;
+    margin: 0;
+    margin-left:70px;
+    
+    li {
+      padding-left: 6px; 
+ 
+    }
+    
+  }
+  
   p{
     
     text-align:justify;
@@ -459,10 +352,10 @@ h1{
 }
 .main_container{
   
-  max-width:950px;
+  max-width:800px;
   padding:0 20px;
   margin:auto;
-  overflow:hidden;
+
   position:relative;
 
   
@@ -504,9 +397,7 @@ h1{
   }
   
 
-  .main_container{
-    overflow:inherit;
-  }
+
   
   #slider_left{
   
@@ -646,97 +537,6 @@ h1,h2,h3,h4{
 
 
 
-@media screen and (max-width:1350px) {
-
-  .socials_links{
-    position:fixed;
-    bottom:0px;
-    right:100px;
-    width:150px;
-    text-align:right;
-    opacity:1;
-    &:hover{
-      opacity:1;
-    }
-    .link{
-      float:left;
-    
-    }
-    .top_link{
-    
-      float:left;
-    }
-
-  }
-  .width_sidebar{
-
-    //max-width:1250px;
-    margin:0 2%;
-
-
-    #sidebar{
-  
-      .inner{
-        margin:auto;
-
-      }
-
-    }
-
-
-
-  }
-}
-
-
-@media screen and (max-width:1180px) {
-  
-  
-  
-}
-
-@media screen and (max-width:1100px) {
-  
-  
-  
-  
-  
-  #baseline{
-    display:none;
-  }
-  
-  #new_bottom{
-    .main_container{
-      padding:0 20px;
-      
-    }
-  }
-  
-  
-  #slider_banner #slider_right .inner {
-    margin-left:20px !important;
-    padding:10px;
-    
-    h1{
-      font-size:1.2em;
-      margin-top:0;
-    }
-    p{
-      
-      font-size:0.95em;
-    }
-    
-    
-    
-  }
-  
-  
-  
-  
-  
-  
-}
-
 .mobile_bars{
   display:none;
   .right_bars{
@@ -747,724 +547,10 @@ h1,h2,h3,h4{
     padding-bottom:5px;
   }
 }
-@media screen and (max-width:800px) {
-  
-  
-  .special_show_special1{
-    display:block !important;
-    width:auto !important;
-  }
-  .large_thumb{
-    margin:auto;
-    padding-bottom:0;
-  }
-  .special_show .span_6{
-    margin:0;
-    padding:0;
-  }
-  
-  .small_thumb{
-    margin:15px;
-  }
-  
-  .langs_menu{
-    display:block;
-    position:absolute;
-    top:0px;
-    right:10px;
-    z-index:101;
-  }
-  
-  .blog_sidebar{
-    .facebook, .twitter{
-      display:none;
-    }
-    
-  }
-  .video_content{
-    padding:30px 30px;
-  }
-  .video_files{
-    
-    .column{
-      float:none;
-      width:auto;
-      max-width:400px;
-      margin:auto;
-    }
-  }
-  
-  .video_folder{
-    h2{
-      text-align:center;
-    }
-  }
-  .row_actus .home_articles{ 
-    .home_article_header{
-        width:auto;
-        max-width:90%;
-        float:none;
-        margin:auto;
-        margin-bottom:30px !important;
-        max-width:100%;
-        padding:0;
-    
-      }
-    
-    
-    
-    
-    
-  
-  }
-  
-  .article-1x{
-    width:90%;
-    margin:auto;
-  }
-  
-  .investigation_container{
-    width:90%;
-    float:none;
-    top:0;
-    margin-top:40px;
-    
-  }
-  #slider_banner{ 
-    padding-top:0px;
-    padding-bottom:0px;
-  
-    #slider_left{
-      float:none;
-      width:auto;
-      max-width:2000px;
-    }
-  
-   
-  }
-  
-  .follow_row_container {
-    .element{
-    
-      img{display:none}
-    
-      h4{
-        font-size:1.2em;
-        right:0px !important;
-        padding:15px !important
-      }
-    
-    }
-  
-    #element_6{
-      h4{
-        text-align:left;
-      }
-    }
-  }
-  
-  
-  #donate_block_bottom .left_block .inner{
-    
-    h3{
-      font-size:1.6em;
-    }
-  }
-  #donate_block_bottom .right_block .inner{
-    
-
-    
-    margin-left:20px;
-  }
-  
-  
-  body{
-    padding-top:0 !important;
-  }
-  .petition_bottom{
-    
-    .inner{
-      
-      padding:0;
-    }
-  }
-  .petition_large_content{
-    padding:20px 0 !important;
-  }
-  #sidebar{ 
-    ul{ 
-    
-      a{
-    
-    
-      padding:10px 20px !important;
-      }
-    }
-  }
-  .sub_menu_bar{
-    padding:0;
-    border-top:1px solid rgba(255,255,255,0.2);
-    ul{
-      padding:0;
-      margin:0;
-    }
-    li{
-      display:block;
-      
-      a{
-      display:block;
-      padding:10px 20px !important;
-      border-bottom:1px solid rgba(255,255,255,0.2);
-      font-size:1em;
-      border-radius:0 !important;
-      color:white;
-      }
-    }
-  }
-  
-  
-  .sub_bottom{
-    a{
-    display:block !important;
-    padding:10px 20px;
-    border-bottom:1px solid rgba(255,255,255,0.2);
-    margin:0 -10px !important;
-    }
-    padding:30px 20px;
-    p{
-      max-width:100% !important;
-    }
-  }
-  
-  #sidebar, .menu_content_inner, .side_menu{
-    float:none;
-    width:auto !important;
-    display:block;
-    
-  }
-  .menu_content_inner{
-  width: 100% !important;
-   }
- 
- 
-   .menu_item_children_small{ .menu_itemlink_content{
-     display:block;
-     width:auto;
-   }
-   }
-  
-  #menu_top_container{
-    position:relative;
-    top:0;
-    
-    
-    &.move_top{
-      position:static;
-    }
-    
-   
-    
-    
-    
-  #menu{
-  
-    text-align:center;
-    .content, .sub_content, #logo, &.move_top #logo{
-      position:static;
-      display:block;
-      float:none;
-      margin:10px auto;
-    
-    }
-  
-  
-    
-    .donate{
-      display: block !important;
-      margin-top:10px;
-      a{
-        border-bottom:0px solid white !important;
-      }
-    }
-  
-    .content{
-      padding:0;
-      border-top:1px solid rgba(255,255,255,0.2);
-      ul{
-        padding:0;
-        margin:0;
-      }
-      li{
-        display:block !important;
-        a{
-        display:block !important;
-        padding:10px 20px;
-        border-bottom:1px solid rgba(255,255,255,0.2);
-        }
-      }
-      .home_link{
-        display:none !important;
-      }
-    
-    }
-  
-  
-  
-  
-  }
-
-  }
-  
-  .article_top h1, .menu_item_top h1{
-    font-size:30px;
-    bottom:10px;
-  
-  }
-  
 
 
 
 
-  .donate_block{ 
-  
-    .inner{
-      width:auto;
-    
-  
-    }
-  }
-  .columns{
-  
-    width:auto !important;
-    float:none;
-    display:block;
-  }
-
-  .article-2x{
-    width:auto !important;
-    float:none;
-    display:block;
-  
-     .inner{ 
-       height:auto;
-       .img, .description{
-       width:auto !important;
-       float:none !important;
-       margin:0;
-       text-align:center;
-     
-     
-     }
-     .img{
-       margin-bottom:10px;
-     }
-   }
-  }
-
-  .bottom{
-    display:none;
-  }
-  .sub_content{
-    position:static;
-      display: block ;
-      ul{
-        display:none;
-      }
-      
-      .langs_menu{
-        ul{
-          display:block;
-        }
-      }
-  
-    }
-
-  
-  
-  .home_reseaux .social_content{
-    
-    display:none;
-  }
-  #home_social_mobile{
-    padding:10px 0;
-    display:block !important;
-    margin-bottom:20px;
-    a{
-      
-      font-size:1.5em;
-      color:black;
-      margin-bottom:10px;
-      span{
-        font-size:1.8em;
-        margin-left:20px;
-        width:40px;
-        display:inline-block;
-      }
-    }
-    
-  }
-  
-  
-  .row_actus{ 
-    
-    padding:0px 20px;
-    .home_reseaux{
-      float:none;
-      width:auto;
-    
-    }
-    
-    .home_articles{
-      float:none;
-      width:auto;
-      margin:0;
-      
-      #home_article_header{
-        margin:0;
-        max-width:100%;
-        padding:0;
-      }
-      
-      .home_article_small{
-        padding:0;
-        margin-bottom:30px;
-      }
-    }
-    
-    
-    
-  }
-  
-  .investigation_container{
-    .investigations{
-      margin:auto;
-      
-    }
-    width:auto;
-    padding:0;
-    padding-top:30px;
-    border-left:0;
-    border-bottom:0;
-    border-right:0;
-    .investigation{
-      padding:0;
-      float:none;
-      width:auto;
-      margin-bottom:20px;
-      
-    }
-  }
-  
-  .connaitre_container{ 
-    margin-bottom:0;
-    padding:0;
-    .home_title{
-      padding-left: 20px;
-      padding-right: 20px;
-    }
-    
-    .inner{
-      margin:0 -20px;
-      margin-top:0;
-      margin-bottom:0px;
-      
-    }
-    .element{
-      float:none !important;
-      width:90% !important;
-      margin:auto;
-      margin-bottom:50px;
-      padding:20px;
-      
-    
-    }
-    .right{
-      float:none !important;
-      margin-bottom:10px;
-    }
-  }
-  
-  .follow_row_container .element{
-    margin:10px;
-    margin-bottom:20px;
-    
-    float:none !important;
-    width:auto !important;
-    a{
-      height:200px !important;
-    }
-    
-    h4{
-      top:inherit !important;
-      bottom:10px !important;
-      left:10px !important;
-      right:10px !important;
-      text-align:center !important;
-      
-      
-    }
-  }
-  
-  #new_donate{
-    
-    .inner {
-      .left{
-        margin-bottom:20px;
-      }
-      .right a{
-      display:block;
-      margin:20px 30px;
-      margin-top:0px;
-      
-      }
-    }
-  }
-  
-  
-  .mobile_bars{
-    display:block;
-    
-    
-  }
-  
-  .sub_menu_bar ul li a{
-    display:none ;
-    
-    &.active{
-      display:block ;
-    }
-    
-  }
-  .sub_menu_bar li a{
-    
-    
-    
-    &.active{
-      display:block ;
-    }
-  }
-  
-  .sub_menu_bar ul li{
-    display:block;
-  }
-  
-  .mobile_show_block{
-    display:block !important;
-  }
-  
-  .menu_content_inner .inner{
-    
-    margin: 0 20px;
-    .bottom_subpages{
-      margin:0;
-      padding:0 20px;
-      .subpage_link{
-        margin:0;
-        margin-bottom:40px;
-        width:100%;
-        
-      }
-    }
-  }
-}
-
-@media screen and (max-width:600px) {
-  
-  #home_social_mobile{
-    margin-bottom:0;
-    a{
-      display:block;
-      
-    }
-    
-  }
-  .top{
-  
-  
-    #logo, &.move_top #logo{
-      position:static;
-      display:block;
-      float:none;
-      margin:10px auto;
-    
-    }
-    .contact{
-      display:none;
-  
-  
-    }
-  }
-
-  .article_top h1, .menu_item_top h1{
-    font-size:23px;
-    bottom:10px;
-  
-  }
-
-
-  #new_bottom{
-    padding:0 20px;
-    .newsletter_bottom, .socials_bottom{
-      border:0;
-      width:auto;
-      float:none;
-      padding-left:0;
-      padding-right:0;
-    }
-    .newsletter_bottom{
-      border-bottom:1px solid  rgba(255, 255, 255, 0.8);
-    }
-  }
-  
-  
-  #bxslider .inner{
-    width:100% !important;
-    max-width:100% !important;
-  }
-  .petitions_large_view .petition_small{
-    
-    width:50%;
-  }
-  .no_mobile{
-    display:none;
-  }
-
-
-  
-  .shortcut_row .shortcut{
-    float:none !important;
-    width:auto !important;
-    margin:20px !important;
-    
-    
-  }
-  .index_category .article_header .image{
-    margin-bottom:10px;
-    
-  }
-  .home_reseaux{
-    float:none !important;
-    width:100% !important;
-    .inner{
-      margin-right:0 !important;
-    }
-    
-  }
-  
-  .home_articles{
-    float:none !important;
-    width:100% !important;
-    
-  }
-  
-  .left_follow{
-    float:none !important;
-    width:100% !important;
-    margin-bottom:20px;
-    
-  }
-  
-  .right_follow{
-    float:none !important;
-    width:100% !important;
-    .inner{
-      margin-right:10px !important;
-    }
-    .element{
-      width:50% !important;
-      
-    }
-    
-  }
-
-
-  .row_actus {
-    .home_reseaux{
-      margin-bottom:20px;
-    
-    }
-    .home_articles{ 
-      .inner{
-        margin:0;
-      }
-      #home_more_articles {
-        margin:0;
-        .home_article_small{
-        
-          float:none;
-          width:auto;
-          .inner{
-            background:white;
-          }
-        
-        }
-      }
-      #home_article_header{ 
-        margin-bottom:0;
-        .image{
-          float:none;
-          width:auto;
-        }
-        .description{
-          margin:0;
-          p{
-            margin-bottom:0;
-          }
-        }
-      
-      }
-    }
-  }
-  
-  
-  
-  
-  
-  #donate_block_bottom{ 
-    margin-top:40px;
-    padding-top:20px;
-    padding-bottom:20px;
-    .right_block{
-      float:none !important;
-      width:auto !important;
-    
-      .inner{
-        margin-left:0;
-      }
-    
-    }
-    
-    .left_block{
-      float:none !important;
-      width:auto !important;
-      
-      .inner{
-        padding-bottom:1px;
-      }
-    
-    }
-  }
-  
-  .row_actus .home_articles #home_more_articles .home_article_small h2{
-    
-    font-size:1em;
-    font-family:$sans_serif_font;
-    padding:10px;
-    text-transform:uppercase;
-    
-    
-  }
-  
-  .row_actus .home_articles #home_more_articles{
-    margin-bottom:0;
-  }
-  
-  #sub_links{
-    text-align:right;
-  }
-  
-}
-
 
 .contact_page{
   
@@ -1483,14 +569,19 @@ h1,h2,h3,h4{
 
 
 .menu_item_content{
+
+  padding:1px 60px;
+  background:white;
+
   h2{
-    background:$orange;
-    padding: 8px 13px;
+    color:$orange;
+    padding:0px 0;
+    margin-top:30px;
     font-size:1.1em;
-    display:inline-block;
-    color:white;
-    margin-bottom:0px;
-    font-weight:normal;
+  
+
+    margin-bottom:-5px;
+    font-weight:bold;
   }
   
 }
diff --git a/app/assets/stylesheets/public/menus.css.scss b/app/assets/stylesheets/public/menus.css.scss
index 02b468a..b71d9bd 100644
--- a/app/assets/stylesheets/public/menus.css.scss
+++ b/app/assets/stylesheets/public/menus.css.scss
@@ -2,7 +2,7 @@
 
 #menu_top_container{
 
-  background:$dark_gray;
+  background:rgb(10,10,10);
   z-index:60;
 
   
@@ -88,7 +88,6 @@
   text-align:center;
   background:white;
   
-  
   font-size:0.9em;
   
   
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 3083115..dbe7157 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -82,6 +82,9 @@
     
     <link href="https://fonts.googleapis.com/css?family=Galada|Lato:400,900|Roboto+Slab:400,700" rel="stylesheet">
     <script src="https://f.vimeocdn.com/js/froogaloop2.min.js"></script>
+    
+    <link href="https://fonts.googleapis.com/css?family=Mukta+Malar" rel="stylesheet">
+    
     =javascript_include_tag "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&amp;sensor=false"
     <!-- Facebook Pixel Code -->
     <script>
diff --git a/public/.DS_Store b/public/.DS_Store
deleted file mode 100644
index 4802da8f5d54cafe26197b73ad2fdc17d0778a28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMJx?1!5PeGkTS}BbhoHG1kVN7aa6(2(8zDgnw$FhmXU?**f<$w_gCdGVMVI^o
z$}|xL9ZlL4QEHST%A4H{+WWBN5Ge{`M%sPn*_oZ0cdK2m4Zy6AlT}~|K$A^y;UT*k
zk#T7inem!sqM<*!S%2Vk?=CCWs!#@$0cAiLPzIEN|A7IX*&@ve=e`@&UKvmZ?j-}V
zKSXSTvB%t@-8$IWD*$npYAbwRkOyMqG4_}{<Osz$SE6$@{)%CoJN1#bi#_HJojZ)b
zd>9|u_#29`(K&x)&0%7P+A9OfK$QWxyU(D5qjYa|vvhyA`hM1GCF8>`aCtWO(oW#@
zNv(dcAI|eZ9Om!}84hrWQ6b9XuWyQ@L9FjrpKPqax1ZfatQjrDeX=Xg^LULu+So%6
zqh!=gJ6V=i1_~+R(a*ADkksjgc$X#)(yARVB<6OtMGP<|=_wQJVuwlgknp*U5uTH(
z6v^*&WxJcgJS<{s`0UGcUO{O;zFkXY)5Ho2{sXU&hV7GciPazp0~VXH@T9ahuzg&$
z2=e{>;-gGao+HR@f<>4I7@o3%w<KTIXAeX6`^;;|7b9ynq3(dMMPASjwLPw;F>`KX
z7;=ur+SA+56x4NkF)u0IHm9KeznrPSQ{%nlBx^BuXis5wdj69S6=mQqGVs79y(IVl
zjmf|N-^J22XJtScn34fA+uCfc)7YNsHBNHMM{K)nB4U?2v@YxlUj+F1<_|+YM>G|m
V*kkUH8jAi9U}?}!8Th9R`~nRk0Yd-)


From 68c41f80288137214c7f3c12964cdc3e84214dc8 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@iMac-de-Nicolas.local>
Date: Fri, 23 Feb 2018 01:49:55 +0100
Subject: [PATCH 2/2] suite

---
 app/assets/stylesheets/public.scss            | 65 +++++++++----------
 .../public/menu_items_controller.rb           |  2 +-
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss
index e0c029f..2d44885 100644
--- a/app/assets/stylesheets/public.scss
+++ b/app/assets/stylesheets/public.scss
@@ -286,28 +286,49 @@ h1{
 
 
 .menu_item_content{
-
+  padding:1px 60px;
   padding-bottom:50px;
   position:relative;
+ 
+
+  h2{
+    color:$orange;
+    padding:0px 0;
+    margin-top:35px;
+    font-size:1.2em;
+    //text-transform:none;
+    line-height:1.3em;
+    margin-bottom:-5px;
+    font-weight:bold;
+  }
+  h3{
+    //text-transform:none;
+    font-size:1.05em;
+    margin-bottom:-5px;
+  }
+  
   
   ul {
     list-style: none;
     padding: 0;
     margin: 0;
-    margin-left:60px;
+    margin-top:15px;
+    margin-left:50px;
     
     li {
-      padding-left: 1em; 
-      text-indent: -30px;
+      padding-left: 0px; 
+      text-indent: -18px;
+      margin-bottom:8px;
     }
 
     li::before {
       content: "• ";
       color: $orange;
       line-height:0.7em;
-      font-size:40px; /* or whatever color you prefer */
+      font-size:20px; /* or whatever color you prefer */
       position:relative;
-      top:4px;
+      top:0px;
+      right:4px;
     }
   }
   ol{
@@ -352,7 +373,7 @@ h1{
 }
 .main_container{
   
-  max-width:800px;
+  max-width:950px;
   padding:0 20px;
   margin:auto;
 
@@ -487,17 +508,7 @@ h2.home_title{
   
 }
 
-h1,h2,h3,h4{
-  &.cursive{
-    text-transform:none;
-    font-weight:normal;
-    font-family:$cursive_font;
-    line-height:1.1em;
- 
-    
-  }
-  
-}
+
 
 .serif_link{
   font-family:$serif_font;
@@ -567,21 +578,3 @@ h1,h2,h3,h4{
 }
 
 
-
-.menu_item_content{
-
-  padding:1px 60px;
-  background:white;
-
-  h2{
-    color:$orange;
-    padding:0px 0;
-    margin-top:30px;
-    font-size:1.1em;
-  
-
-    margin-bottom:-5px;
-    font-weight:bold;
-  }
-  
-}
diff --git a/app/controllers/public/menu_items_controller.rb b/app/controllers/public/menu_items_controller.rb
index d1dc742..fc058d7 100644
--- a/app/controllers/public/menu_items_controller.rb
+++ b/app/controllers/public/menu_items_controller.rb
@@ -73,7 +73,7 @@ class Public::MenuItemsController < ApplicationController
       if @menu_item.menu_content.blocks.find_by_lang_site_id(@lang.id).portlets.count == 0
         if @menu_item.children.count > 0
           
-          menu_item_lang = @menu_item.children.first.menu_item_langs.find_by_lang_site_id(@lang.id)
+          menu_item_lang = @menu_item.children.order(:position).first.menu_item_langs.find_by_lang_site_id(@lang.id)
           redirect_to menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug)
         end