From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 24 Jun 2016 14:49:25 +0000 (+0000)
Subject: Custom Montserrat web font #502 @0:20
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a7b0f01c9cd7d2004bcfa5b4bbbb02c4f148bb8e;p=fluidbook-v3.git

Custom Montserrat web font #502 @0:20
---

diff --git a/css/fonts/Montserrat/Montserrat.css b/css/fonts/Montserrat/Montserrat.css
new file mode 100644
index 0000000..aa0f056
--- /dev/null
+++ b/css/fonts/Montserrat/Montserrat.css
@@ -0,0 +1,15 @@
+@font-face {
+    font-family: 'Montserrat';
+    src: url('montserrat-light-webfont.woff2') format('woff2'),
+    url('montserrat-light-webfont.woff') format('woff');
+    font-weight: 300;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Montserrat';
+    src: url('montserrat-semibold-webfont.woff2') format('woff2'),
+    url('montserrat-semibold-webfont.woff') format('woff');
+    font-weight: 600;
+    font-style: normal;
+}
diff --git a/css/fonts/Montserrat/montserrat-light-webfont.woff b/css/fonts/Montserrat/montserrat-light-webfont.woff
new file mode 100755
index 0000000..4051a54
Binary files /dev/null and b/css/fonts/Montserrat/montserrat-light-webfont.woff differ
diff --git a/css/fonts/Montserrat/montserrat-light-webfont.woff2 b/css/fonts/Montserrat/montserrat-light-webfont.woff2
new file mode 100755
index 0000000..00bfd0b
Binary files /dev/null and b/css/fonts/Montserrat/montserrat-light-webfont.woff2 differ
diff --git a/css/fonts/Montserrat/montserrat-semibold-webfont.woff b/css/fonts/Montserrat/montserrat-semibold-webfont.woff
new file mode 100755
index 0000000..7841293
Binary files /dev/null and b/css/fonts/Montserrat/montserrat-semibold-webfont.woff differ
diff --git a/css/fonts/Montserrat/montserrat-semibold-webfont.woff2 b/css/fonts/Montserrat/montserrat-semibold-webfont.woff2
new file mode 100755
index 0000000..11e1750
Binary files /dev/null and b/css/fonts/Montserrat/montserrat-semibold-webfont.woff2 differ
diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index 83f8186..2c0c166 100644
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -20,8 +20,10 @@ $this->headScript()->addTagHandler(true); // Used by related articles selector i
  *
  */
 
-// Google Font
-$fonts = array('google' => array('families' => array('Open+Sans|Playfair+Display')));
+// Fonts
+$fonts = array('google' => array('families' => array('Open+Sans|Playfair+Display')),
+			   'custom' => array('families' => array('Montserrat'), 'urls' => array('/css/fonts/Montserrat/Montserrat.css')));
+
 $this->headScript()->addWebFont($fonts);
 
 profile(__FILE__, __LINE__, 'Before rendering body');