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] 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