mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code 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
docs/assets/bootstrap.zip
BIN
View File
Binary file not shown.
docs/assets/css/bootstrap-responsive.css
Vendored
+5 -3
View File
@@ -19,9 +19,11 @@
clear: both; clear: both;
} }
.hide-text { .hide-text {
overflow: hidden; border: 0;
text-indent: 100%; font: 0/0 a;
white-space: nowrap; text-shadow: none;
color: transparent;
background-color: transparent;
} }
.input-block-level { .input-block-level {
display: block; display: block;
docs/assets/css/bootstrap.css
Vendored
+6 -4
View File
@@ -113,9 +113,11 @@ textarea {
clear: both; clear: both;
} }
.hide-text { .hide-text {
overflow: hidden; border: 0;
text-indent: 100%; font: 0/0 a;
white-space: nowrap; text-shadow: none;
color: transparent;
background-color: transparent;
} }
.input-block-level { .input-block-level {
display: block; display: block;
@@ -2866,7 +2868,7 @@ input[type="submit"].btn.btn-mini {
font-size: 20px; font-size: 20px;
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
color: #ffffff; color: #999999;
} }
.navbar .navbar-text { .navbar .navbar-text {
margin-bottom: 0; margin-bottom: 0;
docs/download.html
+2
View File
@@ -335,6 +335,8 @@
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)"> <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label> <label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@navbarBrandColor</label>
<input type="text" class="span3" placeholder="@navbarLinkColor">
<h3>Dropdowns</h3> <h3>Dropdowns</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
docs/templates/pages/download.mustache
Vendored
+2
View File
@@ -259,6 +259,8 @@
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)"> <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label> <label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@navbarBrandColor</label>
<input type="text" class="span3" placeholder="@navbarLinkColor">
<h3>{{_i}}Dropdowns{{/i}}</h3> <h3>{{_i}}Dropdowns{{/i}}</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
less/mixins.less
+7 -5
View File
@@ -98,13 +98,15 @@
white-space: nowrap; 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 { .hide-text {
overflow: hidden; border: 0;
text-indent: 100%; font: 0/0 a;
white-space: nowrap; text-shadow: none;
color: transparent;
background-color: transparent;
} }
less/navbar.less
+1 -1
View File
@@ -74,7 +74,7 @@
font-size: 20px; font-size: 20px;
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
color: @white; color: @navbarBrandColor;
} }
// Plain text in topbar // Plain text in topbar
.navbar-text { .navbar-text {
less/variables.less
+1
View File
@@ -154,6 +154,7 @@
@navbarSearchBackgroundFocus: @white; @navbarSearchBackgroundFocus: @white;
@navbarSearchBorder: darken(@navbarSearchBackground, 30%); @navbarSearchBorder: darken(@navbarSearchBackground, 30%);
@navbarSearchPlaceholderColor: #ccc; @navbarSearchPlaceholderColor: #ccc;
@navbarBrandColor: @navbarLinkColor;
// Hero unit // Hero unit