github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-03-22 17:12:22 -07:00
parent fa1b3bdda4 99e96f64f7
commit b59cb505f8
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
less/mixins.less
View File

@@ -98,13 +98,15 @@
white-space: nowrap;
}
// New image replacement
// CSS image replacement
// -------------------------
// Source: http://www.zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
.hide-text {
overflow: hidden;
text-indent: 100%;
white-space: nowrap;
border: 0;
font: 0/0 a;
text-shadow: none;
color: transparent;
background-color: transparent;
}

2
less/navbar.less
View File

@@ -74,7 +74,7 @@
font-size: 20px;
font-weight: 200;
line-height: 1;
color: @white;
color: @navbarBrandColor;
}
// Plain text in topbar
.navbar-text {

1
less/variables.less
View File

@@ -154,6 +154,7 @@
@navbarSearchBackgroundFocus: @white;
@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
@navbarSearchPlaceholderColor: #ccc;
@navbarBrandColor: @navbarLinkColor;
// Hero unit