diff options
| author | Mark Otto <[email protected]> | 2012-03-22 17:12:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-22 17:12:22 -0700 |
| commit | b59cb505f8cf4e0010f422f0a83d9c001055cbd7 (patch) | |
| tree | 334b36865d127c338432137bb9cbdab2ebaa70a9 /docs | |
| parent | fa1b3bdda479e4c419826e2e56fcddb90d6c3519 (diff) | |
| parent | 99e96f64f7dbaba8c83d7d69e64247969765b9e8 (diff) | |
| download | bootstrap-b59cb505f8cf4e0010f422f0a83d9c001055cbd7.tar.xz bootstrap-b59cb505f8cf4e0010f422f0a83d9c001055cbd7.zip | |
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55574 -> 55584 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 8 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 10 | ||||
| -rw-r--r-- | docs/download.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/download.mustache | 2 |
5 files changed, 15 insertions, 7 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 693969290..a7b695041 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 0bc6de916..b007300c2 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -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; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e29bfbf70..4796e1288 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; diff --git a/docs/download.html b/docs/download.html index 6aa113001..680e851f9 100644 --- a/docs/download.html +++ b/docs/download.html @@ -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> diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 87fdc6a38..c7f6cfab8 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -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> |