sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-04 00:03:15 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source
This commit is contained in:
Jacob Thornton 2012-01-28 00:46:21 -08:00
commit 81c128fd0b
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,9 +24,9 @@
}
.modal {
position: absolute;
top: 20px;
left: 20px;
right: 20px;
top: 10px;
left: 10px;
right: 10px;
width: auto;
margin: 0;
}
@ -35,6 +35,10 @@
}
.modal-header .close {
padding: 10px;
margin: -10px;
}
.carousel-caption {
position: static;
}
}
@media (max-width: 768px) {

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

@ -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 {

9
docs/assets/css/docs.css
View File

@ -723,6 +723,15 @@ form.well {
word-wrap: break-word;
word-break: break-all;
}
/* Modal example */
.modal-example .modal {
position: relative;
top: auto;
right: auto;
bottom: auto;
left: auto;
}
}

6
docs/javascript.html
View File

@ -193,7 +193,7 @@
<div class="span9 columns">
<h2>Static example</h2>
<p>Below is a statically rendered modal.</p>
<div class="well" style="background-color: #888; border: none;">
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal">&times;</a>
@ -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>

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

@ -128,7 +128,7 @@
<div class="span9 columns">
<h2>{{_i}}Static example{{/i}}</h2>
<p>{{_i}}Below is a statically rendered modal.{{/i}}</p>
<div class="well" style="background-color: #888; border: none;">
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal">&times;</a>
@ -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>

12
less/responsive.less
View File

@ -56,15 +56,21 @@
// Modals
.modal {
position: absolute;
top: 20px;
left: 20px;
right: 20px;
top: 10px;
left: 10px;
right: 10px;
width: auto;
margin: 0;
&.fade.in { top: auto; }
}
.modal-header .close {
padding: 10px;
margin: -10px;
}
// Carousel
.carousel-caption {
position: static;
}
}