diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b809585dc..1c97069b0 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -132,5 +132,3 @@ $(function(){ $(document).on('page:load', initialize_modules); $(document).on('ajax:complete', initialize_modules); }); - -$(function(){ $(document).foundation(); }); diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 1f03c9be7..537cdbbf9 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -10,7 +10,7 @@ // 1. CONSUL variables // -------------------- -$base-font-size: rem-calc(17); +$base-font-size: 17px; $base-line: rem-calc(26); $small-font-size: rem-calc(14); $line-height: rem-calc(24); @@ -65,10 +65,47 @@ $alert-bg: #f2dede; $alert-border: #ebccd1; $color-alert: #a94442; - // 2. Foundation settings overrides // --------------------------------- +$black: #222; +$white: #fff; + +$body-font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important; + +$header-font-family: $body-font-family; + +$global-radius: rem-calc(3); + +$button-radius: $global-radius; + +$font-family-serif: Georgia, 'Times New Roman', Times, serif; + +$header-sizes: ( + small: ( + 'h1': 34, + 'h2': 24, + 'h3': 20, + 'h4': 18, + 'h5': 16, + 'h6': 14, + ), + medium: ( + 'h1': 44, + 'h2': 34, + 'h3': 24, + 'h4': 19, + 'h5': 16, + 'h6': 13, + ), +); + +$small-font-size: rem-calc(14); + +$abbr-underline: none; + +$tab-background-active: $white; + $accordion-item-color: foreground($accordion-background, $text); $accordion-content-color: foreground($accordion-background, $text);