Browse Source

Improved stcky footer, removed nav on unavailable locale pages, added facebook meta image

development
Godwin 9 years ago
parent
commit
34b042c3c1
  1. 26
      app/assets/stylesheets/_application.scss
  2. 2
      app/views/application/_header.html.haml
  3. 2
      app/views/conferences/_header.html.haml
  4. 2
      app/views/layouts/application.html.haml

26
app/assets/stylesheets/_application.scss

@ -988,6 +988,10 @@ ul.warnings li,
font-size: 0.6333em; font-size: 0.6333em;
} }
} }
body.error-locale-not-available & {
display: none;
}
} }
.logo { .logo {
@ -1019,6 +1023,10 @@ ul.warnings li,
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
body.error-locale-not-available & {
display: none;
}
} }
} }
@ -1368,6 +1376,7 @@ ul.warnings li,
position: relative; position: relative;
background-color: $white; background-color: $white;
padding-bottom: rems(2); padding-bottom: rems(2);
flex: 1;
article { article {
padding: rems(2.5) 0; padding: rems(2.5) 0;
@ -1493,6 +1502,11 @@ a.logo {
font-size: 1.15em; font-size: 1.15em;
} }
} }
.secondary {
font-size: 0.85em;
line-height: 2em;
}
} }
$header-tilt: 8deg; $header-tilt: 8deg;
@ -1703,11 +1717,21 @@ $header-tilt: 8deg;
padding: 0; padding: 0;
list-style: none; list-style: none;
} }
body.error-locale-not-available & {
.github, .facebook, .locales {
visibility: hidden;
}
}
} }
body { body {
#primary-content { #primary-content {
@include _(transition, 'filter 250ms ease-in-out, -webkit-filter 250ms ease-in-out'); @include _(transition, 'filter 250ms ease-in-out, -webkit-filter 250ms ease-in-out');
display: flex;
flex-direction: column;
min-height: 100vh;
overflow: hidden;
} }
&.has-overlay { &.has-overlay {
@ -3301,7 +3325,7 @@ html[data-ontop] {
#main { #main {
padding-left: $sidebar-width; padding-left: $sidebar-width;
min-height: 100vh; //min-height: 100vh;
} }
#header-title { #header-title {

2
app/views/application/_header.html.haml

@ -16,3 +16,5 @@
= row do = row do
= columns do = columns do
%h1=_(@main_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}", :t, @main_title_vars) %h1=_(@main_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}", :t, @main_title_vars)
- content_for :og_image do
= image

2
app/views/conferences/_header.html.haml

@ -6,3 +6,5 @@
.secondary .secondary
= date_span(@conference.start_date.to_date, @conference.end_date.to_date) = date_span(@conference.start_date.to_date, @conference.end_date.to_date)
%img{src: @conference.poster.full.url || image_path('default_poster.jpg'), role: :presentation, alt: ''} %img{src: @conference.poster.full.url || image_path('default_poster.jpg'), role: :presentation, alt: ''}
- content_for :og_image do
= @conference.poster.full.url || image_path('default_poster.jpg')

2
app/views/layouts/application.html.haml

@ -12,6 +12,8 @@
%link{ href: asset_path('favicon.ico'), rel: 'icon', type: 'image/x-icon' } %link{ href: asset_path('favicon.ico'), rel: 'icon', type: 'image/x-icon' }
- @alt_lang_urls.each do |locale, url| - @alt_lang_urls.each do |locale, url|
%link{ rel: :alternate, hreflang: locale, href: url } %link{ rel: :alternate, hreflang: locale, href: url }
- if content_for?(:og_image)
%meta{property: 'og:image', content: (yield :og_image)}
-#%link{ href: asset_path('apple-touch-icon.png'), rel: 'apple-touch-icon' } -#%link{ href: asset_path('apple-touch-icon.png'), rel: 'apple-touch-icon' }
-#%link{ href: asset_path('apple-touch-icon-72x72.png'), rel: 'apple-touch-icon', sizes: '72x72' } -#%link{ href: asset_path('apple-touch-icon-72x72.png'), rel: 'apple-touch-icon', sizes: '72x72' }
-#%link{ href: asset_path('apple-touch-icon-114x114.png'), rel: 'apple-touch-icon', sizes: '114x114' } -#%link{ href: asset_path('apple-touch-icon-114x114.png'), rel: 'apple-touch-icon', sizes: '114x114' }

Loading…
Cancel
Save