Merge branch 'master' of gitlab.quartz.xyz:nbally/jipe_app

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;
   
   

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
          

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>