Skip to content

Commit

Permalink
Merge pull request #14 from stroebjo/fix_variables-default
Browse files Browse the repository at this point in the history
Fix: not all variables are rewritable
  • Loading branch information
BafS authored Apr 4, 2017
2 parents 727021d + 6e8c8d6 commit 457ef68
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Base
$line-height: 1.5;
$spacing: 1.5rem;
$line-height: 1.5 !default;
$spacing: 1.5rem !default;

// Font family
// Taken from bootstrap
$font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, 'Times New Roman', Times, serif !default;
$font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace !default;

$base-font-family: $font-family-sans-serif;
$headers-font-family: $font-family-sans-serif;
$base-font-family: $font-family-sans-serif !default;
$headers-font-family: $font-family-sans-serif !default;

// Colors
// Note: Black prints faster (http://www.sanbeiji.com/archives/953)
Expand All @@ -33,7 +33,7 @@ $font-size-h5: 1.25rem !default;
$font-size-h6: 1rem !default;

// Page
$page-padding-left: 1.8cm;
$page-padding-right: 1.8cm;
$page-padding-top: 2.54cm;
$page-padding-bottom: 2.54cm;
$page-padding-left: 1.8cm !default;
$page-padding-right: 1.8cm !default;
$page-padding-top: 2.54cm !default;
$page-padding-bottom: 2.54cm !default;

0 comments on commit 457ef68

Please sign in to comment.