From db363484901a9521949cdd394c0701bb51153e2b Mon Sep 17 00:00:00 2001 From: Ofer Lehr Date: Sat, 6 Dec 2014 22:43:12 +0200 Subject: new info box (now card) styling - Partial added a class to the info card to style different types in css. also rearranged colors in helpers.js (alon: changed implementation and broke the edit, will fix in the morning) --- res/css/modules/colors.scss | 1 + res/css/modules/mixins.scss | 6 ++++++ res/css/modules/typography.scss | 9 +++++++++ 3 files changed, 16 insertions(+) (limited to 'res/css/modules') diff --git a/res/css/modules/colors.scss b/res/css/modules/colors.scss index 11337ef7..905d239d 100644 --- a/res/css/modules/colors.scss +++ b/res/css/modules/colors.scss @@ -1,4 +1,5 @@ $light-grey: #f5f5fa; +$mid-light-grey: #d4d4d9; $mid-grey: #919095; $dark-grey: #363636; $magenta: #ee3654; diff --git a/res/css/modules/mixins.scss b/res/css/modules/mixins.scss index 9afcbe80..3c431be0 100644 --- a/res/css/modules/mixins.scss +++ b/res/css/modules/mixins.scss @@ -8,4 +8,10 @@ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; +} + +@mixin rz-box-sizing-padding() { + -webkit-box-sizing: padding-box; + -moz-box-sizing: padding-box; + box-sizing: padding-box; } \ No newline at end of file diff --git a/res/css/modules/typography.scss b/res/css/modules/typography.scss index 8a7d8fe7..6a8c1102 100644 --- a/res/css/modules/typography.scss +++ b/res/css/modules/typography.scss @@ -16,6 +16,14 @@ url('../font/sourcesanspro_semibold/SourceSansPro-Semibold-webfont.ttf') format('truetype'); /* Safari, Android, iOS */ } +@font-face { + font-family: 'Source_Bold'; + src: url('../font/sourcesanspro_bold/SourceSansPro-Bold-webfont.eot'); /* IE9 Compat Modes */ + src: url('../font/sourcesanspro_bold/SourceSansPro-Bold-webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../font/sourcesanspro_bold/SourceSansPro-Bold-webfont.woff') format('woff'), /* Modern Browsers */ + url('../font/sourcesanspro_bold/SourceSansPro-Bold-webfont.ttf') format('truetype'); /* Safari, Android, iOS */ +} + //Font size $h1-size: 30px; $h2-size: 24px; @@ -31,6 +39,7 @@ $bold: 600; // Base font $base-font-family: 'Source_Regular', sans-serif; $semibold-font-family: 'Source_Semibold', sans-serif; +$bold-font-family: 'Source_Bold', sans-serif; $base-font-weight: $regular; $base-font-size: 12px; -- cgit v1.3.1