From 37202a56a221854f828732e31f1fae339e9ffd2f Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Mon, 17 Nov 2014 18:17:40 -0500
Subject: [PATCH] Sort out global variables to be in intuitive order and match
 definition, move font loading to theme.config (this means users might need to
 re-install)

---
 src/definitions/globals/site.less         | 6 +++---
 src/theme.config.example                  | 8 ++++++++
 src/themes/default/globals/site.variables | 2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/definitions/globals/site.less b/src/definitions/globals/site.less
index 4a93fce70..d5f7508c8 100755
--- a/src/definitions/globals/site.less
+++ b/src/definitions/globals/site.less
@@ -17,6 +17,7 @@
 @element : 'site';
 
 @import '../../theme.config';
+
 .loadFonts();
 
 /*******************************
@@ -62,6 +63,7 @@ h4,
 h5 {
   line-height: @headerLineHeight;
   margin: @headerMargin;
+  font-weight: @headerFontWeight;
   padding: 0em;
 }
 
@@ -89,6 +91,7 @@ h5 {
 
 p {
   margin: @paragraphMargin;
+  line-height: @paragraphLineHeight;
 }
 p:first-child {
   margin-top: 0em;
@@ -126,7 +129,4 @@ a:hover {
   color: @highlightColor;
 }
 
-.loadFonts() when (@importGoogleFonts) {
-  @import (css) 'http://fonts.googleapis.com/css?family=@{googleFontRequest}';
-}
 .loadUIOverrides();
\ No newline at end of file
diff --git a/src/theme.config.example b/src/theme.config.example
index 0476e83c6..b67e57967 100755
--- a/src/theme.config.example
+++ b/src/theme.config.example
@@ -113,6 +113,14 @@
 @import "@{siteFolder}/globals/site.variables";
 @import "@{siteFolder}/@{type}s/@{element}.variables";
 
+/*------------------
+       Fonts
+-------------------*/
+
+.loadFonts() when (@importGoogleFonts) {
+  @import (css) 'http://fonts.googleapis.com/css?family=@{googleFontRequest}';
+}
+
 /*------------------
      Overrides
 -------------------*/
diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables
index ce647eeb6..d5d39d1a0 100644
--- a/src/themes/default/globals/site.variables
+++ b/src/themes/default/globals/site.variables
@@ -26,6 +26,7 @@
   Page Heading
 ---------------*/
 
+@headerFontWeight : bold;
 @headerLineHeight : 1.33em;
 
 @h1               : 2rem;
@@ -117,6 +118,7 @@
 --------------------*/
 
 @paragraphMargin     : 0em 0em 1em;
+@paragraphLineHeight : @lineHeight;
 
 /*-------------------
        Links