diff options
| author | Mark Otto <[email protected]> | 2012-10-01 15:29:21 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-01 15:29:21 -0700 |
| commit | 5cf7c803e284052106f4f22897f2f0a511952565 (patch) | |
| tree | 2a6736698bad8f9c11f8218759efd4c386452e55 | |
| parent | d36e37214b718ed27a49f49ac4c6e72f373cbd0c (diff) | |
| parent | ecbb0ed4df3975d473e3c3558db322e26c6620ae (diff) | |
| download | bootstrap-5cf7c803e284052106f4f22897f2f0a511952565.tar.xz bootstrap-5cf7c803e284052106f4f22897f2f0a511952565.zip | |
Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 5 | ||||
| -rw-r--r-- | less/responsive-767px-max.less | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f1efde190..5320eadf8 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -872,8 +872,11 @@ width: auto; margin: 0; } + .modal.fade { + top: -100px; + } .modal.fade.in { - top: auto; + top: 20px; } } diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 45ce4ebc7..1d5c1239c 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -107,7 +107,8 @@ right: 20px; width: auto; margin: 0; - &.fade.in { top: auto; } + &.fade { top: -100px; } + &.fade.in { top: 20px; } } } |