rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases 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
commit b59cb505f8
8 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

8
docs/assets/css/bootstrap-responsive.css vendored
View File

@ -19,9 +19,11 @@
clear: both;
}
.hide-text {
overflow: hidden;
text-indent: 100%;
white-space: nowrap;
border: 0;
font: 0/0 a;
text-shadow: none;
color: transparent;
background-color: transparent;
}
.input-block-level {
display: block;

10
docs/assets/css/bootstrap.css vendored
View File

@ -113,9 +113,11 @@ textarea {
clear: both;
}
.hide-text {
overflow: hidden;
text-indent: 100%;
white-space: nowrap;
border: 0;
font: 0/0 a;
text-shadow: none;
color: transparent;
background-color: transparent;
}
.input-block-level {
display: block;
@ -2866,7 +2868,7 @@ input[type="submit"].btn.btn-mini {
font-size: 20px;
font-weight: 200;
line-height: 1;
color: #ffffff;
color: #999999;
}
.navbar .navbar-text {
margin-bottom: 0;

2
docs/download.html
View File

@ -335,6 +335,8 @@
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc">
<label>@navbarBrandColor</label>
<input type="text" class="span3" placeholder="@navbarLinkColor">
<h3>Dropdowns</h3>
<label>@dropdownBackground</label>

2
docs/templates/pages/download.mustache vendored
View File

@ -259,6 +259,8 @@
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc">
<label>@navbarBrandColor</label>
<input type="text" class="span3" placeholder="@navbarLinkColor">
<h3>{{_i}}Dropdowns{{/i}}</h3>
<label>@dropdownBackground</label>

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