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

537 Commits

Author SHA1 Message Date
Mark Otto
11c287d1d7 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-12-08 00:16:56 -08:00
Mark Otto
60ad55b8f7 fixes #17776 2015-12-08 00:16:46 -08:00
Mark Otto
9c55815898 Merge pull request #17930 from zalog/patch-12 
v4 - .c-select shouldn't inherit white text color
 2015-12-08 00:05:52 -08:00
Chris Rebert
8b0d737a56 scss/_pagination.scss: Reassert #18257 
[skip sauce]
 2015-12-08 00:01:58 -08:00
Mark Otto
30aad997d0 tweak comment 2015-12-07 23:52:10 -08:00
Mark Otto
96dd9c57d2 Merge branch 'bassjobsen-patch-6' into v4-dev 2015-12-07 23:48:41 -08:00
Mark Otto
9e6d1c1ec6 Merge branch 'patch-6' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-6 2015-12-07 23:48:33 -08:00
Mark Otto
4dd60d8310 fix variable 2015-12-07 23:46:56 -08:00
Mark Otto
a9f53f0fc0 Merge pull request #18110 from twbs/pagination-classes 
Refactor pagination classes to avoid tag selectors & child selectors
 2015-12-07 23:41:55 -08:00
Mark Otto
9e872efb3f rip out the .blockquote-* children classes for margin utils 2015-12-07 23:36:35 -08:00
Mark Otto
886bbe9bc0 Merge pull request #18138 from bassjobsen/patch-12 
refactor blockqoutes to to avoid tag selectors & child selectors
 2015-12-07 23:32:31 -08:00
Mark Otto
515ff1aacb rewrite list-inline to use margin and simpler styles 2015-12-07 23:31:02 -08:00
Mark Otto
d3c87d32fa Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11 2015-12-07 23:28:31 -08:00
Chris Rebert
e7edf10473 .page => .page-item 2015-12-07 22:37:17 -08:00
Chris Rebert
0c1df9912f Refactor pagination code to remove unnecessary ancestor requirements in selectors 2015-12-07 22:37:17 -08:00
Chris Rebert
5f35ce2095 .page>{a,span => .page-link} 2015-12-07 22:37:17 -08:00
Chris Rebert
a878c4f0c6 .pagination>{li => .page} 2015-12-07 22:37:17 -08:00
Mark Otto
7eadfbc9b2 ignore that 2015-12-07 22:31:16 -08:00
Mark Otto
5a6a128728 fixes #18330 2015-12-07 21:57:06 -08:00
Mark Otto
e5b6922258 Merge pull request #18356 from lesleh/card-mixin 
Card mixin
 2015-12-07 21:55:26 -08:00
Mark Otto
c9eb483ca9 fixes #18320: pull in suit base reset for button focus styles in FF and IE 2015-12-07 21:47:40 -08:00
Mark Otto
d36686afee spacing 2015-12-07 21:46:03 -08:00
Chris Rebert
9dacdce42c Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424 
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width   => $input-btn-border-width
$input-border-width => $input-btn-border-width

[skip sauce]
 2015-12-07 20:41:51 -08:00
Mark Otto
a22d2fb5a5 fixes #17433: improve borders on .list-group-flush to remove dupe borders when appropro 2015-12-07 10:05:53 -08:00
Chris Rebert
d1a0af8b24 Tweak naming and docs of font utility classes 
* `.font-normal` is too generic. Rename it to `.font-weight-normal` for clarity.
* Rename `.font-bold` to `.font-weight-bold` so as to parallel `.font-weight-normal`.
* In docs, gloss "weight" term in relation to fonts for the benefit of non-typographiles.

Refs #18433

[skip sauce]
 2015-12-07 00:08:54 -08:00
Chris Rebert
28bbf42e26 Fix .font-italic utility class definition 
Erratum from 26da610bd0
Refs #18001
 2015-12-06 17:37:55 -08:00
Mark Otto
21b15d450d fixes #18087: .navbar-form is no more 2015-12-06 16:59:33 -08:00
Mark Otto
49674a8eba fixes #18425 by using vars for 1px borders 2015-12-06 16:45:40 -08:00
Mark Otto
26da610bd0 fixes #18433: add three new font utils 2015-12-06 16:39:55 -08:00
Mark Otto
db0f2df59c Merge pull request #18426 from twbs/label-reboot-comment-grammar 
Fix grammar of comment for <label> in Reboot
 2015-12-06 16:29:56 -08:00
Mark Otto
239befe16b Merge branch 'list-inline-padding' into v4-dev 2015-12-06 16:29:35 -08:00
Chris Rebert
0759d76bd2 Add 3 more font-weight variables 
Refs #14368

[skip sauce]
[skip validator]
 2015-12-06 12:32:49 -08:00
vsn4ik
ad698d124a v4 - Add default param for form-icon variables 2015-12-05 21:32:25 +03:00
XhmikosR
e94891fe24 Merge pull request #18395 from twbs/scsslint-pseudo-elems 
SCSS Lint: explicitly enable PseudoElement check
 2015-12-05 10:29:18 +02:00
Chris Rebert
e8dcb2f917 Add $list-inline-padding variable 
[skip sauce]
[skip validator]
 2015-12-04 01:56:49 -08:00
Chris Rebert
191c82dc38 Fix grammar of comment for <label> in Reboot 2015-12-04 01:46:45 -08:00
Chris Rebert
2fcb2e099f Use $border-width for .btn-group margins that make borders overlap 
Fixes half of #18425
[skip sauce]
[skip validator]
 2015-12-04 01:42:51 -08:00
Chris Rebert
c15e9fb9ad SCSS Lint: enable PseudoElement check 2015-12-01 02:05:37 -08:00
Chris Rebert
548834e87f Merge pull request #18340 from twbs/responsive-pulls 
Add responsive float classes
 2015-11-29 21:47:49 -08:00
Mark Otto
23d7b7fe42 Merge pull request #18381 from twbs/file-input-width-var 
Use $input-border-width for custom file input borders
 2015-11-29 21:18:52 -08:00
Mark Otto
b7e3e92d6b Merge pull request #18380 from twbs/card-border-var 
Use $card-border-width for .card-inverse's header/footer border-bottom override
 2015-11-29 21:18:40 -08:00
Chris Rebert
12d0f98507 Use $input-border-width for custom file input borders 
Fixes part of #18150

[skip sauce]
[skip validator]
 2015-11-29 21:13:19 -08:00
Chris Rebert
3f2943424f Remove reference to defunct Customizer from v3 
[ci skip]
 2015-11-29 20:54:45 -08:00
Chris Rebert
0b01c360fc Use $card-border-width for .card-inverse's header/footer border-bottom override 
Refs #18150

[skip sauce]
[skip validator]
 2015-11-29 20:48:33 -08:00
Mark Otto
543580eafe Merge pull request #18256 from twbs/print-border-widths 
Use $border-width in misc border print styles
 2015-11-29 20:03:02 -08:00
Mark Otto
f16ad22530 fixes #18188 2015-11-29 19:56:17 -08:00
Mark Otto
4005b316c6 rearrange comment lines for clarity 2015-11-29 19:55:51 -08:00
Mark Otto
0fa2c7c486 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-29 19:54:20 -08:00
Mark Otto
c68019e5d0 Merge pull request #18257 from twbs/border-width-vars 
Add more border width variables
 2015-11-29 19:52:22 -08:00
Mark Otto
1f487f79d3 Merge pull request #18260 from twbs/fix-18259 
Move viewport-dependent padding tweak into main .jumbotron block
 2015-11-29 19:49:20 -08:00