rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
15,037 Commits 108 Branches 89 Tags 552 MiB
7cc086e2c1
Commit Graph

15037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
805b384519 Merge pull request #20874 from twbs/select-height 
Match the height of select.form-control with input.form-control
 2016-10-09 18:08:29 -07:00
Mark Otto
0c467e7b29 Match the height of select.form-control with input.form-control 
Uses a local variable and some calc love to counteract the border-width (times 2) from the height of the select. Fixes #17194 and nullifies #19967.
 2016-10-09 18:04:30 -07:00
Mark Otto
ea57c51082 document it a bit 2016-10-09 17:46:45 -07:00
Mark Otto
4bc154b8f9 Merge branch 'patch-10' of https://github.com/zalog/bootstrap into zalog-patch-10 2016-10-09 17:35:44 -07:00
Mark Otto
571e86e770 grunt 2016-10-09 17:26:51 -07:00
Mark Otto
6def7a5d56 Merge pull request #20555 from bardiharborow/updatedeps 
Update dependencies, including Babel to v6 and zeroUnits fix.
 2016-10-09 17:08:39 -07:00
Mark Otto
ed7fc8bd63 Merge pull request #20873 from twbs/flush-list-group 
Reset the left and right border on list items for flush list groups
 2016-10-09 16:58:01 -07:00
Mark Otto
74778b725e Reset the left and right border on list items for flush list groups 
Avoid the resetting of the already set values in #20397. Fixes #20395.
 2016-10-09 16:57:32 -07:00
Mark Otto
27b6cd1b53 Merge pull request #20858 from vsn4ik/patch-1 
Update devDependencies badge link.
 2016-10-09 16:52:02 -07:00
Mark Otto
29f196936f Merge pull request #20872 from twbs/validation-fixes 
Form validation fixes
 2016-10-09 16:50:49 -07:00
Mark Otto
8273e0cf82 linting 2016-10-09 16:46:47 -07:00
Mark Otto
b77b874265 fix focus shadows, if enabled 2016-10-09 16:44:04 -07:00
Mark Otto
3fa312ccdf Use correct class for validation coloring on label elements 2016-10-09 16:40:56 -07:00
Mark Otto
8750b5f81c The color is already covered in the first ruleset here 2016-10-09 16:39:02 -07:00
Mark Otto
41518d0e32 Interpolate the variable so it passes the color properly 2016-10-09 16:38:28 -07:00
Mark Otto
167129ae86 Merge pull request #20871 from twbs/document-bg-faded 
Document the .bg-faded class
 2016-10-09 16:35:57 -07:00
Mark Otto
909b84a289 Document the .bg-faded class 
Fixes #20550.
 2016-10-09 16:35:16 -07:00
Mark Otto
9516b71777 Merge pull request #20870 from twbs/collapse-example-fix 
Don't use collapse classes on elements with padding
 2016-10-09 16:32:45 -07:00
Mark Otto
b7444eb82a Don't use collapse classes on elements with padding 
Fixes #20600.
 2016-10-09 16:32:19 -07:00
Mark Otto
8187b9a2d3 Merge pull request #20869 from twbs/static-control 
v4 Static form control sizing
 2016-10-09 16:25:41 -07:00
Mark Otto
9ac7e868df remove un-needed comment 2016-10-09 16:18:12 -07:00
Mark Otto
53ce4da835 add transparent border to match .form-control height 2016-10-09 16:17:48 -07:00
Mark Otto
55e130f88f Update static form control 
- Remove margin-bottom override in favor of .mb-0 utility class
- Apply the input line-height styles to match
- Remove the min-height to match the input
 2016-10-09 16:16:13 -07:00
Mark Otto
fc13ac2701 Merge pull request #20868 from twbs/inline-form-input-group 
Ensure input groups behavior appropriately in inline forms
 2016-10-09 16:04:22 -07:00
Mark Otto
cab2d5951d Ensure input groups behavior appropriately in inline forms 
Overrides the default width: 100% with an auto. Fixes #20752.
 2016-10-09 16:00:30 -07:00
