summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/leap.scss
diff options
context:
space:
mode:
authorNavaL <ayoyo@thoughtworks.com>2016-07-14 15:44:07 +0200
committerNavaL <ayoyo@thoughtworks.com>2016-07-14 15:44:07 +0200
commite3c2cb91dfef5c39c608b967e702e9de977d1bd2 (patch)
tree154dc28dd986bd6e0a48e933c5da46994ffaa0cb /app/assets/stylesheets/leap.scss
parente2f19bcfb6dbce77746c2d61715340525b29a592 (diff)
parentf09e6ec1337962ab279f021a6a6d0ff30479ebe0 (diff)
Merge branch 'develop' of https://github.com/leapcode/leap_web into feature/expose_admin_in_api
Diffstat (limited to 'app/assets/stylesheets/leap.scss')
-rw-r--r--app/assets/stylesheets/leap.scss23
1 files changed, 11 insertions, 12 deletions
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index abbfc88..8c4d702 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;
@@ -92,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 {
@@ -120,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
@@ -188,7 +187,7 @@ input, textarea {
font-weight: bold;
}
a {
- color: $textColor;
+ color: $text-color;
}
}
@@ -199,7 +198,7 @@ input, textarea {
}
.download {
a.btn {
- width: 15em;
+ width: 18em;
font-weight: bold;
small {
font-weight: normal;
@@ -228,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;
}
}
@@ -265,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%;
@@ -313,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;
}
}