diff options
| author | Mark Otto <[email protected]> | 2012-07-23 23:01:38 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-23 23:01:38 -0700 |
| commit | f085dbadd18208386649717f4f1bcba62d6119de (patch) | |
| tree | e8aa445377a1877816ea4636f015117c06096404 /less | |
| parent | 0dda2c4659c6e0407b5b9fda6618ab5c8c12a897 (diff) | |
| parent | 614d52bd7f86591a0b0ab09e1c16ee888610d8a3 (diff) | |
| download | bootstrap-f085dbadd18208386649717f4f1bcba62d6119de.tar.xz bootstrap-f085dbadd18208386649717f4f1bcba62d6119de.zip | |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/css/docs.css
docs/base-css.html
docs/components.html
docs/customize.html
docs/getting-started.html
docs/javascript.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/javascript.mustache
docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'less')
| -rw-r--r-- | less/reset.less | 1 | ||||
| -rw-r--r-- | less/utilities.less | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/less/reset.less b/less/reset.less index 1c408e369..fc27e9c87 100644 --- a/less/reset.less +++ b/less/reset.less @@ -78,6 +78,7 @@ sub { img { max-width: 100%; // Make images inherently responsive + height: auto; // Make images inherently responsive vertical-align: middle; border: 0; -ms-interpolation-mode: bicubic; diff --git a/less/utilities.less b/less/utilities.less index 9d3a405b1..b020e1c1b 100644 --- a/less/utilities.less +++ b/less/utilities.less @@ -24,3 +24,7 @@ .invisible { visibility: hidden; } + +.affix { + position: fixed; +}
\ No newline at end of file |