rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Jacob Thornton 2012-07-24 00:49:19 -07:00
commit e2fc202df2
5 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -835,6 +835,17 @@
display: inline-block; display: inline-block;
width: auto; width: auto;
} }
.modal {
position: fixed;
top: 20px;
right: 20px;
left: 20px;
width: auto;
margin: 0;
}
.modal.fade.in {
top: auto;
}
} }
@media (max-width: 480px) { @media (max-width: 480px) {
@ -866,15 +877,9 @@
padding-left: 10px; padding-left: 10px;
} }
.modal { .modal {
position: fixed;
top: 10px; top: 10px;
right: 10px; right: 10px;
left: 10px; left: 10px;
width: auto;
margin: 0;
}
.modal.fade.in {
top: auto;
} }
.modal-header .close { .modal-header .close {
padding: 10px; padding: 10px;

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

@ -4715,6 +4715,11 @@ input[type="submit"].btn.btn-mini {
margin-top: 2px; margin-top: 2px;
} }
.modal-header h3 {
margin: 0;
line-height: 30px;
}
.modal-body { .modal-body {
max-height: 400px; max-height: 400px;
padding: 15px; padding: 15px;
@ -5498,11 +5503,11 @@ a.badge:hover {
} }
.hide { .hide {
display: none !important; display: none;
} }
.show { .show {
display: block !important; display: block;
} }
.invisible { .invisible {

5
less/modals.less
View File

@ -56,6 +56,11 @@
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
// Close icon // Close icon
.close { margin-top: 2px; } .close { margin-top: 2px; }
// Heading
h3 {
margin: 0;
line-height: 30px;
}
} }
// Body (where all modal content resides) // Body (where all modal content resides)

15
less/responsive-767px-max.less
View File

@ -84,6 +84,17 @@
width: auto; width: auto;
} }
// Modals
.modal {
position: fixed;
top: 20px;
left: 20px;
right: 20px;
width: auto;
margin: 0;
&.fade.in { top: auto; }
}
} }
@ -133,13 +144,9 @@
// Modals // Modals
.modal { .modal {
position: fixed;
top: 10px; top: 10px;
left: 10px; left: 10px;
right: 10px; right: 10px;
width: auto;
margin: 0;
&.fade.in { top: auto; }
} }
.modal-header .close { .modal-header .close {
padding: 10px; padding: 10px;

5
less/utilities.less
View File

@ -12,12 +12,11 @@
} }
// Toggling content // Toggling content
// Uses `!important` for proper specifity over things like form controls
.hide { .hide {
display: none !important; display: none;
} }
.show { .show {
display: block !important; display: block;
} }
// Visibility // Visibility