113 Commits

Author	SHA1	Message	Date
Mark Otto	ef0b88f6b3	fix order	2015-03-29 00:13:30 -07:00
Mark Otto	2f7bfb44c2	fixes	2015-03-29 00:12:19 -07:00
Mark Otto	58082cd83e	Merge branch 'master' into v4 ... Conflicts: .gitignore Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/js/transitions.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/migration.html js/affix.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss	2015-03-29 00:08:54 -07:00
Mark Otto	d29f851e82	Images are responsive by default	2015-03-11 19:19:03 +00:00
Mark Otto	454cc55e31	remove justified button groups	2015-03-09 14:32:30 +00:00
Mark Otto	7dcd9c5d63	remove all customizer comments from variables file	2015-03-09 14:18:25 +00:00
Mark Otto	517977fca4	fix validation, run grunt dist	2015-03-01 14:11:22 -08:00
Mark Otto	c16fee5efd	Merge branch 'master' into v4 ... Conflicts: .travis.yml Gruntfile.js bower.json dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_data/glyphicons.yml docs/_includes/components/breadcrumbs.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/license.html docs/_includes/getting-started/template.html docs/_includes/header.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/js/transitions.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/assets/js/vendor/FileSaver.js docs/assets/js/vendor/autoprefixer.js docs/assets/js/vendor/uglify.min.js docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.min.js docs/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/narrow-jumbotron/narrow-jumbotron.css docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/theme/index.html grunt/configBridge.json js/affix.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tooltip.js less/badges.less less/glyphicons.less less/type.less less/variables.less package.json scss/_dropdown.scss scss/_forms.scss test-infra/npm-shrinkwrap.json	2015-03-01 13:44:10 -08:00
Chris Rebert	f265fed3eb	account for mq4-hover-shim's renaming & org move	2015-02-04 21:15:01 -08:00
Chris Rebert	fd13e33aa4	add $use-hover-media-query to control @media (hover:hover) usage	2015-01-22 11:39:57 -08:00
Chris Rebert	8e374bd010	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
Mark Otto	c0f4dcd38e	Merge pull request #65 from twbs/precision ... Use expressions for thirds to avoid precision issues	2015-01-21 18:34:19 -08:00
Chris Rebert	f6ef89d6c3	Use expressions for thirds to avoid precision issues	2015-01-21 15:11:25 -08:00
Chris Rebert	a1126ef655	Reorg @viewport now that we don't need to worry about non-responsive layouts	2015-01-21 13:05:14 -08:00
Chris Rebert	8ecdda0b35	Merge pull request #52 from twbs/normalize-figure ... Let Normalize.css normalize <figure>'s margin	2015-01-19 16:58:01 -08:00
Mark Otto	6ba05d95d5	properly reset button.close styles	2015-01-19 16:11:39 -08:00
Mark Otto	dfdb99c989	fix broken breadcrumb divider	2015-01-19 16:08:48 -08:00
Mark Otto	3fe96e8f50	fix border color on inverse tables	2015-01-19 15:52:40 -08:00
Mark Otto	7440c38469	fix invalid css	2015-01-19 14:50:41 -08:00
Mark Otto	325748ff68	Merge branch 'master' into v4 ... Conflicts: _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.min.js docs/_includes/components/thumbnails.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/download.html docs/_includes/getting-started/template.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/theme/index.html grunt/configBridge.json less/alerts.less less/badges.less less/jumbotron.less less/panels.less less/tables.less less/theme.less less/variables.less package.json scss/_button-group.scss scss/_buttons.scss scss/_forms.scss	2015-01-19 14:48:12 -08:00
Chris Rebert	1e5ce1e1a9	Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss" ... This reverts commit 2916ac43ed. This reverts commit 3d635f3079. This reverts commit 61a2120557. This change broke the Grunt build.	2015-01-18 15:00:58 -08:00
Gleb Mazovetskiy	2916ac43ed	Rename scss/bootstrap.scss -> scss/_bootstrap.scss ... This is required for Compass compatibility. See https://github.com/twbs/bootstrap-sass/issues/694 Also updates bower.json and package.json references to the main Sass file.	2015-01-15 21:20:40 +00:00
Gleb Mazovetskiy	720d02c5e5	Revert "Remove libsass @media nesting bug workaround" ... This reverts commit d6a5ebf438. There has not been a release of libsass with this fix yet, sorry!	2015-01-08 21:38:12 +00:00
Chris Rebert	d6a5ebf438	Remove libsass @media nesting bug workaround ... https://github.com/sass/libsass/issues/185 has been fixed. Refs #48	2015-01-07 19:17:45 -08:00
Chris Rebert	11a574ce9e	Overhaul responsive visibility classes ... Thanks to @glebm for help refactoring this to use the breakpoint mixins.	2015-01-06 17:47:13 -08:00
Chris Rebert	cbb3b1ff9a	Kill scss/mixins/_media-queries.scss ... replaced media-xs => media-breakpoint-down(xs) replaced media-sm => media-breakpoint-up(sm) replaced media-sm-max => media-breakpoint-only(sm) replaced media-md => media-breakpoint-up(md) replaced media-md-max => media-breakpoint-only(md) replaced media-lg => media-breakpoint-up(lg)	2015-01-06 17:47:13 -08:00
Chris Rebert	746e09f8ae	rename media-breakpoint-{min,max} => media-breakpoint-{up,down}	2015-01-06 17:47:13 -08:00
Chris Rebert	ef453fa6ce	Use improved box sizing reset ... Based on http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ This allows us to significantly simplify the relevant part of the docs.	2015-01-05 15:20:46 -08:00
Chris Rebert	00e6fae8fb	Remove affix from docs & CSS; add migration guidance	2015-01-05 11:36:51 -08:00
Mark Otto	615eb99067	fix broke shit, recompile	2015-01-03 20:16:46 -08:00
Mark Otto	0e5d17d5f6	Merge branch 'master' into v4 ... Conflicts: Gruntfile.js dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.min.js docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.html docs/_includes/components/breadcrumbs.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/input-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/page-header.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/code.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/whats-included.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/javascript.html docs/_jade/customizer-variables.jade docs/_layouts/default.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/customize.html docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css less/glyphicons.less less/mixins/vendor-prefixes.less less/navbar.less less/popovers.less less/tables.less less/theme.less less/tooltip.less less/variables.less package.json scss/_carousel.scss scss/_close.scss scss/_forms.scss test-infra/npm-shrinkwrap.json	2015-01-03 20:08:58 -08:00
Mark Otto	31610258de	Merge branch 'v4' of https://github.com/twbs/derpstrap into v4	2015-01-03 16:00:45 -08:00
Mark Otto	a6053b573c	override the box-shadows on active, checked, and indeterminate states	2015-01-01 12:13:24 -08:00
Mark Otto	401ace65f4	add indeterminate checkbox support	2015-01-01 12:01:55 -08:00
Chris Rebert	4e8f769d44	fix typo in comment	2015-01-01 00:02:21 -08:00
Mark Otto	1a932b7e02	Merge branch 'v4' of https://github.com/twbs/derpstrap into v4	2014-12-31 10:39:56 -08:00
Mark Otto	a5e127fd16	grunt	2014-12-31 10:37:23 -08:00
Mark Otto	03e39251fa	larger hr border width so it shows up	2014-12-31 10:20:29 -08:00
Mark Otto	b873edce8e	tweak and improve jumbotrons	2014-12-31 10:20:12 -08:00
Mark Otto	49ac4ea0fa	fix some source code for custom forms	2014-12-31 10:07:34 -08:00
Chris Rebert	b342de4fa3	Merge pull request #22 from twbs/alert-heading ... Use .alert-heading instead of hardcoding <h4>	2014-12-29 16:04:00 -08:00
Chris Rebert	10f703f3b0	un-nest .alert-heading & .alert-link	2014-12-29 16:03:22 -08:00
Chris Rebert	a0edcc9225	refactor tooltip+popover CSS to decrease chaining+nesting	2014-12-29 12:37:11 -08:00
Chris Rebert	654d0dffc9	CSS: prefix .{right,left,top,bottom} with 'tooltip-'/'popover'	2014-12-29 12:34:09 -08:00
Chris Rebert	d46a12e601	remove now-redundant .popover parent in .popover-arrow selectors	2014-12-29 12:33:06 -08:00
Chris Rebert	6a5bc63649	rename .arrow => .popover-arrow	2014-12-29 12:33:06 -08:00
Chris Rebert	a1ce6a1968	Merge pull request #21 from twbs/deprecated-tooltip-placements ... Remove deprecated tooltip placements	2014-12-26 12:55:08 -08:00
Mark Otto	b92534c632	improve code quality on custom forms	2014-12-25 15:40:24 -08:00
Mark Otto	cd60cf3386	custom forms: checkbox and radio stacked option	2014-12-24 15:45:37 -08:00
Gleb Mazovetskiy	93f51eb0e9	Automate breakpoints ... Breakpoints and container widths are now defined as maps.	2014-12-24 22:27:11 +02:00