From e15b6717874d922478378e32913e23e4e75f7ce8 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 31 Aug 2017 17:59:08 +0200 Subject: [PATCH] suite --- app/assets/stylesheets/public.scss | 13 ++++---- app/views/public/menu_items/show.html.haml | 36 +++++++++++----------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 6b92780..7155f65 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -6,19 +6,20 @@ // Font Awesome //@import "fontawesome/font-awesome"; - +.large_only{ + display:none; +} @media (min-width: 992px){ .mobile_only{ display:none; } -.sidebar{ - padding-top:30px; - .square{ - display:none; +.large_only{ + + display:block; - } + } } diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index a4466a6..4ed00ad 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -3,28 +3,28 @@ -content_for :sidebar do - - -if @menu_item.parent_id - -if @menu_item.ancestors.reverse[0] - -first_level_menu = @menu_item.ancestors.reverse[0] + .large_only + -if @menu_item.parent_id + -if @menu_item.ancestors.reverse[0] + -first_level_menu = @menu_item.ancestors.reverse[0] - -else + -else - -first_level_menu = @menu_item + -first_level_menu = @menu_item - -#if first_level_menu.children.size > 0 - -if first_level_menu.children.count > 0 - .square.green - %h3=menu_item_link(first_level_menu) - %ul - -first_level_menu.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| + -#if first_level_menu.children.size > 0 + -if first_level_menu.children.count > 0 + .square.green + %h3=menu_item_link(first_level_menu) + %ul + -first_level_menu.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| - %li - =menu_item_link(menu_item) - -if menu_item.children.where(:enabled => true, :visible => true).size > 0 - %ul - -menu_item.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| - %li=menu_item_link(menu_item) + %li + =menu_item_link(menu_item) + -if menu_item.children.where(:enabled => true, :visible => true).size > 0 + %ul + -menu_item.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item| + %li=menu_item_link(menu_item) .mobile_only