mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 21:56:42 +02:00
Code Issues Releases Wiki Activity

change text on js docs page to improve rendering on iphone, update responsive for carousel considerations

Browse Source
This commit is contained in:
Mark Otto
2012-01-28 00:43:25 -08:00
parent edee985b96
commit f1851ab133
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,9 @@
padding: 10px; padding: 10px;
margin: -10px; margin: -10px;
} }
.carousel-caption {
position: static;
}
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.container { .container {

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

@@ -1986,7 +1986,7 @@ table .span12 {
.navbar-search .search-query :-moz-placeholder { .navbar-search .search-query :-moz-placeholder {
color: #eeeeee; color: #eeeeee;
} }
.navbar-search .search-query::-webkit-input-placeholder { .navbar-search .search-query ::-webkit-input-placeholder {
color: #eeeeee; color: #eeeeee;
} }
.navbar-search .search-query:hover { .navbar-search .search-query:hover {

4
docs/javascript.html
View File

@@ -743,7 +743,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>number | object</td> <td>number | object</td>
<td>0</td> <td>0</td>
<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>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> <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
</td> </td>
@@ -855,7 +855,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>number | object</td> <td>number | object</td>
<td>0</td> <td>0</td>
<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>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> <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
</td> </td>

4
docs/templates/pages/javascript.mustache vendored
View File

@@ -678,7 +678,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>{{_i}}number | object{{/i}}</td> <td>{{_i}}number | object{{/i}}</td>
<td>0</td> <td>0</td>
<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}}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> <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
</td> </td>
@@ -790,7 +790,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<td>{{_i}}number | object{{/i}}</td> <td>{{_i}}number | object{{/i}}</td>
<td>0</td> <td>0</td>
<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}}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> <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
</td> </td>

5
less/responsive.less
View File

@@ -68,6 +68,11 @@
margin: -10px; margin: -10px;
} }
// Carousel
.carousel-caption {
position: static;
}
} }