diff options
| author | Ofer Lehr <ofer@oferlehr.com> | 2014-12-01 00:44:10 +0200 |
|---|---|---|
| committer | Ofer Lehr <ofer@oferlehr.com> | 2014-12-01 00:44:10 +0200 |
| commit | f92ea38fff179613edb543b6435750c0ed64e573 (patch) | |
| tree | c8f27e48fc12cd6442878fb91f79864f50d6094f /res/css/modules | |
| parent | b12f2c868cb71d6b23158ef86f5b16977df941a9 (diff) | |
fixed sass variable colors and polished top bar css
Diffstat (limited to 'res/css/modules')
| -rw-r--r-- | res/css/modules/Typography.scss | 24 | ||||
| -rw-r--r-- | res/css/modules/colors.scss | 18 | ||||
| -rw-r--r-- | res/css/modules/positions.scss | 2 |
3 files changed, 31 insertions, 13 deletions
diff --git a/res/css/modules/Typography.scss b/res/css/modules/Typography.scss index 224e7a44..03d4a5b4 100644 --- a/res/css/modules/Typography.scss +++ b/res/css/modules/Typography.scss @@ -1,3 +1,21 @@ +// Font font-family: + +@font-face { + font-family: 'Source_Regular'; + src: url('../../font/sourcesanspro_regular/SourceSansPro-Regular-webfont.eot'); /* IE9 Compat Modes */ + src: url('../../font/sourcesanspro_regular/SourceSansPro-Regular-webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../font/sourcesanspro_regular/SourceSansPro-Regular-webfont.woff') format('woff'), /* Modern Browsers */ + url('../../font/sourcesanspro_regular/SourceSansPro-Regular-webfont.ttf') format('truetype'); /* Safari, Android, iOS */ +} + +@font-face { + font-family: 'Source_Semibold'; + src: url('../../font/sourcesanspro_semibold/SourceSansPro-Semibold-webfont.eot'); /* IE9 Compat Modes */ + src: url('../../font/sourcesanspro_semibold/SourceSansPro-Semibold-webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../font/sourcesanspro_semibold/SourceSansPro-Semibold-webfont.woff') format('woff'), /* Modern Browsers */ + url('../../font/sourcesanspro_semibold/SourceSansPro-Semibold-webfont.ttf') format('truetype'); /* Safari, Android, iOS */ +} + //Font size $h1-size: 30px; $h2-size: 24px; @@ -11,11 +29,11 @@ $regular: 400; $bold: 600; // Base font -$base-font-family: 'Source Sans Pro', sans-serif; -$semibold-font-family: 'Source Sans Pro Semibold', sans-serif; +$base-font-family: 'Source_Regular', sans-serif; +$semibold-font-family: 'Source_Semibold', sans-serif; $base-font-weight: $regular; -$base-font-size: 13px; +$base-font-size: 12px; $base-line-height: 1.4; diff --git a/res/css/modules/colors.scss b/res/css/modules/colors.scss index 705cf9f7..bfefa5a5 100644 --- a/res/css/modules/colors.scss +++ b/res/css/modules/colors.scss @@ -1,9 +1,9 @@ -//$light-grey: #f5f5fa; -//$mid-grey: #919095; -//
$dark-grey: #363636; -//$magenta: #ee3654;
-//$cyan: #33c2e0; -//
$blue: #004681; -//
$purple: #8b3ab0; -//
$orange: #ff8b11; -//
$yellow: #fad900;
\ No newline at end of file +$light-grey: #f5f5fa; +$mid-grey: #919095; +$dark-grey: #363636; +$magenta: #ee3654; +$cyan: #33c2e0; +$blue: #004681; +$purple: #8b3ab0; +$orange: #ff8b11; +$yellow: #fad900;
\ No newline at end of file diff --git a/res/css/modules/positions.scss b/res/css/modules/positions.scss index 88b1362a..f4e23fbf 100644 --- a/res/css/modules/positions.scss +++ b/res/css/modules/positions.scss @@ -5,4 +5,4 @@ $task-alert-height: 48px; $task-desc-height: 20px; $input-bar-height:36px; -$left-margin: 60px; +$doc-margin: 70px; |