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

566 Commits

Author SHA1 Message Date
Chris Rebert
edbdf21de5 Merge pull request #18464 from twbs/btn-block-spacing-y
Introduce $btn-block-spacing-y variable
2015-12-23 23:44:50 -07:00
Chris Rebert
7cfdc771f8 Uncomment Firefox .progress styles; fixes #18536
[skip sauce]
[skip validator]
2015-12-23 23:19:44 -07:00
Chris Rebert
a96e522d6a Organize existing .progress styles 2015-12-23 22:35:45 -07:00
Chris Rebert
76a4c303ee Refactor Breadcrumbs component
Use new `.breadcrumb-item` class instead of child selectors and `li` tag selectors,
so as to no longer require the usage of `<ol>`-based markup.

Rename variables to follow naming conventions:
* $breadcrumb-padding-vertical => $breadcrumb-padding-y
* $breadcrumb-padding-horizontal => $breadcrumb-padding-x

Introduce new variable: $breadcrumb-item-padding

[skip sauce]
2015-12-23 22:16:35 -07:00
Chris Rebert
7aabd49364 Reorganize utilities into more separate files under a /scss/utilities/ directory
[skip sauce]
[skip validator]
2015-12-23 21:01:17 -07:00
Chris Rebert
1e8743ec89 Merge pull request #18473 from twbs/fix-18036
Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
2015-12-23 20:33:37 -07:00
Chris Rebert
25cecdb55a Apply clearfix to .card-footer
[skip sauce]
[skip validator]
2015-12-23 17:25:37 -07:00
Chris Rebert
da533b8926 Apply clearfix to .card-header; fixes #18633 2015-12-23 17:20:23 -07:00
Chris Rebert
2e2b48da13 Apply clearfix to .card-block; fixes #18583 2015-12-23 17:18:19 -07:00
Chris Rebert
646580a919 Actually use $progress-bg instead of hardcoded color
Refs #18535
[skip sauce]
2015-12-21 10:57:57 -07:00
Chris Rebert
c6a276dd74 Set $progress-bg to color we are actually using 2015-12-21 10:57:57 -07:00
Chris Rebert
0917b04711 Actually use $progress-bar-color instead of hardcoded color
Refs #18535
2015-12-21 10:57:57 -07:00
Chris Rebert
5a18638f26 Set $progress-bar-color to color we are currently using 2015-12-21 10:57:54 -07:00
Chris Rebert
e6fdebb9c7 Merge pull request #18463 from twbs/nav-item-margin
Introduce $nav-item-margin variable
/fyi @mdo
2015-12-16 22:17:09 -08:00
Chris Rebert
92338da1f3 Merge pull request #18469 from twbs/card-deck-margin
Introduce $card-deck-margin variable
/fyi @mdo; happy to tweak the var names if desired
2015-12-16 22:16:36 -08:00
Patrick H. Lauke
7cffd334aa Merge pull request #18541 from patrickhlauke/progress-patch1
remove generated content value for progress
2015-12-16 10:19:04 +00:00
Chris Rebert
34fe668af2 Merge pull request #18472 from twbs/x-y-vars
Rename 2 navbar variables to comply with updated naming convention
2015-12-12 00:32:28 -08:00
Patrick H. Lauke
3cfbeda08d remove generated content value for progress
as it's currently not displayed, and (in my opinion) would look fugly if
it did appear...
2015-12-11 10:57:45 +00:00
Patrick H. Lauke
97461a51a2 progress bar for IE10+/Edge (radius, use ::-ms-fill, add variant mixins, striped support) 2015-12-11 08:58:11 +00:00
Mark Otto
5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
Chris Rebert
c1c1b3885d Remove useless .col-*-offset-12 and .col-xs-offset-0 classes
Fixes #18036

[skip sauce]
[skip validator]
2015-12-08 01:50:42 -08:00
Chris Rebert
1861b05b5f Rename 2 navbar variables to comply with updated naming convention
$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]
2015-12-08 01:30:23 -08:00
Chris Rebert
0330d4acc2 Introduce $btn-block-spacing-y variable
[skip sauce]
2015-12-08 01:14:09 -08:00
Chris Rebert
6798485323 Introduce $card-deck-margin variable
[skip sauce]
[skip validator]
2015-12-08 01:13:37 -08:00
Chris Rebert
de9ad37c5d Introduce $nav-item-margin variable
[skip sauce]
2015-12-08 01:12:57 -08:00
Chris Rebert
5871be0ce6 Refactor _utilities-spacing.scss; fixes #18129 2015-12-08 01:08:03 -08:00
Chris Rebert
8d4f5c1c12 Make SCSS Lint happy
[skip sauce]
[skip validator]
2015-12-08 01:06:52 -08:00
Mark Otto
35389f46df order 2015-12-08 01:06:23 -08:00
Mark Otto
ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
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