From 20189a709bdb9af4abf4bcdbe9f92816b6cb457b Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Fri, 28 Oct 2016 11:15:19 -0700 Subject: [PATCH] Using Google font: Roboto --- theme/site/globals/site.overrides | 2 -- theme/site/globals/site.variables | 18 +++++++++++++++--- theme/style.less | 5 ++++- theme/theme.config | 3 --- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides index f5d814a3..cba59efe 100644 --- a/theme/site/globals/site.overrides +++ b/theme/site/globals/site.overrides @@ -1,5 +1,3 @@ /******************************* Site Overrides *******************************/ - -@importGoogleFonts: false; diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables index 78c641e1..cca661d8 100644 --- a/theme/site/globals/site.variables +++ b/theme/site/globals/site.variables @@ -1,7 +1,17 @@ /******************************* User Global Variables *******************************/ -@importGoogleFonts: false; + +@importGoogleFonts: true; + +@fontName : 'Roboto Mono'; + +@emSize : 14px; +@fontSize : 13px; + +/*------------------- + Site Colors +--------------------*/ @primaryColor: #3CB5B5; @secondaryColor: #43C9C9; @@ -18,9 +28,11 @@ @brown:#6B5B4C; @grey:#42495F; +@pageBackground : #FDFDFA; + + /******************************* PXT Overrides *******************************/ -@backgroundColor: #FDFDFA; -@blocklyToolboxColor: #F6F4E6; \ No newline at end of file +@blocklyToolboxColor: #F6F4E6; diff --git a/theme/style.less b/theme/style.less index 7fc16232..a329ad54 100644 --- a/theme/style.less +++ b/theme/style.less @@ -32,6 +32,9 @@ &:extend(.yellow all); } +/******************************* + Blockly +*******************************/ .blocklyTreeRow { border-radius:5px; @@ -44,7 +47,7 @@ /* Blockly Text */ .blocklyTreeLabel { - font-family: "Gotham SSm A","Gotham SSm B","Montserrat","Lucida Grande","Lucida Sans Unicode","Lucida Sans",Geneva,Verdana,sans-serif !important; + font-family: @pageFont !important; } .blocklyTreeLabel { diff --git a/theme/theme.config b/theme/theme.config index 504b1d10..f5d11def 100644 --- a/theme/theme.config +++ b/theme/theme.config @@ -91,7 +91,4 @@ @fontPath : 'fonts'; -@headerFont : 'Segoe UI', 'Helvetica Neue', Arial, Helvetica, sans-serif; -@pageFont : 'Segoe UI', 'Helvetica Neue', Arial, Helvetica, sans-serif; - /* End Config */