Commit db0e0aae authored by Thomas Park's avatar Thomas Park
Browse files

style badge in navbar, fixes #241

parent eb7d6f9a
...@@ -10,6 +10,22 @@ ...@@ -10,6 +10,22 @@
font-size: 18px; font-size: 18px;
font-family: @font-family-sans-serif; font-family: @font-family-sans-serif;
font-weight: @headings-font-weight; font-weight: @headings-font-weight;
&-default {
.badge {
background-color: #000;
color: #fff;
}
}
&-inverse {
.badge {
background-color: #fff;
color: @navbar-inverse-bg;
}
}
} }
.navbar-brand { .navbar-brand {
...@@ -66,6 +82,12 @@ ...@@ -66,6 +82,12 @@
// Indicators ================================================================= // Indicators =================================================================
.badge {
padding-bottom: 4px;
vertical-align: 3px;
font-size: 10px;
}
// Progress bars ============================================================== // Progress bars ==============================================================
// Containers ================================================================= // Containers =================================================================
......
...@@ -728,7 +728,7 @@ ...@@ -728,7 +728,7 @@
@badge-color: #fff; @badge-color: #fff;
//** Linked badge text color on hover //** Linked badge text color on hover
@badge-link-hover-color: #fff; @badge-link-hover-color: #fff;
@badge-bg: @gray-light; @badge-bg: @link-color;
//** Badge text color in active nav link //** Badge text color in active nav link
@badge-active-color: @link-color; @badge-active-color: @link-color;
......
@import url("//fonts.googleapis.com/css?family=Raleway:400,700"); @import url("//fonts.googleapis.com/css?family=Raleway:400,700");
/*! /*!
* Bootswatch v3.1.1 * Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park * Copyright 2012-2014 Thomas Park
* Licensed under MIT * Licensed under MIT
...@@ -5863,6 +5863,8 @@ legend { ...@@ -5863,6 +5863,8 @@ legend {
color: #333333; color: #333333;
} }
.badge { .badge {
padding: 1px 7px 5px;
vertical-align: 2px;
font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal; font-weight: normal;
} }
......
This diff is collapsed.
...@@ -130,6 +130,8 @@ legend { ...@@ -130,6 +130,8 @@ legend {
} }
.badge { .badge {
padding: 1px 7px 5px;
vertical-align: 2px;
font-family: @headings-font-family; font-family: @headings-font-family;
font-weight: normal; font-weight: normal;
} }
......
/*! /*!
* Bootswatch v3.1.1 * Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park * Copyright 2012-2014 Thomas Park
* Licensed under MIT * Licensed under MIT
...@@ -4333,7 +4333,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4333,7 +4333,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
vertical-align: baseline; vertical-align: baseline;
white-space: nowrap; white-space: nowrap;
text-align: center; text-align: center;
background-color: #808080; background-color: #d9230f;
border-radius: 10px; border-radius: 10px;
} }
.badge:empty { .badge:empty {
...@@ -5779,6 +5779,10 @@ button.close { ...@@ -5779,6 +5779,10 @@ button.close {
display: none !important; display: none !important;
} }
} }
.navbar-inverse .badge {
background-color: #fff;
color: #d9230f;
}
.btn { .btn {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
......
This diff is collapsed.
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
// Navbar ===================================================================== // Navbar =====================================================================
.navbar {
&-inverse {
.badge {
background-color: #fff;
color: @brand-primary;
}
}
}
// Buttons ==================================================================== // Buttons ====================================================================
.btn { .btn {
......
...@@ -728,7 +728,7 @@ ...@@ -728,7 +728,7 @@
@badge-color: #fff; @badge-color: #fff;
//** Linked badge text color on hover //** Linked badge text color on hover
@badge-link-hover-color: #fff; @badge-link-hover-color: #fff;
@badge-bg: @gray-light; @badge-bg: @link-color;
//** Badge text color in active nav link //** Badge text color in active nav link
@badge-active-color: @link-color; @badge-active-color: @link-color;
......
/*! /*!
* Bootswatch v3.1.1 * Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park * Copyright 2012-2014 Thomas Park
* Licensed under MIT * Licensed under MIT
...@@ -5795,6 +5795,9 @@ button.close { ...@@ -5795,6 +5795,9 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8a9196', endColorstr='#ff70787d', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8a9196', endColorstr='#ff70787d', GradientType=0);
filter: none; filter: none;
} }
.navbar-inverse .badge {
background-color: #5d6368;
}
.navbar-nav > li > a { .navbar-nav > li > a {
border-right: 1px solid rgba(0, 0, 0, 0.2); border-right: 1px solid rgba(0, 0, 0, 0.2);
border-left: 1px solid rgba(255, 255, 255, 0.1); border-left: 1px solid rgba(255, 255, 255, 0.1);
......
This diff is collapsed.
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
&-inverse { &-inverse {
.btn-shadow(@navbar-inverse-bg); .btn-shadow(@navbar-inverse-bg);
.badge {
background-color: @navbar-inverse-link-active-bg;
}
} }
&-nav > li > a { &-nav > li > a {
......
@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); @import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");
/*! /*!
* Bootswatch v3.1.1 * Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park * Copyright 2012-2014 Thomas Park
* Licensed under MIT * Licensed under MIT
...@@ -4334,7 +4334,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { ...@@ -4334,7 +4334,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
vertical-align: baseline; vertical-align: baseline;
white-space: nowrap; white-space: nowrap;
text-align: center; text-align: center;
background-color: #999999; background-color: #3399f3;
border-radius: 10px; border-radius: 10px;
} }
.badge:empty { .badge:empty {
...@@ -5798,6 +5798,13 @@ button.close { ...@@ -5798,6 +5798,13 @@ button.close {
border: 1px solid #345578; border: 1px solid #345578;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
} }
.navbar-inverse .badge {
background-color: #fff;
color: #446e9b;
}
.navbar .badge {
text-shadow: none;
}
.navbar-nav > li > a, .navbar-nav > li > a,
.navbar-nav > li > a:hover { .navbar-nav > li > a:hover {
padding-top: 17px; padding-top: 17px;
......
This diff is collapsed.
...@@ -20,6 +20,15 @@ ...@@ -20,6 +20,15 @@
&-inverse { &-inverse {
.btn-shadow(@navbar-inverse-bg); .btn-shadow(@navbar-inverse-bg);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
.badge {
background-color: #fff;
color: @navbar-inverse-bg;
}
}
.badge {
text-shadow: none;
} }
&-nav > li > a, &-nav > li > a,
......
...@@ -728,7 +728,7 @@ ...@@ -728,7 +728,7 @@
@badge-color: #fff; @badge-color: #fff;
//** Linked badge text color on hover //** Linked badge text color on hover
@badge-link-hover-color: #fff; @badge-link-hover-color: #fff;
@badge-bg: @gray-light; @badge-bg: @link-color;
//** Badge text color in active nav link //** Badge text color in active nav link
@badge-active-color: @link-color; @badge-active-color: @link-color;
......
@import url("//fonts.googleapis.com/css?family=Lato:300,400,700"); @import url("//fonts.googleapis.com/css?family=Lato:300,400,700");
/*! /*!
* Bootswatch v3.1.1 * Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park * Copyright 2012-2014 Thomas Park
* Licensed under MIT * Licensed under MIT
...@@ -5779,6 +5779,14 @@ button.close { ...@@ -5779,6 +5779,14 @@ button.close {
border: none; border: none;
font-size: 12px; font-size: 12px;
} }
.navbar-default .badge {
background-color: #fff;
color: #4e5d6c;
}
.navbar-inverse .badge {
background-color: #fff;
color: #df691a;
}
.btn { .btn {
font-weight: 300; font-weight: 300;
} }
......
This diff is collapsed.
...@@ -11,8 +11,20 @@ ...@@ -11,8 +11,20 @@
border: none; border: none;
font-size: 12px; font-size: 12px;
&-default .navbar-nav { &-default {
.badge {
background-color: #fff;
color: @navbar-default-bg;
}
}
&-inverse {
.badge {
background-color: #fff;
color: @navbar-inverse-bg;
}
} }
} }
......
@import url("//fonts.googleapis.com/css?family=Ubuntu"); @import url("//fonts.googleapis.com/css?family=Ubuntu");
/*! /*!
* Bootswatch v3.1.1 * Bootswatch v3.1.1+1
* Homepage: http://bootswatch.com * Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park * Copyright 2012-2014 Thomas Park
* Licensed under MIT * Licensed under MIT
...@@ -5780,3 +5780,11 @@ button.close { ...@@ -5780,3 +5780,11 @@ button.close {
display: none !important; display: none !important;
} }
} }
.navbar-default .badge {
background-color: #fff;
color: #dd4814;
}
.navbar-inverse .badge {
background-color: #fff;
color: #772953;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment