From 40041148a572b4a6b8b3848a203ea42b89a9bd41 Mon Sep 17 00:00:00 2001
From: Alice Heaton <aliceh@aptivate.org>
Date: Thu, 6 Aug 2015 11:39:44 +0100
Subject: [PATCH] Cherry pick tab styling from Jay's ui-upload-rumors branch.
---
.../media/less/internews-variables.less | 18 +++++++++---------
django/website/media/less/internews.less | 7 +++----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/django/website/media/less/internews-variables.less b/django/website/media/less/internews-variables.less
index cbf8a5f1..955a6807 100644
--- a/django/website/media/less/internews-variables.less
+++ b/django/website/media/less/internews-variables.less
@@ -14,7 +14,7 @@
@gray-dark: darken(@gray, 30%);
@gray-light: #C3BCB4;
@gray-lighter: #EDECEC;
-@gray-lightest: lighten(@gray-light, 40%);
+@gray-lightest: #FAFAFA;
@brand-primary: #0F6CB6;
@brand-secondary: #002D62;
@@ -371,8 +371,8 @@
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
// Navbar links
-@navbar-default-link-color: #fff;
-@navbar-default-link-hover-color: #fff;
+@navbar-default-link-color: @gray-dark;
+@navbar-default-link-hover-color: @brand-primary;
@navbar-default-link-hover-bg: darken(@navbar-default-bg, 10%);
@navbar-default-link-active-color: @navbar-default-link-hover-color;
@navbar-default-link-active-bg: @navbar-default-link-hover-bg;
@@ -422,19 +422,19 @@
//=== Shared nav styles
@nav-link-padding: 10px 15px;
-@nav-link-hover-bg: @gray-lighter;
+@nav-link-hover-bg: @gray-light;
@nav-disabled-link-color: @gray-light;
@nav-disabled-link-hover-color: @gray-light;
//== Tabs
-@nav-tabs-border-color: #ddd;
+@nav-tabs-border-color: transparent;
-@nav-tabs-link-hover-border-color: @gray-lighter;
+@nav-tabs-link-hover-border-color: @gray-light;
-@nav-tabs-active-link-hover-bg: @body-bg;
-@nav-tabs-active-link-hover-color: @gray;
-@nav-tabs-active-link-hover-border-color: #ddd;
+@nav-tabs-active-link-hover-bg: @panel-default-heading-bg;
+@nav-tabs-active-link-hover-color: @brand-primary;
+@nav-tabs-active-link-hover-border-color: transparent;
@nav-tabs-justified-link-border-color: #ddd;
@nav-tabs-justified-active-link-border-color: @body-bg;
diff --git a/django/website/media/less/internews.less b/django/website/media/less/internews.less
index b2685059..d1343f1e 100644
--- a/django/website/media/less/internews.less
+++ b/django/website/media/less/internews.less
@@ -38,9 +38,9 @@ body {
// Branding
-.navbar-brand {
- font-size:30px;
- padding-top:40px;
+h2.navbar-brand {
+ font-size:15px;
+ font-weight: bold;
}
@media(min-width:@screen-sm-min){
@@ -473,7 +473,6 @@ body {
.panel-heading {
font-weight:bold;
- padding:25px;
border:none;
& h2 {
display: inline;
--
GitLab