From f7e9e6e70ca7d2e477c55d3af5a5963705494d55 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 15 Sep 2014 22:02:29 -0400 Subject: [PATCH] Add google font loading into the library as site.variables --- server/layouts/default.html.eco | 2 -- src/definitions/globals/site.less | 10 ++++++++++ src/semantic.config.example | 2 +- src/themes/packages/default/globals/site.variables | 11 ++++++++--- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 913cad104..e8a58d83a 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -28,8 +28,6 @@ - - <% if 'development' in @getEnvironments(): %> diff --git a/src/definitions/globals/site.less b/src/definitions/globals/site.less index c0ea97d8a..0742ab7ef 100755 --- a/src/definitions/globals/site.less +++ b/src/definitions/globals/site.less @@ -19,6 +19,15 @@ @import '../../semantic.config'; +/******************************* + Web Fonts +*******************************/ + +.loadFonts() when (@useGoogleFonts) { + @import (css) 'http://fonts.googleapis.com/css?family=@{googleFontName}:@{googleFontSizes}'; +} +.loadFonts(); + /******************************* Page *******************************/ @@ -49,6 +58,7 @@ body { color: @textColor; } + /******************************* Text *******************************/ diff --git a/src/semantic.config.example b/src/semantic.config.example index 81f3fef02..8cd7aea9e 100755 --- a/src/semantic.config.example +++ b/src/semantic.config.example @@ -113,7 +113,7 @@ @import "@{userFolder}/@{type}s/@{element}.variables"; /*------------------ - Override Mix-in + Override Mix-in -------------------*/ .loadUIOverrides() { diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables index 71f0c0b87..4b19a404d 100755 --- a/src/themes/packages/default/globals/site.variables +++ b/src/themes/packages/default/globals/site.variables @@ -13,9 +13,13 @@ Fonts --------------------*/ -@headerFont : "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; -@pageFont : "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; -@fontSmoothing : antialiased; +@headerFont : 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif; +@pageFont : 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif; +@fontSmoothing : antialiased; + +@useGoogleFonts : true; +@googleFontName : 'Lato'; +@googleFontSizes : '300,400,700,300italic,400italic,700italic'; /*------------------- Site Colors @@ -492,3 +496,4 @@ @instagramActiveColor : darken(@instagramColor, 5); @pinterestActiveColor : darken(@pinterestColor, 5); @vkActiveColor : darken(@vkColor, 5); +