diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 1ebc13a..3c42050 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -6,7 +6,7 @@ $orange: rgba(251,163,58,1); @import "fontawesome/font-awesome"; @import "qi_grids"; @import "popover"; -@import "public/petitions"; + @import "public/menu_item_link_contents"; @import "public/menus"; @import "public/slippry"; @@ -55,6 +55,9 @@ h1,h2,h3{ height:100px; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.11); background:white; + border-left:15px solid rgba(26,147,166,1); + position:relative; + z-index:2; #logo{ margin:25px; height:50px; @@ -93,4 +96,26 @@ h1,h2,h3{ .logo{ height:50px; } +} + +.menu_item_top{ + background:center center no-repeat; + background-size:100%; + background-size:cover; + min-height:450px; + position:relative; + h1{ + color:white; + position:absolute; + bottom:50px; + right:20px; + left:20px; + text-align:center; + font-size:2.4em; + + } + &.principal{ + + //min-height:600px; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/public/petitions.css.scss b/app/assets/stylesheets/public/petitions.css.scss deleted file mode 100644 index 70b1499..0000000 --- a/app/assets/stylesheets/public/petitions.css.scss +++ /dev/null @@ -1,420 +0,0 @@ - - - - -.petition_socials_links{ - text-align:center; - margin:50px -10px; - .link{ - display:inline-block; - - width:200px; - box-sizing:border-box; - text-align:center; - padding:12px 20px; - position:relative; - - margin:0px 20px; - - font-size:2.2em; - div{ - - font-size:15px; - font-weight:bold; - } - color:white; - - - - color:white; - - &.twitter{ - $d_color:rgba(54,174,218,1); - background: $d_color; - &:hover{ - background:lighten( $d_color, 5); - - } - } - - &.facebook{ - $d_color:rgba(60,90,150,1); - background: $d_color; - &:hover{ - background:lighten( $d_color, 5); - - } - - } - - - -} -} - -.petition_bottom{ - .petition_socials_links{ - .link{ - max-width:250px; - } - - } - -} - - -.petition_large{ - - .petition_large_content{ - padding:40px; - .inner_left,.inner_right{ - padding:0 40px; - width:45%; - box-sizing:border-box; - float:left; - } - - .inner_left{ - padding:0 40px; - width:55%; - - img{ - float:right; - width:230px; - } - } - - .inner_right{ - h2{ - line-height:1.2em; - text-align:center; - } - img{ - margin:20px auto; - } - .sign_now{ - text-align:center; - margin:20px 0; - a{ - display:inline-block; - padding: 15px 25px; - color:white; - - margin:10px; - font-weight:bold; - $sign_color:#c12e2a; - background:#c12e2a; - - &:hover{ - background:lighten($sign_color, 5); - color:white; - } - - &.donate{ - color:$orange; - background:transparent; - border:1px solid $orange; - padding: 10px 20px; - - &:hover{ - background:$orange; - color:white; - } - - } - } - p{margin-top:5px;} - - } - } - - } -} - -.donate_block{ - margin:10px 20px; - margin-bottom:100px; - .inner{ - padding:0 40px; - width:50%; - box-sizing:border-box; - - text-align:center; - - margin:auto; - a.d{ - font-weight:bold; - display:inline-block; - margin-top:30px; - font-size:1em; - padding: 10px 20px; - border:2px solid $orange; - color:$orange; - &:hover{ - background:$orange; - color:white; - } - } - } - - - -} -.petition_top{ - background:center center no-repeat; - background-size:100%; - background-size:cover; - height:350px; - max-width:700px; -} - -.petition_form_inner{ - background:center center no-repeat; - background-size:100%; - background-size:cover; - padding:50px; - -} - - -.petition{ - - margin:50px; - box-shadow:0 0 20px rgba(0,0,0,0.1); - background:white; - border-radius:5px; - overflow:hidden; - - - img{ - - width:400px; - float:left; - } - .content{ - float:left; - position:relative; - width:60%; - background:white; - .inner{ - max-width:500px; - margin:auto; - padding:50px 20px; - } - - } - - .guillemet{ - font-family:palatino; - opacity:0.6; - font-size:3em; - position:absolute; - - - - &.top_corner{ - top:5px; - left:30px; - padding-top:15px; - padding-left:5px; - } - - &.bottom_corner{ - bottom:15px; - right:30px; - - } - } - - .form{ - //color:white; - //background:$orange; - padding:20px 40px; - margin-left:60%; - #petition_signator_newsletter_input{ - input{ - display:inline; - width:auto; - margin-right:5px; - } - label{ - display:inline; - } - - } - h2{ - - text-align:center; - color:#c12e2a; - } - - fieldset{ - border:0; - padding:0; - margin:0; - } - .form-group{ - padding-bottom:10px; - - } - .has-error{ - color:red; - - input{ - border-color:red; - } - } - input{ - box-sizing:border-box; - width:100%; - font-size:0.9em; - padding:10px 10px; - - border:1px solid rgba(200,200,200,1); - - } - select{ - - height: 35px; - line-height: 35px; - width:100%; - font-size:1.2em; - } - .btn{ - margin-top:20px; - display:inline-block; - - padding:10px 20px; - - - - width:auto; - font-size:1em; - - border-radius:0; - cursor:pointer; - - color:white; - $sign_color:#c12e2a; - background:#c12e2a; - padding: 15px 25px; - font-weight:bold; - border:0; - - &:hover{ - background:lighten($sign_color, 5); - color:white; - } - - - - &:btn-primary{ - - } - } - - } - - -} - -.petition_line{ - text-align:center; - .petition_top{ - width:55%; - max-width:auto; - float:left; - margin-right:20px; - } - .inner{ - margin:0; - - padding:0 20px; - padding-top:20px; - - } - img{ - width:200px; - - - } - h2{ - - line-height:1.2em; - } - a{ - display:inline-block; - color:$orange; - padding:10px 20px; - border:1px solid $orange; - } - - &:nth-child(odd){ - .petition_top{ - float:right; - margin:0; - margin-left:20px; - } - - .inner{ - position:relative; - margin-right:55%; - &:after{ - content: ''; - position: absolute; - border: 15px solid transparent; - top: 40%; - right: -30px; - - border-color: transparent; - border-left-color: white; - - - } - } - } - - &:nth-child(even){ - - .inner{ - position:relative; - margin-left:55%; - - &:after{ - content: ''; - position: absolute; - border: 15px solid transparent; - top: 40%; - left: -30px; - - border-color: transparent; - border-right-color: white; - - - } - } - } - - - -} -.menu_item_top{ - background:center center no-repeat; - background-size:100%; - background-size:cover; - min-height:450px; - position:relative; - h1{ - color:white; - position:absolute; - bottom:50px; - right:20px; - text-align:right; - font-size:2.4em; - - } - &.principal{ - - //min-height:600px; - } -} \ No newline at end of file diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index f289050..cb52fb2 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -7,40 +7,6 @@ -menu_title = @menu_item --if @menu_item.id != 1 - .menu_item_title - %h1 - =menu_title.menu_content.lang_pages.find_by_lang_site_id(@lang.id).title - - -if @menu_item - -if @menu_item.parent_id - -if @menu_item.ancestors.reverse[0] - -first_level_menu = @menu_item.ancestors.reverse[0] - - -else - - -first_level_menu = @menu_item - - -if first_level_menu.children.size > 0 - - .sub_menu_bar_container - .sub_menu_bar - %ul - -first_level_menu.children.order(:position).each do |menu_item| - - %li - -if @ancestor_1 - -if @ancestor_1 == menu_item - =menu_item_link(menu_item, true) - -else - =menu_item_link(menu_item, false) - -else - =menu_item_link(menu_item) - - - - - -content_for :corps do -if @menu_item.title_image -img_url = @menu_item.image_file.file.large.url if @menu_item.image_file diff --git a/public/logo.png b/public/logo.png index dfc6e52..632aa0c 100644 Binary files a/public/logo.png and b/public/logo.png differ