0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Bootstrap/less
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
..
tests Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
accordion.less more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
alerts.less Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
badges.less Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger 2012-12-24 02:06:28 -08:00
bootstrap.less Version bump 2012-12-22 16:10:06 -08:00
breadcrumbs.less Fixes #6136: Proper scoping of breadcrumbs divider 2012-12-07 09:43:09 -08:00
button-groups.less Remove comment out code and simplify what's left for button group toggles 2013-01-13 04:05:34 -08:00
buttons.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
carousel.less Merge branch '2.2.3' into 3.0.0-wip 2012-12-20 00:02:52 -08:00
close.less Remove @black and just use #000 2012-12-19 22:02:57 -08:00
code.less Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
component-animations.less Fix bug Collapse broken in IE 2012-08-21 14:33:15 +04:00
dropdowns.less Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
forms.less Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
glyphicons.less Add glyphicons font path variable 2013-01-11 18:32:00 +01:00
grid.less remove .hide specificity override from grid classes 2012-12-20 13:57:14 -08:00
jumbotron.less Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones 2012-12-19 21:37:16 -08:00
media.less Merge branch '2.2.3' into 3.0.0-wip 2012-12-20 00:02:52 -08:00
mixins.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
modals.less Add important flag to .show/.hide utility classes; remove .hide requirement from modals 2012-12-20 13:53:38 -08:00
navbar.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
navs.less Remove overflow: auto; from .tab-content 2013-01-11 20:26:48 -08:00
normalize.less Normalize indentation from 4 to 2 spaces 2012-12-20 14:11:40 -08:00
pager.less more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
pagination.less Nuke shadow on pagination 2013-01-12 19:46:47 -08:00
popovers.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
progress-bars.less remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00
responsive-767px-max.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
responsive-768px-979px.less grid vars updated 2012-11-30 15:43:07 -08:00
responsive-1200px-min.less grid vars updated 2012-11-30 15:43:07 -08:00
responsive-navbar.less navbar vars 2012-11-30 15:33:56 -08:00
responsive-utilities.less IE10 fix in responsive utilities, not regular utilities 2012-12-10 10:29:16 -08:00
scaffolding.less Finish migrating to Normalize 2: 2012-12-20 20:52:20 -08:00
tables.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
thumbnails.less more consistent variable naming patterns 2012-11-30 14:45:25 -08:00
tooltip.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
type.less Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
utilities.less Drop .input-block-level modifier as inputs are already width: 100%; 2012-12-26 14:19:48 -06:00
variables.less Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
wells.less more vars changed 2012-11-30 15:27:13 -08:00