mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-14 01:24:19 +02:00
Code Issues Releases Wiki Activity

fix h3 in modal and make modal unhidden by removing important from earlier issue

Browse Source
This commit is contained in:
Mark Otto
2012-07-24 00:35:54 -07:00
parent 7ce048bccd
commit 4912dd441d
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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: 1;
}
.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 {

1
docs/assets/js/bootstrap-transition.js vendored
View File

@@ -37,7 +37,6 @@
'WebkitTransition' : 'webkitTransitionEnd' 'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend' , 'MozTransition' : 'transitionend'
, 'OTransition' : 'oTransitionEnd otransitionend' , 'OTransition' : 'oTransitionEnd otransitionend'
, 'msTransition' : 'MSTransitionEnd'
, 'transition' : 'transitionend' , 'transition' : 'transitionend'
} }
, name , name

1
docs/assets/js/bootstrap.js vendored
View File

@@ -37,7 +37,6 @@
'WebkitTransition' : 'webkitTransitionEnd' 'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend' , 'MozTransition' : 'transitionend'
, 'OTransition' : 'oTransitionEnd otransitionend' , 'OTransition' : 'oTransitionEnd otransitionend'
, 'msTransition' : 'MSTransitionEnd'
, 'transition' : 'transitionend' , 'transition' : 'transitionend'
} }
, name , name

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

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: 1;
}
} }
// Body (where all modal content resides) // Body (where all modal content resides)

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