nicolas/jipe_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2018-02-23 01:49:55 +01:00
parent 04435d44ae
commit 68c41f8028
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/assets/stylesheets/public.scss
View File

@ -286,28 +286,49 @@ h1{
.menu_item_content{ .menu_item_content{
padding:1px 60px;
padding-bottom:50px; padding-bottom:50px;
position:relative; 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 { ul {
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-left:60px; margin-top:15px;
margin-left:50px;
li { li {
padding-left: 1em; padding-left: 0px;
text-indent: -30px; text-indent: -18px;
margin-bottom:8px;
} }
li::before { li::before {
content: "• "; content: "• ";
color: $orange; color: $orange;
line-height:0.7em; line-height:0.7em;
font-size:40px; /* or whatever color you prefer */ font-size:20px; /* or whatever color you prefer */
position:relative; position:relative;
top:4px; top:0px;
right:4px;
} }
} }
ol{ ol{
@ -352,7 +373,7 @@ h1{
} }
.main_container{ .main_container{
max-width:800px; max-width:950px;
padding:0 20px; padding:0 20px;
margin:auto; 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{ .serif_link{
font-family:$serif_font; 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;
}
}

2
app/controllers/public/menu_items_controller.rb
View File

@ -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.menu_content.blocks.find_by_lang_site_id(@lang.id).portlets.count == 0
if @menu_item.children.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) redirect_to menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug)
end end