diff options
Diffstat (limited to 'amber/layouts')
| -rw-r--r-- | amber/layouts/_footer.html.haml | 2 | ||||
| -rw-r--r-- | amber/layouts/_masthead.html.haml | 25 | ||||
| -rw-r--r-- | amber/layouts/default.html.haml | 41 |
3 files changed, 28 insertions, 40 deletions
diff --git a/amber/layouts/_footer.html.haml b/amber/layouts/_footer.html.haml index e90e43d..4a6aa39 100644 --- a/amber/layouts/_footer.html.haml +++ b/amber/layouts/_footer.html.haml @@ -4,4 +4,4 @@ %a{:rel => "license", :href => "https://creativecommons.org/licenses/by-sa/3.0/"}< %img{:alt => "Creative Commons License", :style => "border-width:0; vertical-align: middle", :src => "/img/by-sa-3.0-80x15.png"} - <span>(c) 2012-2018 LEAP Encryption Access Project</span> + <span>(c) 2012-2019 LEAP Encryption Access Project</span> diff --git a/amber/layouts/_masthead.html.haml b/amber/layouts/_masthead.html.haml index f37d6e9..af86d84 100644 --- a/amber/layouts/_masthead.html.haml +++ b/amber/layouts/_masthead.html.haml @@ -1,17 +1,8 @@ -.masthead-inner - .container - .row - -# if has_navigation? - .col-sm-3.col-md-2 - .col-sm-9.col-md-10 - %h1 LEAP Encryption Access Project - %ul.list-unstyled#top-menu - - top_navigation_items(include_home:true) do |item| - %li{:class => [item[:class], 'tab'].join(' ')} - %a{:href => item[:href], :class => [item[:class], 'tab'].join(' ')}= item[:label] - .col-sm-12.logo - %h1 LEAP Encryption Access Project - %ul.list-unstyled#top-menu - - top_navigation_items(include_home:true) do |item| - %li{:class => [item[:class], 'tab'].join(' ')} - %a{:href => item[:href], :class => [item[:class], 'tab'].join(' ')}= item[:label] +%header + %picture + %source{:media => "(min-width: 35.5em)", :srcset => "/img/leap180.png"} + %img{:alt => "LEAP logo", :src => "/img/leap128.png"} + %h1 LEAP Encryption Access Project + %nav.nav-menu{:role => "navigation"} + - top_navigation_items(include_home:true) do |item| + %a.nav-item{:href => item[:href], :class => item[:class]}= item[:label] diff --git a/amber/layouts/default.html.haml b/amber/layouts/default.html.haml index d252806..19172be 100644 --- a/amber/layouts/default.html.haml +++ b/amber/layouts/default.html.haml @@ -9,30 +9,27 @@ %link(rel="stylesheet" href="/assets/font-awesome/css/font-awesome.min.css") = html_head_base %body - #wrap - #masthead - = render 'layouts/masthead' - #main.container - .row - - if has_navigation? - #sidebar.col-sm-4.col-md-3 - = render 'layouts/sidebar' - .col-sm-8.col-md-9 + = render 'layouts/masthead' + #main.container + .row + - if has_navigation? + #sidebar.col-sm-4.col-md-3 + = render 'layouts/sidebar' + .col-sm-8.col-md-9 + .title-box + = yield :title + = render 'layouts/titlebox' + .content-box + - if translation_missing? + .alert.alert-info= t(:missing_translation) + = yield :content + - else + .col-sm-12 + - unless @page.props.show_title === false .title-box = yield :title - = render 'layouts/titlebox' - .content-box - - if translation_missing? - .alert.alert-info= t(:missing_translation) - = yield :content - - else - .col-sm-12 - - unless @page.props.show_title === false - .title-box - = yield :title - .content-box - = yield :content - + .content-box + = yield :content #footer = render 'layouts/footer' #background |