15182 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Otto	fde7101f13	grunt	2016-10-27 20:03:56 -07:00
Mark Otto	61b01f9b28	Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1	2016-10-27 20:02:59 -07:00
Mark Otto	020a8c6918	Merge pull request #20734 from beausmith/button-outline-variant ... Remove hard-coded value in button-outline-variant	2016-10-27 19:58:48 -07:00
Mark Otto	fbed329218	Merge pull request #21035 from judetucker/badge_cleanup ... cleaned up the docs to complete the change from .tag to .badge	2016-10-27 19:57:11 -07:00
Mark Otto	cfc8e40da9	Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev	2016-10-27 19:56:55 -07:00
judetucker	b3944c2334	cleaned up the docs to complete the change from tag to badge	2016-10-27 15:03:45 -07:00
Mark Otto	2dcc50f017	Calculcate the top offset for custom control indicators ... Fixes #21023. Uses some math functions to determine what the offset should be. This is helpful for those who customize the size of their indicators and still want them vertically centered.	2016-10-27 14:41:12 -07:00
Mark Otto	1421ca5b87	Add a min-height: 1.5rem; to custom controls ... Fixes #20730. This change computes the minimum needed height of what a single line of text would be for the custom checkboxes/radios. This is required because our custom control indicators are positioned absolutely, meaning they cannot be clearfixed or anything like that. Using a computed value means it should scale nicely in case of customization	2016-10-27 14:32:56 -07:00
Mark Otto	78c9757236	property order	2016-10-27 13:46:16 -07:00
Mark Otto	259a420d70	Ensure proper sizing of and alignment of content within input group addons and buttons ... Fixes #20927.	2016-10-27 13:40:55 -07:00
Mark Otto	da6b5a0551	Merge pull request #21028 from judetucker/card_docs_float ... Docs correction to change .pull to .float on Card docs	2016-10-27 11:51:06 -07:00
Mark Otto	93ac9381be	Fixes #17631: Add mention of removed .btn-group-justified ... It was only available for anchor elements and not button elements, so it was super weird to support. Might be bringing it back with flexbox though in v4 as an option.	2016-10-27 10:31:37 -07:00
Mark Otto	9dbfc90eae	grunt	2016-10-27 09:51:22 -07:00
Mark Otto	a26080c047	rework flex grid autolayout docs ... Adds clearer headings to each section, reworks some copy to be more direct.	2016-10-27 09:50:25 -07:00
Mark Otto	26c33fa5ed	unrelated change; bold that stuff to emphasize it	2016-10-27 09:49:57 -07:00
Mark Otto	e2068d0e53	Merge branch 'auto-flex-col' of https://github.com/alanmoo/bootstrap into alanmoo-auto-flex-col	2016-10-27 09:41:33 -07:00
Mark Otto	5b266437e7	Merge pull request #21027 from twbs/document-zindex ... Document zindex	2016-10-27 09:39:27 -07:00
Mark Otto	115a37db1a	Change variable for modal backdrop zindex, rearrange to be ordered from lowest to highest	2016-10-27 09:31:38 -07:00
Mark Otto	3cc0239903	Document our z-index values ... Fixes #18532	2016-10-27 09:26:23 -07:00
Mark Otto	8ed7ebcd63	fixes #18565: mention carousel sizing in docs	2016-10-27 09:19:07 -07:00
Mark Otto	abc9a526d5	Fixes #20498: Warn about flexbox bugs in our flex grid docs	2016-10-27 09:03:45 -07:00
Mark Otto	ab49e3f7e6	fixes #21000: Remove margin from static form control example	2016-10-27 08:58:12 -07:00
Mark Otto	42dfa7994d	Merge pull request #21024 from eigan/fixdoc-secondary-dropdown ... Docfix: Change label from Default to Secondary, and reorder dropdowns	2016-10-27 08:53:52 -07:00
Einar Gangsø	45cbbad871	Docfix: Typo default -> secondary, and reorder	2016-10-27 10:12:14 +02:00
judetucker	7cc086e2c1	change the header nav description to include the new float	2016-10-26 22:05:46 -07:00
Mark Otto	52c84a1cb6	Merge pull request #20938 from JPeer264/feature/sass-doc ... Docs: Sass Variables Table of Contents	2016-10-26 21:20:25 -07:00
Mark Otto	7aab3d9573	Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev	2016-10-26 21:16:06 -07:00
Mark Otto	a0599a245d	Follow up to #20982 to fix css for modals	2016-10-26 21:15:31 -07:00
Mark Otto	261ed70a18	Merge pull request #21019 from Starsam80/fix-collapse ... Rename .in to .active to fix collapse	2016-10-26 21:14:16 -07:00
Mark Otto	bcbbc8eeda	Merge pull request #21020 from twbs/rename-tag-to-badge ... Rename .tag to .badge to avoid conflicting with WordPress	2016-10-26 19:53:50 -07:00
Mark Otto	d9fa3fd797	Rename .tag to .badge to avoid conflicting with WordPress	2016-10-26 18:33:58 -07:00
Starsam80	aa08274d24	Rename .in to .active to fix collapse	2016-10-26 17:24:46 -06:00
Mark Otto	d9d75f4d54	Merge pull request #20945 from coliff/patch-10 ... Update Google Analytics snippet to always load via HTTPS	2016-10-25 20:02:32 -07:00
Mark Otto	aa11f00218	Merge pull request #20982 from Johann-S/fix19344 ... Fix #19344 - Use a single class name for opened/expanded/shown state of widgets	2016-10-25 19:57:51 -07:00
Mark Otto	2eaef44edd	Merge pull request #20951 from sbaechler/font-weights ... Use a variable for the default font weights. Fixes #20741	2016-10-25 19:55:34 -07:00
Mark Otto	182a642b07	Merge pull request #20903 from Starsam80/fix-20395 ... Remove borders on the top and/or bottom when .list-group-flush is the first and/or last child	2016-10-25 19:52:14 -07:00
Mark Otto	0fff1a1424	Merge pull request #20998 from twbs/v4-browser-names ... Rename Microsoft Edge to just Edge in docs	2016-10-25 19:25:32 -07:00
tomhorvat	e5bb0c40f4	Body font weight variable	2016-10-25 15:05:51 +02:00
Johann-S	9d129a43d6	Use a single class name for opened/expanded/shown state of widgets	2016-10-25 14:07:41 +02:00
Patrick H. Lauke	f93df8dccd	Merge pull request #20962 from patrickhlauke/v4-fix-unescaped-hash-data-urls ... Fix unescaped `#` in SVG data URLs	2016-10-25 12:31:29 +02:00
Mark Otto	1aa6ff393b	Fixes #20948: Rename Microsoft Edge to just Edge in docs	2016-10-24 22:12:19 -07:00
Mark Otto	f11f630acd	Merge pull request #20947 from bardiharborow/examples ... Normalize examples and update where relevant.	2016-10-24 22:10:35 -07:00
Mark Otto	ee47abd56c	Merge pull request #20994 from ramaboo/v4-dev ... Fixing ruby gem version to 4.0.0.alpha5	2016-10-24 21:51:28 -07:00
Mark Otto	a3bc24abc4	Merge pull request #20973 from pixelbandito/container-gutter-breakpoints ... Container padding uses per-breakpoint gutter sizes, fixes #19304.	2016-10-24 21:49:26 -07:00
Mark Otto	73154d0392	Merge pull request #20467 from maxbeatty/v4-dev-17754 ... add support for ol in tab plugin	2016-10-24 20:50:52 -07:00
Mark Otto	60e51bc918	Merge pull request #18847 from Johann-S/fix18824 ... Fix bug multiple accordions collapse	2016-10-24 20:50:04 -07:00
Mark Otto	b0d61474e8	Merge pull request #20957 from kukac7/patch-1 ... duplicate navbar-toggler-padding variables	2016-10-24 20:49:14 -07:00
Mark Otto	378f96d67b	Merge pull request #20964 from vanduynslagerp/fix-form-control-shadows ... Set box-shadow on input if enable-shadows rather than enable-rounded	2016-10-24 20:47:21 -07:00
Mark Otto	61bf63c609	Merge pull request #20966 from bardiharborow/spacing-docs ... Fix documentation for all-side spacing classes.	2016-10-24 20:43:54 -07:00
David Singer	4690fc1205	Fixing ruby gem version to 4.0.0.alpha5	2016-10-24 18:29:36 -07:00