root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,700 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

38 Commits

Author SHA1 Message Date
Mark Otto 25c9b6b59a nuke and flatten and stuff 2013-01-14 22:05:55 -08:00
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' 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/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.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/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
 2013-01-13 04:26:52 -08:00
Mark Otto b9b5cd786d Fixes #6555: remove .controls-row from responsive 2013-01-11 20:23:37 -08:00
Aron Woost aeb0e85151 replaced tabs with spaces 2013-01-09 10:15:15 +01:00
Mark Otto 2ef4fde09f Drop .input-block-level modifier as inputs are already width: 100%; 2012-12-26 14:19:48 -06:00
Mark Otto 0fabca01db Remove more fluid grid stuff 
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
 2012-11-30 16:18:40 -08:00
Mark Otto b0e2b5813d more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
Mark Otto 7a3d15eb21 Part 1 of unCamelCasing variables 2012-11-30 14:37:24 -08:00
Mark Otto 4ab7b77aa3 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
 2012-10-01 23:41:00 -07:00
Mark Otto 56935c64c0 remove left margin reset from old grid system 2012-10-01 00:11:05 -07:00
Andreas Cederström ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02:00
Mark Otto f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto 151ed38cdc remove references to row fluid elsewhere 2012-09-25 22:18:34 -07:00
Mark Otto f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto 26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -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
Mark Otto 917b46a343 resolve conflicts and remake 2012-09-17 16:43:18 -07:00
Dionysios G. Arvanitis cc4f8b9f6c remove offset margin in row-fluid mobile layout 2012-09-07 17:54:15 +03:00
Mark Otto 2da2169a56 fixes #4828: make fluid grid inputs size the same as fixed grid inputs 2012-08-29 13:06:47 -07:00
Mark Otto 2137cd65fb fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake 2012-08-29 13:05:43 -07:00
Mark Otto 15317419f4 fixes #4577: no margin on .control-row .span* in responsive 2012-08-27 11:46:47 -07:00
Mark Otto 8a5dde556b fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars 2012-08-27 11:05:01 -07:00
Mark Otto 78cb09b440 run make and add comment 2012-08-20 11:31:24 -07:00
Kai Dorschner 1e190d8036 Fix for thumbnails in responsive design 2012-08-19 17:32:40 +03:00
Mark Otto 1bb7c0e669 fixes #4254: make .span12 expand full width of a parent when responsive 2012-08-01 19:33:37 -07:00
Mark Otto 87aa61001e fixes #4118: responsive modal gets width auto and improved positioning for narrower widths 2012-07-24 00:44:11 -07:00
Mark Otto 148e5a3d89 fixes #3291: remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF 2012-07-09 21:07:49 -07:00
Mark Otto cd2d82150c standardize top level file comments 2012-06-28 21:46:45 -07:00
Mark Otto 94a3d4eb14 reorder media queries 2012-06-25 16:25:50 -07:00
Mark Otto 71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Mark Otto 0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto 798363eda7 fix left margin on .thumbnails for responsive <767 2012-04-07 14:31:55 -07:00
Mark Otto fe05f9aeb2 fix #2572: streamline thumbnails css to allow for offsets 2012-04-01 00:59:34 -07:00
Mark Otto d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto f37d9aeaef fix #2856: make inputs using .span* classes responsive at <767px layout 2012-03-31 21:31:01 -07:00
Mark Otto 95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto ee3fc11add fix #2617: add negative margin to fixed-bottom navbar 2012-03-23 00:38:13 -07:00
Mark Otto 20da2c8ea0 add the broken out responsive files 2012-03-22 21:54:54 -07:00