Browse Source

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)

pull/1257/head
jlukic 10 years ago
parent
commit
37202a56a2
3 changed files with 13 additions and 3 deletions
  1. 6
      src/definitions/globals/site.less
  2. 8
      src/theme.config.example
  3. 2
      src/themes/default/globals/site.variables

6
src/definitions/globals/site.less

@ -17,6 +17,7 @@
@element : 'site'; @element : 'site';
@import '../../theme.config'; @import '../../theme.config';
.loadFonts(); .loadFonts();
/******************************* /*******************************
@ -62,6 +63,7 @@ h4,
h5 { h5 {
line-height: @headerLineHeight; line-height: @headerLineHeight;
margin: @headerMargin; margin: @headerMargin;
font-weight: @headerFontWeight;
padding: 0em; padding: 0em;
} }
@ -89,6 +91,7 @@ h5 {
p { p {
margin: @paragraphMargin; margin: @paragraphMargin;
line-height: @paragraphLineHeight;
} }
p:first-child { p:first-child {
margin-top: 0em; margin-top: 0em;
@ -126,7 +129,4 @@ a:hover {
color: @highlightColor; color: @highlightColor;
} }
.loadFonts() when (@importGoogleFonts) {
@import (css) 'http://fonts.googleapis.com/css?family=@{googleFontRequest}';
}
.loadUIOverrides(); .loadUIOverrides();

8
src/theme.config.example

@ -113,6 +113,14 @@
@import "@{siteFolder}/globals/site.variables"; @import "@{siteFolder}/globals/site.variables";
@import "@{siteFolder}/@{type}s/@{element}.variables"; @import "@{siteFolder}/@{type}s/@{element}.variables";
/*------------------
Fonts
-------------------*/
.loadFonts() when (@importGoogleFonts) {
@import (css) 'http://fonts.googleapis.com/css?family=@{googleFontRequest}';
}
/*------------------ /*------------------
Overrides Overrides
-------------------*/ -------------------*/

2
src/themes/default/globals/site.variables

@ -26,6 +26,7 @@
Page Heading Page Heading
---------------*/ ---------------*/
@headerFontWeight : bold;
@headerLineHeight : 1.33em; @headerLineHeight : 1.33em;
@h1 : 2rem; @h1 : 2rem;
@ -117,6 +118,7 @@
--------------------*/ --------------------*/
@paragraphMargin : 0em 0em 1em; @paragraphMargin : 0em 0em 1em;
@paragraphLineHeight : @lineHeight;
/*------------------- /*-------------------
Links Links

Loading…
Cancel
Save