0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

1061 Commits

Author SHA1 Message Date
Mark Otto
864343a3cc Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev 2016-10-30 13:38:44 -07:00
Valentine Abanosimov
34ec049231 Fixes #20975: removed trailing whitespace 2016-10-30 21:57:04 +03:00
Valentine Abanosimov
66d113be83 Fixes #20975: removed trailing whitespace 2016-10-30 21:51:16 +03:00
Valentine Abanosimov
d6132c9a5d Fixes #20975: made navbar-text color on navbar-dark equal to non-hovered link color 2016-10-30 21:43:54 +03:00
Mark Otto
cfd6e92ff6 include .col-form-label in the form validation field mixin 2016-10-28 16:35:47 -07:00
Mark Otto
ccb5248205 Merge branch 'issue19217' of https://github.com/alberto/bootstrap into alberto-issue19217 2016-10-27 22:28:24 -07:00
Mark Otto
20178076ee Merge pull request #19915 from zalog/patch-9
Zero out the default margin-bottom on label.custom-file
2016-10-27 22:20:26 -07:00
Mark Otto
9d011a8a6f Merge pull request #20101 from heath3/patch-1
Re-use 'between' mixin for 'only' mixin
2016-10-27 22:17:48 -07:00
Mark Otto
bc076d71b3 follow up to #20441: move file to correct place 2016-10-27 22:11:19 -07:00
Mark Otto
34d88c79e6 Merge pull request #20225 from morishitter/v4-dev
Add some properties to the list of property order in .scss-lint.yml
2016-10-27 22:09:10 -07:00
Mark Otto
8f0429973d Merge pull request #20441 from cortopy/visibility-mixin
Visibility mixin
2016-10-27 22:06:47 -07:00
Mark Otto
2df2efc1fb Merge pull request #18851 from ju1ius/patch-1
Don't clearfix if flexbox is enabled. Fixes #18849
2016-10-27 21:58:14 -07:00
Mark Otto
d23163a483 Merge pull request #21032 from twbs/flexbox-input-group
Proper input group sizing and alignment in flexbox mode
2016-10-27 21:23:48 -07:00
Mark Otto
f655343ac9 Merge pull request #21033 from twbs/label-less-custom-controls
Add a min-height: 1.5rem; to custom controls
2016-10-27 21:23:04 -07:00
Mark Otto
4a05116020 Merge pull request #21034 from twbs/better-custom-control-alignment
Calculcate the top offset for custom control indicators
2016-10-27 21:22:24 -07:00
Mark Otto
6608b2a9ee Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev 2016-10-27 20:04:04 -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
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
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
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
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
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
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
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
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
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
b0d61474e8 Merge pull request #20957 from kukac7/patch-1
duplicate navbar-toggler-padding variables
2016-10-24 20:49:14 -07:00
Chris Garcia
e1fefe6065 Container padding uses per-breakpoint gutter sizes, fixes #19304. 2016-10-22 00:06:41 -05:00
Pierre-Denis Vanduynslager
6eb2e54a91 Use box-shadow mixin 2016-10-20 16:35:45 -04:00
Pierre-Denis Vanduynslager
7a21517a48 Set box-shadow on input if enable-shadows rather than enable-rounded 2016-10-20 14:29:20 -04:00
Patrick H. Lauke
85531fd9fb replace # with %23 in SVG data urls with str-replace 2016-10-20 18:27:11 +01:00
Patrick H. Lauke
b2fe9743cc Add str-replace Sass function 2016-10-20 18:26:36 +01:00
Alan Mooiman
e22b0df8b2 Create col class for auto flexbox columns
.col-xs-auto, .col-sm-auto, etc.
2016-10-20 13:08:00 -04:00
béla
dd1b9eeef8 duplicate navbar-toggler-padding variables 2016-10-20 11:31:30 +02:00
Simon Bächler
8402d2321f Use a variable for the default font weights. Fixes #20741
Websites might use different weights such as medium or thin or use light as default weight instead of normal.
Also referenced: #18605 and #16170.
2016-10-19 21:41:27 +02:00
Mark Otto
8ff7edaab4 version bump to alpha 5 2016-10-19 08:27:41 -07:00
JPeer264
088b164a23 updated sass variables table of contents 2016-10-19 10:17:55 +02:00
Mark Otto
028dd6bd48 Merge pull request #19890 from twbs/v4-navbars
v4: Navbar improvements
2016-10-19 00:59:51 -07:00
Mark Otto
16947ffa88 Merge pull request #20933 from twbs/alert-padding-vars
Switch to separate vars for alert vertical/horizontal padding
2016-10-18 23:42:16 -07:00
Mark Otto
271f10f74f Merge branch 'v4-dev' into v4-navbars 2016-10-18 20:03:49 -07:00
Mark Otto
6321f9342e Switch to separate vars for alert vertical/horizontal padding 2016-10-18 19:18:06 -07:00