Mark Otto
72f13e2870
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
Mark Otto
dc6142751f
Fixes #6337 : scope '.media .pull-left' and '.media .pull-right' to immediate children only
2012-12-19 18:47:34 -08:00
Mark Otto
3f2938948d
remove more ie7 css hacks
2012-09-30 23:20:43 -07:00
Mark Otto
143fef9f95
overhaul the docs and css to merge into 2.1.2 since this was against master
2012-09-17 18:15:39 -07:00
Giuliano Velli
7762a77c21
Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
...
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
2012-09-07 09:59:52 +02:00
Giuliano Velli
4fbb400754
Added Medias code and documentation
...
Fix for Issue #1711
Added media.less and edited bootstrap.less and responsive.less to
manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Giuliano Velli
f5fd5e7523
Added Medias code and documentation
...
Added media.less and edited bootstrap.less and responsive.less to manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-20 17:55:22 +02:00
