From bb627660a9cf0ce17375d3cdfc01274d2e559ba7 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 1 Dec 2014 22:33:31 +0200 Subject: use localStorage to show intro-task only until clicked Also fix miscased scss filename. --- res/css/modules/Typography.scss | 46 ----------------------------------------- res/css/modules/typography.scss | 46 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 res/css/modules/Typography.scss create mode 100644 res/css/modules/typography.scss (limited to 'res/css/modules') diff --git a/res/css/modules/Typography.scss b/res/css/modules/Typography.scss deleted file mode 100644 index 8a7d8fe7..00000000 --- a/res/css/modules/Typography.scss +++ /dev/null @@ -1,46 +0,0 @@ -// 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; -$h3-size: 18px; -$h4-size: 14px; -$h5-size: 12px; - -//Font weights -$light: 100; -$regular: 400; -$bold: 600; - -// Base font -$base-font-family: 'Source_Regular', sans-serif; -$semibold-font-family: 'Source_Semibold', sans-serif; - -$base-font-weight: $regular; -$base-font-size: 12px; -$base-line-height: 1.4; - - -// Fixed Font -$fixed-font-family: monospace; -$fixed-font-size: 85%; -$fixed-line-height: $base-line-height; - -// Headings -$header-font-weight: $bold; \ No newline at end of file diff --git a/res/css/modules/typography.scss b/res/css/modules/typography.scss new file mode 100644 index 00000000..8a7d8fe7 --- /dev/null +++ b/res/css/modules/typography.scss @@ -0,0 +1,46 @@ +// 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; +$h3-size: 18px; +$h4-size: 14px; +$h5-size: 12px; + +//Font weights +$light: 100; +$regular: 400; +$bold: 600; + +// Base font +$base-font-family: 'Source_Regular', sans-serif; +$semibold-font-family: 'Source_Semibold', sans-serif; + +$base-font-weight: $regular; +$base-font-size: 12px; +$base-line-height: 1.4; + + +// Fixed Font +$fixed-font-family: monospace; +$fixed-font-size: 85%; +$fixed-line-height: $base-line-height; + +// Headings +$header-font-weight: $bold; \ No newline at end of file -- cgit v1.3.1