rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
15,439 Commits 108 Branches 89 Tags 553 MiB
4b88284b5a
Commit Graph

15439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bardi Harborow
27c924f91c Fix Hound warnings for minified files. (#20446) 2016-10-05 20:12:24 -07:00
Chris Rebert
1ca6c9d7f1 Remove -webkit-overflow-scrolling: touch due to an iOS Safari bug (#20803) 
See https://bugs.webkit.org/show_bug.cgi?id=158342
Fixes #17695
 2016-10-03 21:36:46 -07:00
Bardi Harborow
2e69dfa8c1 Fix broken/redirected links, moving to HTTPS where possible. (#20557) 2016-10-03 09:55:59 -07:00
Patrick H. Lauke
db533c2e8d Follow-up fix to #20821 
With apologies, copy/paste error following on from trying to fix conflicting Hound/Travis checks for https://github.com/twbs/bootstrap/pull/20821/ slipped through before I noticed them.
 2016-10-03 10:13:58 +01:00
Patrick H. Lauke
add8dfe157 Merge pull request #20821 from patrickhlauke/v4-h5bp-print 
Update print styles borrowed from h5bp
 2016-10-03 10:00:09 +01:00
David Beitey
07033a8cf8 Show clearfix for examples for xs/sm devices (#19287) 
Change `hidden-sm-up` to `hidden-md-up` as the clearfix divs should be visible on both `xs` and `sm` devices (widths of 6 columns).
 2016-10-02 23:21:15 -07:00
Patrick van Hesteren
98671231ec Updated documentation of the focus option from the modal component. (#19409) 2016-10-02 23:05:59 -07:00
Matt Viteri
860e07a0e9 Fixes #20566 (#20768) 2016-10-02 21:23:04 -07:00
Mark Otto
88c601a842 Flexbox grid updates (#20829) 
* Fixes #20775 without adding extra width and an important flag

* Since we're now getting the extend, we don't need the extra position relative

* rerrange

* getting min-height from the extend already
 2016-10-02 21:10:06 -07:00
Mark Otto
2919c34071 grunt 2016-10-02 20:39:19 -07:00
Mark Otto
44b49d1dd8 update comment 2016-10-02 20:36:49 -07:00
Mark Otto
5d04353d6b remove the margin there since it's in normalize 2016-10-02 20:36:31 -07:00
Mark Otto
dfafb660d0 Merge branch 'patch-1' of https://github.com/bardiharborow/bootstrap into bardiharborow-patch-1 2016-10-02 20:32:42 -07:00
Mark Otto
8a85f93aba grunt 2016-10-02 19:40:39 -07:00
Mark Otto
54822bd549 Comment that out for now since it's causing errors 2016-10-02 19:28:52 -07:00
Mark Otto
1db3586dc0 Merge branch 'v4-dev' into v4-navbars 2016-10-02 19:26:29 -07:00
Mark Otto
4699fd4b40 fix typos 2016-10-02 19:23:10 -07:00
Mark Otto
49153ecf4f Merge branch 'customizable-grid-gutters-per-breakpoint' of https://github.com/pixelbandito/bootstrap into pixelbandito-customizable-grid-gutters-per-breakpoint 2016-10-02 19:10:25 -07:00
Mark Otto
06d95cbba7 Ports changes from #20258 to v4 (#20828) 2016-10-02 18:42:39 -07:00
Mark Otto
59d0679250 Only override input border-radius as part of .form-control to avoid bug with iOS Safari (alt fix for #20247) (#20695) 2016-10-02 18:28:37 -07:00
Mark Otto
18b14d3c9f Document that all table styles are inherited (#20699) 2016-10-02 18:27:53 -07:00
Mark Otto
d051ef5e61 Fixes #20118: Add and use Sass variables to control the color of our embedded SVGs for custom form elements (#20700) 2016-10-02 18:27:03 -07:00
Mark Otto
a75330ca96 v4: Dropdown units (#20701) 
* Fixes #19784: Move from pixels to rems, add a margin-bottom: 0; to keep things aligned

* lintiong
 2016-10-02 18:25:51 -07:00