summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-02-12 21:31:19 -0800
committerelijah <elijah@riseup.net>2013-02-12 21:31:19 -0800
commit00c785b728c5d97335b87e3eb7d10b9ad0c46d35 (patch)
tree3846f4f4013d00974bb8196d28f5f69d93168e45 /app
parent810246285b3dd1316282ee97b59c1ad762b4857f (diff)
minor css tweaks
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/application.scss3
-rw-r--r--app/assets/stylesheets/bootstrap/_code.scss9
-rw-r--r--app/assets/stylesheets/leap.scss32
3 files changed, 31 insertions, 13 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ca12c6f..50331b4 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,6 +16,9 @@ $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth
$fluidGridColumnWidth: 6.382978723% !default;
$fluidGridGutterWidth: 2.127659574% !default;
+// side navigation
+$side-columns: 3;
+
//
// IMPORT LIBRARIES
//
diff --git a/app/assets/stylesheets/bootstrap/_code.scss b/app/assets/stylesheets/bootstrap/_code.scss
index 546a0b9..c9f12c7 100644
--- a/app/assets/stylesheets/bootstrap/_code.scss
+++ b/app/assets/stylesheets/bootstrap/_code.scss
@@ -15,9 +15,12 @@ pre {
// Inline code
code {
padding: 3px 4px;
- color: #d14;
- background-color: #f7f7f9;
- border: 1px solid #e1e1e8;
+ //color: #d14;
+ color: #000;
+ //background-color: #fee;
+ //border: 1px solid #efe3e3;
+ background-color: #eee;
+ //border: 1px solid #eee;
}
// Blocks of code
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index b51d22b..cf8088e 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -4,7 +4,7 @@ $background_color: #fff;
$masthead_border_color: black; // rgba(0,0,0,0.5);
$masthead_border: 1px solid $masthead_border_color;
-$masthead_bg_color: #333; // rgba(96,96,96,0.2);
+$masthead_bg_color: #555; // rgba(96,96,96,0.2);
$masthead_color: #fff;
$masthead_height: 128px;
@@ -18,6 +18,7 @@ $side_column_bg_color: #d0d0d0; // rgba(0,0,0,0.05); // #e3e3e3
$side_column_border_color: #aaa; // rgba(0,0,0,0.2);
$side_column_active_bg_color: #000;
$side_column_active_color: $masthead_color;
+$side_column_text_color: #000;
$well_color: #fff;
$well_bg_color: #fff;
@@ -61,14 +62,32 @@ body {
.nav-tabs.nav-stacked li {
background: $side_column_bg_color;
+ &.active {
+ a {
+ border: 0;
+ border-right: 4px solid $side_column_active_bg_color;
+ background: $side_column_active_bg_color;
+ color: $side_column_active_color;
+ &:hover {
+ //color: $side_column_text_color;
+ background: lighten($side_column_active_bg_color, 40%);
+ border-color: lighten($side_column_active_bg_color, 20%);
+ }
+ }
+ }
+ //&.semi-active a {
+ // background: darken($side_column_bg_color,10%);
+ // color: black;
+ //}
a {
+ cursor: pointer;
border-radius: 0 !important;
border: 0;
border-right: 4px solid $side_column_active_bg_color;
- color: black;
+ color: $side_column_text_color;
line-height: 1.2em;
&:hover {
- background: lighten($side_column_bg_color,20%);
+ background: lighten($side_column_bg_color, 10%);
border-color: lighten($side_column_active_bg_color, 50%);
text-decoration: underline;
}
@@ -76,13 +95,6 @@ body {
padding-left: 2em;
}
}
- &.active a {
- border: 0;
- border-right: 4px solid $side_column_active_bg_color;
- background: $side_column_active_bg_color;
- color: $side_column_active_color;
- cursor: pointer;
- }
}
.side_column ul {