Refs #2475: adding imported fonts to new layout

18 files changed, 178 insertions, 1 deletions

diff --git a/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.ttf b/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.ttf
new file mode 100644
index 000000000..fd79d43be
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.ttf
diff --git a/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.woff b/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.woff
new file mode 100644
index 000000000..4d887fc28
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.woff
diff --git a/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.woff2 b/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.woff2
new file mode 100644
index 000000000..e750d601a
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Bold/OpenSans-Bold.woff2
diff --git a/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.ttf b/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.ttf
new file mode 100644
index 000000000..9bc800958
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.ttf
diff --git a/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.woff b/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.woff
new file mode 100644
index 000000000..3fc5f8434
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.woff
diff --git a/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.woff2 b/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.woff2
new file mode 100644
index 000000000..20fb8be0a
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Bold/OpenSans-BoldItalic.woff2
diff --git a/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.ttf b/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.ttf
new file mode 100644
index 000000000..c90da48ff
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.ttf
diff --git a/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.woff b/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.woff
new file mode 100644
index 000000000..53cac7f97
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.woff
diff --git a/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.woff2 b/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.woff2
new file mode 100644
index 000000000..870164f53
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Regular/OpenSans-Italic.woff2
diff --git a/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.ttf b/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.ttf
new file mode 100644
index 000000000..db433349b
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.ttf
diff --git a/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.woff b/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.woff
new file mode 100644
index 000000000..d1e57a6e0
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.woff
diff --git a/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.woff2 b/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.woff2
new file mode 100644
index 000000000..b6e5fa4e4
--- /dev/null
+++ b/app/assets/fonts/OpenSans/Regular/OpenSans-Regular.woff2
diff --git a/app/assets/fonts/stylesheet.css b/app/assets/fonts/stylesheet.css
new file mode 100644
index 000000000..8df311eca
--- /dev/null
+++ b/app/assets/fonts/stylesheet.css
@@ -0,0 +1,120 @@
+/* Generated by Font Squirrel (https://www.fontsquirrel.com) on January 30, 2017 */
+
+
+
+@font-face {
+    font-family: 'open_sansbold';
+    src: url('opensans-bold-webfont.woff2') format('woff2'),
+         url('opensans-bold-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sansbold_italic';
+    src: url('opensans-bolditalic-webfont.woff2') format('woff2'),
+         url('opensans-bolditalic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sansextrabold';
+    src: url('opensans-extrabold-webfont.woff2') format('woff2'),
+         url('opensans-extrabold-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sansextrabold_italic';
+    src: url('opensans-extrabolditalic-webfont.woff2') format('woff2'),
+         url('opensans-extrabolditalic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sansitalic';
+    src: url('opensans-italic-webfont.woff2') format('woff2'),
+         url('opensans-italic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sanslight';
+    src: url('opensans-light-webfont.woff2') format('woff2'),
+         url('opensans-light-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sanslight_italic';
+    src: url('opensans-lightitalic-webfont.woff2') format('woff2'),
+         url('opensans-lightitalic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sansregular';
+    src: url('opensans-regular-webfont.woff2') format('woff2'),
+         url('opensans-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sanssemibold';
+    src: url('opensans-semibold-webfont.woff2') format('woff2'),
+         url('opensans-semibold-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'open_sanssemibold_italic';
+    src: url('opensans-semibolditalic-webfont.woff2') format('woff2'),
+         url('opensans-semibolditalic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/application_new.sass b/app/assets/stylesheets/application_new.sass
index e3aeee56b..7fa753a01 100644
--- a/app/assets/stylesheets/application_new.sass
+++ b/app/assets/stylesheets/application_new.sass
@@ -2,5 +2,10 @@
 //  Custom  //
 //----------//
 
+@import 'new/config'
+
+@import 'new/typography'
+
 @import 'new/layout'
+
 @import 'new/components/*'
diff --git a/app/assets/stylesheets/new/_config.sass b/app/assets/stylesheets/new/_config.sass
new file mode 100644
index 000000000..2660ae3cb
--- /dev/null
+++ b/app/assets/stylesheets/new/_config.sass
@@ -0,0 +1,21 @@
+//-------------//
+//  Variables  //
+//-------------//
+
+// Typography
+$base-font-size: 1.4rem
+$line-height: 1.4
+$h1-size: 3rem
+$h2-size: 1.8rem
+
+$base-font-family: 'Open Sans', sans-serif
+
+// Colors
+$darkblue: #004d87
+$blue: #007fbb
+
+$darkgrey: #4b4b4b
+$grey: #a4a4a4
+
+$green: #006d5c
+$red: #e22019
diff --git a/app/assets/stylesheets/new/layout.sass b/app/assets/stylesheets/new/_layout.sass
index 9e460406b..9e460406b 100644
--- a/app/assets/stylesheets/new/layout.sass
+++ b/app/assets/stylesheets/new/_layout.sass
diff --git a/app/assets/stylesheets/new/_typography.sass b/app/assets/stylesheets/new/_typography.sass
new file mode 100644
index 000000000..cb370eb86
--- /dev/null
+++ b/app/assets/stylesheets/new/_typography.sass
@@ -0,0 +1,31 @@
+//---------//
+//  Fonts  //
+//---------//
+
+@font-face
+  // Regular
+  font-family: 'Open Sans'
+  src: url(asset-path('OpenSans/Regular/OpenSans-Regular.woff2')) format('woff2'), url(asset-path('OpenSans/Regular/OpenSans-Regular.woff')) format('woff'), url(asset-path('OpenSans/Regular/OpenSans-Regular.ttf')) format('ttf')
+  font-weight: 400
+  font-style: normal
+
+@font-face
+  // Regular Italic
+  font-family: 'Open Sans'
+  src: url(asset-path('OpenSans/Regular/OpenSans-Italic.woff2')) format('woff2'), url(asset-path('OpenSans/Regular/OpenSans-Italic.woff')) format('woff'), url(asset-path('OpenSans/Regular/OpenSans-Italic.ttf')) format('ttf')
+  font-weight: 400
+  font-style: italic
+
+@font-face
+  // Bold
+  font-family: 'Open Sans'
+  src: url(asset-path('OpenSans/Bold/OpenSans-Bold.woff2')) format('woff2'), url(asset-path('OpenSans/Bold/OpenSans-Bold.woff')) format('woff'), url(asset-path('OpenSans/Bold/OpenSans-Bold.ttf')) format('ttf')
+  font-weight: 700
+  font-style: normal
+
+@font-face
+  // Bold Italic
+  font-family: 'Open Sans'
+  src: url(asset-path('OpenSans/Bold/OpenSans-BoldItalic.woff2')) format('woff2'), url(asset-path('OpenSans/Bold/OpenSans-BoldItalic.woff')) format('woff'), url(asset-path('OpenSans/Bold/OpenSans-BoldItalic.ttf')) format('ttf')
+  font-weight: 700
+  font-style: italic
diff --git a/app/views/layouts/application_new.html.slim b/app/views/layouts/application_new.html.slim
index 6effdc432..0a7b6bbbf 100644
--- a/app/views/layouts/application_new.html.slim
+++ b/app/views/layouts/application_new.html.slim
@@ -26,7 +26,7 @@ html lang=I18n.locale
           .container
             .row
               .col-lg-12.col-md-12.col-sm-12.col-xs-12
-                #workspace class=("#{controller_name} #{action_name}") 
+                #workspace class=("#{controller_name} #{action_name}")
                   = yield
 
                 #sidebar