From 5aaa55d700a8ece9e66712b75e3b2aa2f420a617 Mon Sep 17 00:00:00 2001 From: Navdeep Singh Date: Fri, 21 Apr 2017 17:14:00 -0700 Subject: [PATCH] Add support for font size setting Remove fixed font sizes Add default font sizes to defaults.json Pull latest HTML --- www/core | 2 +- www/js/defaults.json | 6 ++++++ www/src/scss/viewer.scss | 22 +++++++++++++--------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/www/core b/www/core index 41715a0b3..6aff92180 160000 --- a/www/core +++ b/www/core @@ -1 +1 @@ -Subproject commit 41715a0b31fa389710b9f9754dbc163f49653b21 +Subproject commit 6aff921803fe8db6eac05465fd3febc0f4741997 diff --git a/www/js/defaults.json b/www/js/defaults.json index 1a4343765..e5d529095 100644 --- a/www/js/defaults.json +++ b/www/js/defaults.json @@ -14,6 +14,12 @@ "display-transliteration": true, "display-teeka": true }, + "font-sizes": { + "gurbani": 9, + "translation": 5, + "transliteration": 4, + "teeka": 4 + }, "display-options": { "larivaar": false } diff --git a/www/src/scss/viewer.scss b/www/src/scss/viewer.scss index 8cddcc529..fa7a74372 100644 --- a/www/src/scss/viewer.scss +++ b/www/src/scss/viewer.scss @@ -85,9 +85,8 @@ h2 { } .gurbani { - font-size: 9vh; font-weight: normal; - line-height: 1.3em; + line-height: 1.3; i { font-style: normal; @@ -102,7 +101,6 @@ h2 { i, span { - font-size: 9vh; vertical-align: bottom; white-space: nowrap; } @@ -116,18 +114,12 @@ h2 { line-height: 1.2; } -.translation { - font-size: 5vh; -} - .transliteration { - font-size: 4vh; text-transform: lowercase; } .teeka { font-family: 'AnmolUniBaniTrue'; - font-size: 4vh; line-height: 1.5; } @@ -147,6 +139,18 @@ h2 { opacity: 1; } +/* ***** FONT SIZES ***** */ +@for $i from 1 through 12 { + .gurbani-#{$i} .gurbani, + .gurbani-#{$i} .gurbani span, + .gurbani-#{$i} .gurbani i, + .translation-#{$i} .translation, + .transliteration-#{$i} .transliteration, + .teeka-#{$i} .teeka { + font-size: #{$i}vh; + } +} + #logo { display: none; height: 20%;