github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-15 16:25:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

rename navbar variables, change navbar search placeholder to mixin

Browse Source
This commit is contained in:
Mark Otto
2012-01-18 00:24:10 -08:00
parent a920fa2993
commit f2fadf1f0a
5 changed files with 268 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bootstrap.less vendored
View File

@@ -32,8 +32,8 @@
@import "close.less";
// Components: Nav
@import "navbar.less";
@import "navs.less";
@import "navbar.less";
@import "breadcrumbs.less";
@import "pagination.less";
@import "pager.less";

25
lib/navbar.less
View File

@@ -1,22 +1,21 @@
// NAVBAR (FIXED AND STATIC)
// -------------------------
// Navbar variables
@navBarHeight: 40px;
@navBarBgStart: #333;
@navBarBgEnd: #222;
// Common styles
// COMMON STYLES
// -------------
.navbar {
overflow: visible;
}
// gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
background-color: @navBarBgEnd;
#gradient > .vertical(@navBarBgStart, @navBarBgEnd);
background-color: @navbarBackground;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
}
// Text and links
.navbar {
// Hover and active states
@@ -75,20 +74,16 @@
#font > .sans-serif(13px, normal, 1);
color: @white;
color: rgba(255,255,255,.75);
background-color: #444;
background-color: rgba(255,255,255,.3);
background: #444;
background: rgba(255,255,255,.3);
border: 1px solid #111;
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
.box-shadow(@shadow);
.transition(none);
// Placeholder text gets special styles; can't be bundled together though for some reason
&:-moz-placeholder {
color: @grayLighter;
}
&::-webkit-input-placeholder {
color: @grayLighter;
}
.placeholder(@grayLighter);
// Hover states
&:hover {
color: @white;

11
lib/variables.less
View File

@@ -51,6 +51,9 @@
// COMPONENT VARIABLES
// --------------------------------------------------
// Input placeholder text color
@placeHolderText: @grayLight;
// Z-index master list
// Used for a bird's eye view of components dependent on the z-axis
@zindexDropdown: 1000;
@@ -60,5 +63,9 @@
@zindexModalBackdrop: 1040;
@zindexModal: 1050;
// Input placeholder text color
@placeHolderText: @grayLight;
// Navbar
@navBarHeight: 40px;
@navbarBackground: #222;
@navbarBackgroundHighlight: #333;