Mark Otto
b04e9fb87c separate out the custom html example 2016-10-09 15:35:52 -07:00
Mark Otto
d212ff80ae Merge branch 'v4-dev' of https://github.com/dumb/bootstrap into dumb-v4-dev 2016-10-09 15:29:26 -07:00
Mark Otto
9159ad307f remove those files from the diff 2016-10-09 15:14:25 -07:00
Mark Otto
750a9d7d80 fix bad merge 2016-10-09 15:08:34 -07:00
Mark Otto
7dee5560a1 Merge branch 'v4-dev' into v4-navbars 2016-10-09 15:04:32 -07:00
Mark Otto
8d162553fa grunt 2016-10-09 15:02:49 -07:00
Mark Otto
3b13f81126 Merge pull request #20867 from twbs/dedupe-sm-vars 
Drop the $small-font-size variable for the newer $font-size-sm one
 2016-10-09 15:00:11 -07:00
Mark Otto
b4d8367dbc Merge pull request #20864 from twbs/fix-20688 
Update the grid table heading to clarify max width over width
 2016-10-09 14:57:31 -07:00
Mark Otto
821f719367 Merge pull request #20684 from twbs/v4-utils 
v4: The Utilities Update
 2016-10-09 14:54:57 -07:00
Mark Otto
b6fe0d45a4 Merge pull request #20865 from twbs/v4-container-widths 
v4: Grid adjustments
 2016-10-09 14:52:14 -07:00
Mark Otto
6c867667a1 Merge branch 'v4-dev' into v4-utils 2016-10-09 14:36:43 -07:00
Mark Otto
88bf5af896 Remove display from the .img-fluid utility 
Creating max-width images is not dependent on the display, so setting it is redundant. Cleans up the comments and implementation of the mixin as well.

Fixes #20767
 2016-10-09 14:14:39 -07:00
Mark Otto
13cc81c50c Update grid docs mention of gutter width value (no more rems for awhile now) 2016-10-09 13:51:59 -07:00
Mark Otto
1d0d0dac76 Update grid docs to use new values for grid breakpoints and containers 2016-10-09 13:51:05 -07:00
Mark Otto
0ba0f19003 Change 940px breakpoint to 960px so that all widths are divisible by 12 
Fixes #18510
 2016-10-09 13:49:11 -07:00
Mark Otto
0d27e12d1f Change sm grid breakpoint and container max-width 
Makes it so that the container is no longer wider than the breakpoint used in the media query. This was never really an issue in rendering as the max-width handled it appropriately, but the mismatch was still incorrect.

Fixes #18054
 2016-10-09 13:17:50 -07:00
Mark Otto
a43dc8872f Move from max-width to width for containers, plus a max-width 100% 
- Fixes issues between float and flex grid systems where container wouldn't fill the available width in Chrome & FF (but would in Safari)
- Fixes #20681
- Fixes #17621 (basically same issue as above issue)
 2016-10-09 13:14:10 -07:00
Mark Otto
8f6a47303a Drop the -font-size variable for the newer -size-sm one 
Originally -font-size was added in v3 to set the font-size of the <small> element. Now that we have newer, global type variables, we can use those instead for these kind of things.

Fixes #20859
 2016-10-09 12:45:58 -07:00
Mark Otto
0ba05f4da9 Update the grid table heading to clarify max width over width 
Fixes #20688
 2016-10-09 12:42:36 -07:00
Mark Otto
f49a7a2a08 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-10-09 12:40:03 -07:00
Mark Otto
a2a53cb8c5 grunt 2016-10-09 12:39:56 -07:00
Bardi Harborow
d57d5a606b Update dependencies, including Babel to v6 and zeroUnits fix. 2016-10-09 12:15:17 +11:00
Vasily Artemchuk
d71bc65b76 Update devDependencies badge link. 2016-10-07 14:40:28 +03:00
Seth Broweleit
e56146e592 Mark icon-fonts.md docs as not-yet-written (#20850) 
[ci skip]
 2016-10-06 23:59:19 -07:00
Rafael Corrêa Gomes
923eb42cbf README: Tweak linkage & capitalization (#20853) 
[ci skip]
 2016-10-06 23:54:19 -07:00