0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

14379 Commits

Author SHA1 Message Date
Mark Otto
11efaf5439 Merge pull request #18878 from twbs/btn-group-vertical
rm unnecessary border-radius properties from .btn-group-vertical code
2016-01-17 19:00:37 -08:00
Mark Otto
955e0405ea fuck around with card borders and more 2016-01-17 18:55:24 -08:00
Mark Otto
776337924e Merge pull request #18920 from twbs/v4-custom-forms-vars
v4: Custom forms variables
2016-01-17 17:54:45 -08:00
Mark Otto
94e27cdd6e Merge pull request #18921 from twbs/v4-custom-docs
Update docs to include mention of the custom variables file
2016-01-17 16:05:27 -08:00
Mark Otto
dd4062f213 Update docs to include mention of the custom variables file 2016-01-17 16:04:18 -08:00
Mark Otto
567a0e9cee add custom overrides to other bundles 2016-01-17 15:54:17 -08:00
Mark Otto
d00eef1dac Merge branch 'provide-custom-scss' of https://github.com/stephaniepurvis/bootstrap into stephaniepurvis-provide-custom-scss 2016-01-17 15:51:49 -08:00
Mark Otto
2f4af5c295 condense that comment, clean up formatting 2016-01-17 15:50:27 -08:00
Mark Otto
8a0b8b6b03 Merge pull request #18789 from twbs/fix-18733-more
Prevent breadcrumb separator from getting underlined on hover when not using <ol> markup
2016-01-17 15:45:02 -08:00
Mark Otto
c0a8a70d59 Missing ; 2016-01-17 15:32:01 -08:00
Mark Otto
3a2f0456bf Merge pull request #18883 from twbs/zindex-dropdown-backdrop
Use proper variable for .dropdown-backdrop's z-index
2016-01-17 15:25:58 -08:00
Mark Otto
fb14ee70d0 Merge pull request #18885 from twbs/list-group
Remove near-duplicate contextual list group example
2016-01-17 15:25:04 -08:00
Mark Otto
5c12d5e469 add custom file vars, fix up custom select var 2016-01-17 15:21:16 -08:00
Mark Otto
6b318ef176 Hella vars for custom checkboxes and radios and selects 2016-01-16 22:29:51 -08:00
Chris Rebert
37aa7a6a27 Merge pull request #18825 from twbs/misc-box-shadows
Add variables for miscellaneous box-shadows
2016-01-16 20:30:33 -08:00
Chris Rebert
802c1cb5fc Extract variables for .modal-content box-shadow
[skip sauce]
[skip validator]
2016-01-16 20:25:00 -08:00
Chris Rebert
bbd449994a Extract $thumbnail-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
9b2d9f6e04 Extract $popover-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
58f7e602ae Extract $dropdown-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
a5b41e7254 Extract $btn-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
6293dd41cf Extract $kbd-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
7be17b4a35 Merge pull request #18821 from twbs/popover-vars
Add variables for padding of popover title & content
2016-01-16 14:08:14 -08:00
Chris Rebert
dda263d9ac Merge pull request #18820 from twbs/media-obj-vars
Add variables for media object margins and padding
2016-01-16 14:07:49 -08:00
Sebastian Klatte
0e410f69ac Fix active Home tab in narrow-jumbotron example
the active class should be moved from the list item to the link item
2016-01-16 16:55:53 +01:00
Chris Rebert
db5babb26a Merge pull request #18912 from Quy/patch-4
Docs: Use mixin syntax in Sass example of .invisible
2016-01-15 17:41:35 -08:00
Quy
8e00f623b3 Use mixin syntax 2016-01-15 09:49:56 -08:00
Chris Rebert
f2a0623d34 Docs: Tweak phrasing of description of $enable-gradients
[ci skip]
2016-01-14 22:33:09 -08:00
Chris Rebert
a15f4097c4 Merge pull request #18906 from Quy/patch-3
$enable-gradients docs: Add missing word
2016-01-14 22:32:07 -08:00
Chris Rebert
a22c696485 Extract $blockquote-border-width variable
[skip sauce]
2016-01-14 22:27:08 -08:00
Quy
ec1e626b98 Add missing word 2016-01-14 22:01:50 -08:00
Chris Rebert
1d55f680a8 Merge pull request #18903 from twbs/travis-cache-fix
Fix RVM under Travis caching by excluding node-which from $PATH
2016-01-14 18:24:13 -08:00
Chris Rebert
672f9b6d73 Fix RVM under Travis caching by excluding node-which from $PATH
See https://github.com/travis-ci/travis-ci/issues/5092 for more details.
Reverts #18376
2016-01-14 14:16:05 -08:00
Chris Rebert
5e893434c7 Merge pull request #18891 from rtack/patch-1
Docs typo: from controls --> form controls
2016-01-14 01:08:19 -08:00
Raphael Ackermann
740ffb8ed4 typo: from controls --> form controls 2016-01-14 09:59:40 +01:00
Chris Rebert
01c3f874e1 Merge pull request #18888 from CrispyBacon12/nested-mixins-pass-breakpoints
Allow optional breakpoint arguments to be passed on to nested media query mixins
2016-01-13 23:47:32 -08:00
Chris Purssell
0762a1978c Allow custom breakpoint config to be passed on by mixins which nest media query mixins. 2016-01-14 16:33:04 +10:00
Chris Rebert
5cde72fae3 Remove near-duplicate contextual list group example
[skip sauce]
2016-01-13 18:12:16 -08:00
Chris Rebert
6ff249791e Merge pull request #18882 from twbs/stoichiometry
Use proper units when adding/subtracting lengths
2016-01-13 18:07:55 -08:00
Chris Rebert
27a7fff0fb Use proper variable for .dropdown-backdrop's z-index 2016-01-13 16:21:52 -08:00
Chris Rebert
a4745dd7a1 Use proper units when adding/subtracting lengths
[skip sauce]
[skip validator]
2016-01-13 16:16:43 -08:00
Chris Rebert
5e9b365b25 List group docs: rm unnecessary <p> from Markdown source
[skip sauce]
2016-01-13 15:57:54 -08:00
Chris Rebert
bc220835a9 Merge pull request #18879 from twbs/vert-horiz-y-x
Rename padding local vars per new naming convention
/fyi @mdo
2016-01-13 15:37:08 -08:00
Chris Rebert
44a1361079 Rename gradient mixins to match new naming convention
gradient-{horizontal=>x}[-three-colors]
gradient-{vertical=>y}[-three-colors]
2016-01-13 15:34:01 -08:00
Chris Rebert
d26b7c7a2c Rename local vars per new naming convention: $padding-{vertical=>y} $padding-{horizontal=>x}
[skip sauce]
[skip validator]
2016-01-13 15:29:06 -08:00
Chris Rebert
3daf4275eb rm unnecessary border-radius properties from .btn-group-vertical code
[skip sauce]
[skip validator]
2016-01-13 15:05:23 -08:00
Chris Rebert
fa696d0465 Merge pull request #18869 from twbs/wkbug-153056
Add Wall of Browser Bugs entry for #18859
2016-01-12 22:10:04 -08:00
Chris Rebert
8ed66af63c Add Wall of Browser Bugs entry for #18859
See https://bugs.webkit.org/show_bug.cgi?id=153056
Refs #18859
[skip sauce]
2016-01-12 22:04:30 -08:00
Chris Rebert
1e37f507d5 Respect $border-rounded inside progress bars too
[skip sauce]
2016-01-11 12:29:50 -08:00
Chris Rebert
4fae7cbc88 Merge pull request #18844 from AndersSahlin/patch-1
Modal: Respect $enable-rounded setting
[skip sauce]
2016-01-11 12:17:16 -08:00
Anders Sahlin
ea4a79c689 Modals respect $enable-rounded setting
See issue: https://github.com/twbs/bootstrap/issues/18385
2016-01-11 14:02:14 +01:00