diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5cfeeec..1c69f5e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,12 +12,8 @@ // //= require jquery //= require jquery_ujs -//=require 'foundation/foundation.topbar' -//=require 'foundation/foundation.slider' +//= require foundation //= require fancybox //= require jquery.cycle2 //= require_tree . -$(function(){ - $(document).foundation(); } - ); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index d350adc..5d8fa0f 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -9,8 +9,7 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self - //= require foundation_and_overrides - */ +@import "foundation_and_overrides"; @import "my.css.scss"; diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss index f977d3f..6c54280 100644 --- a/app/assets/stylesheets/foundation_and_overrides.scss +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -1452,14 +1452,14 @@ $debian_color: #c70338; $primary-color: $debian_color; // Larger top bar -$topbar-height: 60px; +$topbar-height: rem-calc(60); // Larger font in top bar -$topbar-link-font-size: rem-calc(20); +$topbar-link-font-size: rem-calc(15); -$topbar-button-font-size: 1rem; -$topbar-button-top: 14px; +$topbar-button-font-size: rem-calc(3); +$topbar-button-top: rem-calc(5); -$topbar-link-padding: 8px; +$topbar-link-padding: rem-calc(8); // At which width the top navigation bar should be switched to // mobile mode because otherwise it would wrap into two lines. @@ -1470,8 +1470,8 @@ $topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})"; @import url(http://fonts.googleapis.com/css?family=Droid+Sans:400,700); $body-font-family: "Droid Sans"; -$button-tny: 0.3rem; -$button-font-tny: 0.9rem; +$button-tny: rem-calc(0.3); +$button-font-tny: rem-calc(0.9); // Make the background of progress bars use a light version of the primary color $progress-bar-color: tint($primary-color, 80); diff --git a/app/assets/stylesheets/my.css.scss b/app/assets/stylesheets/my.css.scss index 0255f06..3c2eb4a 100644 --- a/app/assets/stylesheets/my.css.scss +++ b/app/assets/stylesheets/my.css.scss @@ -276,14 +276,14 @@ a.black text-align: left; color: white; text-transform: uppercase; - font-size: 0.8rem; + font-size: 0.8em; font-weight: bolder; .meter { background-color: $primary-color; padding: 2px; - padding-left: 0.4rem; + padding-left: 0.4em; text-shadow: 0 0 2px black; } } diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 4240b63..0842887 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -28,7 +28,7 @@ html // Load Javascript libraries // Initialize Zurb Foundation javascript: - //$(document).foundation(); + $(document).foundation(); $('.fancybox').fancybox({nextEffect: "none", prevEffect: "none"}); // See http://wbotelhos.com/raty