CSS updates

ascottmccauley · Apr 14, 2015 · f8680ad · f8680ad
1 parent 6d17f6d
commit f8680ad
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 27 deletions.
diff --git a/src/css/_fonts.scss b/src/css/_fonts.scss
@@ -0,0 +1,24 @@
+/* latin */
+@font-face {
+  font-family: 'Cinzel';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Cinzel-Regular'), url(http://fonts.gstatic.com/s/cinzel/v4/i2BwM1Eq2JyiNOY_VrkubH-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Halant';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Halant'), local('Halant-Regular'), url(http://fonts.gstatic.com/s/halant/v1/khajQ-2ikbYj6pF4Knh3B-vvDin1pK8aKteLpeZ5c0A.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Halant';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Halant'), local('Halant-Regular'), url(http://fonts.gstatic.com/s/halant/v1/mZpXEouvK6zSLIYSbXCHP-vvDin1pK8aKteLpeZ5c0A.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
diff --git a/src/css/_settings.scss b/src/css/_settings.scss
@@ -70,32 +70,6 @@ $include-parent-classes: true !default;
 
 // a. Base
 // - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/* latin */
-@font-face {
-  font-family: 'Cinzel';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Cinzel-Regular'), url(http://fonts.gstatic.com/s/cinzel/v4/i2BwM1Eq2JyiNOY_VrkubH-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
-/* latin-ext */
-@font-face {
-  font-family: 'Halant';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Halant'), local('Halant-Regular'), url(http://fonts.gstatic.com/s/halant/v1/khajQ-2ikbYj6pF4Knh3B-vvDin1pK8aKteLpeZ5c0A.woff2) format('woff2');
-  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
-  font-family: 'Halant';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Halant'), local('Halant-Regular'), url(http://fonts.gstatic.com/s/halant/v1/mZpXEouvK6zSLIYSbXCHP-vvDin1pK8aKteLpeZ5c0A.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
-
 // This is the default html and body font-size for the base rem value.
 $rem-base: 16px;
 

diff --git a/src/css/editor-style.scss b/src/css/editor-style.scss
@@ -1,3 +1,22 @@
 // This is styling specific for the admin editor screen
 
-@import "settings";
+@import "settings";
+
+$include-html-classes: false  !default; // Only import mixins from Foundation
+$include-html-global-classes: true !default; // Include the typography classes from Foundation
+$include-html-type-classes: true !default;  // Include the typography classes from Foundation
+$include-print-styles: false  !default; // Do not include print classes
+
+@import "fonts";
+
+// Import Foundation
+@import "../../bower_components/foundation/scss/foundation";
+
+body {
+	background: $body-bg;
+	color: $body-font-color;
+	padding: 10px;
+}
+
+
+
diff --git a/src/css/login.scss b/src/css/login.scss
@@ -2,6 +2,8 @@
 
 @import "settings";
 
+@import "fonts";
+
 // Specific styles for the login page
 body.login-action-login {}
 

diff --git a/src/css/main.scss b/src/css/main.scss
@@ -3,6 +3,8 @@
 
 @import "settings";
 
+@import "fonts";
+
 // Import Foundation
 $include-parent-classes: true !default; // Have child themes import this stylesheet by default
 @import "../../bower_components/foundation/scss/normalize";