diff options
| author | Mark Otto <[email protected]> | 2012-01-28 00:43:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 00:43:25 -0800 |
| commit | f1851ab1338938bf6315e223789e345f20cfb4b1 (patch) | |
| tree | 31ea4b2b926a0cf33bd830ea5c5c080325f9ca76 /docs | |
| parent | edee985b96dea8f8fdca88a0aa171adede7b2d8b (diff) | |
| download | bootstrap-f1851ab1338938bf6315e223789e345f20cfb4b1.tar.xz bootstrap-f1851ab1338938bf6315e223789e345f20cfb4b1.zip | |
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 3 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index e48a234f9..e91f25539 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -37,6 +37,9 @@ padding: 10px; margin: -10px; } + .carousel-caption { + position: static; + } } @media (max-width: 768px) { .container { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cd0d620bf..7a5568041 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1986,7 +1986,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { diff --git a/docs/javascript.html b/docs/javascript.html index 4acd844c1..2d31f0aa4 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -743,7 +743,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>number | object</td> <td>0</td> <td> - <p>delay showing/hiding the tooltip (ms)</p> + <p>delay showing and hiding the tooltip (ms)</p> <p>If a number is supplied, delay is applied to both hide/show</p> <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> @@ -855,7 +855,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>number | object</td> <td>0</td> <td> - <p>delay showing/hiding the popover (ms)</p> + <p>delay showing and hiding the popover (ms)</p> <p>If a number is supplied, delay is applied to both hide/show</p> <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p> </td> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index edafbbf0f..01b14b676 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -678,7 +678,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>{{_i}}number | object{{/i}}</td> <td>0</td> <td> - <p>{{_i}}delay showing/hiding the tooltip (ms){{/i}}</p> + <p>{{_i}}delay showing and hiding the tooltip (ms){{/i}}</p> <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p> <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p> </td> @@ -790,7 +790,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <td>{{_i}}number | object{{/i}}</td> <td>0</td> <td> - <p>{{_i}}delay showing/hiding the popover (ms){{/i}}</p> + <p>{{_i}}delay showing and hiding the popover (ms){{/i}}</p> <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p> <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p> </td> |