From dbd36d90a25ac075b98d95804306f57a4e43d063 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 24 Mar 2016 14:21:21 +0100 Subject: update: stop refering to bootstrap2 ie7 hack --- app/assets/stylesheets/leap.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/stylesheets/leap.scss') diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index abbfc88..19491c8 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -57,7 +57,6 @@ [class*="-icon-"] { display: inline-block; - @include ie7-restore-right-whitespace(); vertical-align: middle; background-repeat: no-repeat; margin-top: 1px; -- cgit v1.2.3 From 7689ff40b24786c808a36e60801ab60ede89a106 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 24 Mar 2016 14:52:16 +0100 Subject: upgrade: use bootstrap3 variable names in leap.scss --- app/assets/stylesheets/leap.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'app/assets/stylesheets/leap.scss') diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index 19491c8..329fc09 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -91,8 +91,8 @@ // input.large { - font-size: $baseFontSize * 1.25; - line-height: $baseLineHeight * 1.5; + font-size: $font-size-base * 1.25; + line-height: $line-height-base * 1.5; } .p { @@ -119,9 +119,9 @@ input, textarea { // like a label, but with no background .label-clear { - background-color: $white; + background-color: $body-bg; text-shadow: none; - color: $black; + color: $gray-base; } // force a black icon, even if bootstrap thinks differently @@ -187,7 +187,7 @@ input, textarea { font-weight: bold; } a { - color: $textColor; + color: $text-color; } } @@ -227,9 +227,9 @@ input, textarea { box-shadow: 0 2px 4px rgba(0,0,0,.1); li.active { a, a:hover { - background-color: $linkColor; - color: $white; - border-color: darken($linkColor, 0%); + background-color: $link-color; + color: $body-bg; + border-color: darken($link-color, 0%); cursor: pointer; } } @@ -264,7 +264,7 @@ $footer-height: 100px; $footer-border-width: 1px; $footer-gutter: 20px; // vertical gap above footer $footer-combined: $footer-height + $footer-border-width + $footer-gutter; -$footer-color: $grayLighter !default; +$footer-color: $gray-lighter !default; html, body { height: 100%; @@ -312,7 +312,7 @@ html, body { // border-top: $footer-border-width solid darken($footer-color, 10%); background-color: $footer-color; a { - color: $black; + color: $gray-base; margin: 0 5px; } } -- cgit v1.2.3 From 65f67e1829666a65a3b354d4d95f9d38aa15a81e Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Mar 2016 18:17:55 +0100 Subject: upgrade: fix buttons for bootstrap3 bootstrap3 now requires btn-default if no other btn option is present. download button on home page was too small in german translation --- app/assets/stylesheets/leap.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/assets/stylesheets/leap.scss') diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index 329fc09..8c4d702 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -198,7 +198,7 @@ input, textarea { } .download { a.btn { - width: 15em; + width: 18em; font-weight: bold; small { font-weight: normal; -- cgit v1.2.3