From d2e458777684951f50e1e2396f80dd03b20545a8 Mon Sep 17 00:00:00 2001 From: martent Date: Tue, 10 Sep 2013 13:52:47 +0200 Subject: [PATCH 1/2] Bug fix, dropdown button --- app/assets/stylesheets/bootstrap_overrides.css.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/bootstrap_overrides.css.scss b/app/assets/stylesheets/bootstrap_overrides.css.scss index 58f07ad..5599e6b 100644 --- a/app/assets/stylesheets/bootstrap_overrides.css.scss +++ b/app/assets/stylesheets/bootstrap_overrides.css.scss @@ -14,7 +14,8 @@ .btn-primary:active, .btn-primary.active, .btn-primary.disabled, -.btn-primary[disabled] { +.btn-primary[disabled], +.btn-group.open .btn-primary.dropdown-toggle { background-color: $btnPrimaryBackgroundDark; } From 6dff350bfc3ee056d09d4e0cafb742e147ac0d9a Mon Sep 17 00:00:00 2001 From: martent Date: Fri, 13 Sep 2013 14:58:47 +0200 Subject: [PATCH 2/2] Font changes. Removed word-break from body --- app/assets/stylesheets/elements.css.scss | 1 - app/assets/stylesheets/variables.css.scss | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/elements.css.scss b/app/assets/stylesheets/elements.css.scss index 070710b..89b788b 100644 --- a/app/assets/stylesheets/elements.css.scss +++ b/app/assets/stylesheets/elements.css.scss @@ -7,7 +7,6 @@ body { font-family: $serif; background-color: $bodyBackground; color: $bodyColor; - word-wrap: break-word; text-rendering: optimizeLegibility; } diff --git a/app/assets/stylesheets/variables.css.scss b/app/assets/stylesheets/variables.css.scss index d390a0d..7085aa6 100644 --- a/app/assets/stylesheets/variables.css.scss +++ b/app/assets/stylesheets/variables.css.scss @@ -52,7 +52,8 @@ $errorBorder: 1px solid darken($errorBackground, 40%); $dangerColor: #c00; // Fonts -$sansSerif: 'OpenSans', 'Verdana', 'DejaVu Sans', 'Bitstream Vera Sans', sans-serif; -$serif: Georgia, 'DejaVu Serif', 'Bitstream Vera Serif', serif; -/* NOTE: Use with font-weight: normal */; -$sansSerifSemibold: 'OpenSansSemibold', 'DejaVu Sans', 'Bitstream Vera Sans', sans-serif; +$sansSerif: 'OpenSans', 'Droid Sans', Verdana, 'DejaVu Sans', 'Bitstream Vera Sans', sans-serif; +$serif: Georgia, 'Droid Serif', 'DejaVu Serif', 'Bitstream Vera Serif', serif; +$monospace: Consolas, Inconsolata, 'Droid Sans Mono', 'DejaVu Mono', 'Bitstream Vera Mono', monospace; +/* NOTE: Use with font-weight: normal */ +$sansSerifSemibold: 'OpenSansSemibold', 'Droid Sans', Verdana, 'DejaVu Sans', 'Bitstream Vera Sans', sans-serif;