Browse Source

Add google font loading into the library as site.variables

pull/1129/head
jlukic 10 years ago
parent
commit
f7e9e6e70c
4 changed files with 19 additions and 6 deletions
  1. 2
      server/layouts/default.html.eco
  2. 10
      src/definitions/globals/site.less
  3. 2
      src/semantic.config.example
  4. 11
      src/themes/packages/default/globals/site.variables

2
server/layouts/default.html.eco

@ -28,8 +28,6 @@
<meta name="description" content="<%= @getPreparedDescription() %>" /> <meta name="description" content="<%= @getPreparedDescription() %>" />
<meta name="keywords" content="<%= @getPreparedKeywords() %>" /> <meta name="keywords" content="<%= @getPreparedKeywords() %>" />
<link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic' rel='stylesheet' type='text/css'>
<% if 'development' in @getEnvironments(): %> <% if 'development' in @getEnvironments(): %>
<link rel="stylesheet" type="text/css" class="ui" href="/build/uncompressed/definitions/globals/reset.css"> <link rel="stylesheet" type="text/css" class="ui" href="/build/uncompressed/definitions/globals/reset.css">
<link rel="stylesheet" type="text/css" class="ui" href="/build/uncompressed/definitions/globals/site.css"> <link rel="stylesheet" type="text/css" class="ui" href="/build/uncompressed/definitions/globals/site.css">

10
src/definitions/globals/site.less

@ -19,6 +19,15 @@
@import '../../semantic.config'; @import '../../semantic.config';
/*******************************
Web Fonts
*******************************/
.loadFonts() when (@useGoogleFonts) {
@import (css) 'http://fonts.googleapis.com/css?family=@{googleFontName}:@{googleFontSizes}';
}
.loadFonts();
/******************************* /*******************************
Page Page
*******************************/ *******************************/
@ -49,6 +58,7 @@ body {
color: @textColor; color: @textColor;
} }
/******************************* /*******************************
Text Text
*******************************/ *******************************/

2
src/semantic.config.example

@ -113,7 +113,7 @@
@import "@{userFolder}/@{type}s/@{element}.variables"; @import "@{userFolder}/@{type}s/@{element}.variables";
/*------------------ /*------------------
Override Mix-in
Override Mix-in
-------------------*/ -------------------*/
.loadUIOverrides() { .loadUIOverrides() {

11
src/themes/packages/default/globals/site.variables

@ -13,9 +13,13 @@
Fonts 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 Site Colors
@ -492,3 +496,4 @@
@instagramActiveColor : darken(@instagramColor, 5); @instagramActiveColor : darken(@instagramColor, 5);
@pinterestActiveColor : darken(@pinterestColor, 5); @pinterestActiveColor : darken(@pinterestColor, 5);
@vkActiveColor : darken(@vkColor, 5); @vkActiveColor : darken(@vkColor, 5);
Loading…
Cancel
Save