diff options
| author | Mark Otto <markotto@twitter.com> | 2012-10-02 10:41:00 +0400 |
|---|---|---|
| committer | Mark Otto <markotto@twitter.com> | 2012-10-02 10:41:00 +0400 |
| commit | 4ab7b77aa3750ffb64bfc544850c2722053ebbda (patch) | |
| tree | d5a71ca6a28de913596766c8df97d3ec2c92d353 /less/responsive-767px-max.less | |
| parent | e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516 (diff) | |
| parent | 7c9597f4e76d45571fab7a0e19d90b2fea8aab02 (diff) | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
Diffstat (limited to 'less/responsive-767px-max.less')
| -rw-r--r-- | less/responsive-767px-max.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less index 4433f5ed5a..c967c517b6 100644 --- a/less/responsive-767px-max.less +++ b/less/responsive-767px-max.less @@ -83,7 +83,8 @@ right: 20px; width: auto; margin: 0; - &.fade.in { top: auto; } + &.fade { top: -100px; } + &.fade.in { top: 20px; } } } |