From 49a222f9857613d13dfc0dbfc8c85a906c7858dd Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Mon, 17 Mar 2014 23:00:39 -0400
Subject: [PATCH 1/2] fixing private category badges and mobile header logo
---
.../stylesheets/common/components/badges.css.scss | 3 ++-
.../stylesheets/common/foundation/variables.scss | 11 -----------
app/assets/stylesheets/mobile/header.scss | 3 ++-
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 30669a64092..1e29340b730 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -19,11 +19,12 @@
// --------------------------------------------------
.badge-category {
- padding: 4px 6px;
+ padding: 2px 4px;
color: $tertiary_text_color;
font-size: 12px;
font-weight: bold;
white-space: nowrap;
+ display: inline-block;
&[href] {
color: $tertiary_text_color;
}
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index f221dfa397d..cbab8f1adce 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -17,11 +17,7 @@ $black: #333 !default;
$white: #fff !default;
$blue: #00aaff !default;
-
$yellow: lighten(#FFFF00, 15%) !default;
-$light_yellow: lighten($yellow, 20%) !default;
-$lightest_yellow: lighten($yellow, 30%) !default;
-
$red: #e45735 !default;
$pink: #fa6c8d !default;
$green: #009900 !default;
@@ -144,13 +140,6 @@ $quote-background: lighten($black, 76%);
$topicMenuColor: darken($white, 80%);
$bookmarkColor: $blue;
-$tag_color: lighten($blue, 50%);
-$post_footer: lighten($black, 76%);
-
-$controls: lighten($black, 35%);
-$controls_hover: $blue;
-$controls_active: darken($blue, 10%);
-
// Basics
// --------------------------------------------------
diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss
index 1e46ac59190..419daf253ce 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -34,7 +34,8 @@
}
}
#site-logo {
- width: 110px;
+ max-width: 122px;
+ max-height: 40px;
}
.fa-home {
font-size: 20px;
From fd2da91df0994109807d8c8e63873da6b6d3d5f3 Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Mon, 17 Mar 2014 23:18:15 -0400
Subject: [PATCH 2/2] fixing private category badges and mobile header logo
---
app/assets/stylesheets/common/components/badges.css.scss | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index 1e29340b730..0a3d80d230d 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -19,7 +19,7 @@
// --------------------------------------------------
.badge-category {
- padding: 2px 4px;
+ padding: 2px 6px;
color: $tertiary_text_color;
font-size: 12px;
font-weight: bold;
@@ -41,7 +41,6 @@
div {
display: inline-block;
margin: 0;
- padding-right: 6px;
}
}}