diff --git a/app/assets/images/front/logo.png b/app/assets/images/front/logo.png index 6242ed3..3d9a848 100644 Binary files a/app/assets/images/front/logo.png and b/app/assets/images/front/logo.png differ diff --git a/app/assets/images/front/logo2.png b/app/assets/images/front/logo2.png new file mode 100644 index 0000000..6242ed3 Binary files /dev/null and b/app/assets/images/front/logo2.png differ diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee index 0530a7a..d9cd47f 100644 --- a/app/assets/javascripts/public.js.coffee +++ b/app/assets/javascripts/public.js.coffee @@ -8,8 +8,16 @@ +resize = () -> + $("#large").css "min-height", ($(window).height()-30)+"px" + +$(window).load -> + resize() $ -> + $(window).bind "resize", -> + resize() + - # \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/stylesheets/public.less b/app/assets/stylesheets/public.less index 49dc4be..cca6517 100644 --- a/app/assets/stylesheets/public.less +++ b/app/assets/stylesheets/public.less @@ -3,18 +3,50 @@ @import "public/framework/bootstrap.less"; +// Font Awesome +@import "fontawesome/font-awesome"; + body{ - font-family : 'Times', 'Times new roman', 'serif'; - font-size:16px; - line-height:1.4em; - -webkit-font-smoothing: antialiased; - - color:#333333; +width:100%; +height:100%; +margin : 0px; +padding : 0px; +font-family:"Avenir"; +font-size:14px; +background:#dadbd5; +color:rgb(23, 54, 93); +h1, h2, h3, h4, h5{ +font-weight:600; +text-align:left; +line-height:normal; +} + +h1{ +color:#295288; +font-size:2em; +text-align:center; +margin:0.2em 0; + +} + +h2{ +color:#295288; +font-size:1.5em; +text-align:center; +margin:0.2em 0; +} + +h3{ +color:#ff7800; +font-size:1.2em; + +} + #testimony_header{ background:rgba(32,141,187,1); @@ -49,21 +81,16 @@ body{ #large{ + width:1020px; max-width:1200px; - margin:auto; - - } - h1,h2,h3,h4,h5,h6{ - font-weight:normal; - text-align:left; - line-height:1em; - color:#295288 !important; - } - - h3{ - color:rgba(255,132,0,1) !important; + margin:auto; + padding:20px; + padding-top:10px; + background:white; + min-height:100%; } + ul{ margin: 0; @@ -78,36 +105,66 @@ body{ } #top{ - border-bottom:8px solid rgba(62,63,64,1); - padding:1em 0; - margin-bottom:1em; + + + margin-bottom:10px; - #menu{ - .active{ - font-weight:bold; - } - margin-top:90px; - text-align:right; - font-size:1.05em; - a{ - display:inline-block; - padding:2px 0.5em; - color:black; - } - } + + } #logo{ width:310px; max-width:310px; - float:left; + } + + #menu{ + + background:#698fb6; + margin:0 -10px; + padding:0 10px; + + li{ + display:inline; + a{ + display:inline-block; + padding:6px 12px; + margin:4px 0px; + font-weight:400; + text-decoration:none; + color:white; + .footer{ + display:none;; + + } + .top{ + display:inline; + + } + + &:hover{ + background:#295288; + border-radius:15px; + + } + + &.active{ + background:#869dbc; + border-radius:15px; + + } + + } + } + } #main{ text-align:justify; clear:both; + margin:10px 0; p{ margin-bottom: 18px; @@ -122,9 +179,7 @@ body{ } } - h1, h2,h3,h4{ - color :#00ade2; - } + .sidebar{ @@ -154,7 +209,7 @@ body{ line-height:1.2em; text-align:left; a{ - color:#333333; + color:rgb(23, 54, 93); &:hover{ text-decoration:none; @@ -188,7 +243,7 @@ body{ a{ color:white; - &.active, &:hover{ + &:hover{ font-weight:bold; color:white; text-decoration:none; @@ -225,9 +280,10 @@ body{ h3{ a{ color:white; - &.active, &:hover{ + &:hover{ font-weight:bold; color:white; + text-decoration:none, } } diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index ff8c481..de1ce26 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -25,9 +25,9 @@ #top =link_to image_tag( "front/logo.png", :id => "logo", :alt => ""), "/" - #menu=render(:partial => "public/shared/first_menu") - - %p{:style => "clear:both;"} + %ul#menu + %li=link_to i(:home, :icon => false), "/" + =render(:partial => "public/shared/first_menu") #main.row-fluid @@ -107,10 +107,7 @@ %a#go_top{:href => "#top_anchor"} - - %p{:style => "clear:both;"} -   - + diff --git a/app/views/public/shared/_first_menu.html.haml b/app/views/public/shared/_first_menu.html.haml index db3d648..4e616b8 100644 --- a/app/views/public/shared/_first_menu.html.haml +++ b/app/views/public/shared/_first_menu.html.haml @@ -1,3 +1,3 @@ -MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item| - =menu_item_link(menu_item) + %li=menu_item_link(menu_item)