rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-11 03:52:27 +01:00
Code Issues Actions Packages Releases Activity
21,355 Commits 108 Branches 89 Tags
Commit Graph

2715 Commits

Author SHA1 Message Date
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
Vicary Archangel
54fdb45fa5 Alternative fix to double border 2015-12-12 02:22:48 +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
sergej2705
7ad62ec9cd Added !important to hover 
cause hover isn't working since bg-color is !important
 2015-12-10 08:51:09 +01:00
Vicary Archangel
c0f931d050 Multiple input-group-addon support 
1. Invert `:first-child` into `:not(:last-child)` and vice versa
2. Remove double border at the left of `.form-control`
3. Shifts negative margins of `.btn` and `.btn-group` to retain
rightmost border when using at the left of `.form-control`.
 2015-12-09 16:40:32 +08:00
Mark Otto
5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
Alexandr Kondrashov
c4c9e1959f Fix size of validation feedback icons 2015-12-08 14:54:37 +03: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
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
Alexandr Kondrashov
750d45c9e9 Add an empty line at the end of the file 2015-12-08 03:46:16 +03:00
Alexandr Kondrashov
d4e9dad3de SVG: base64 > ASCII85 (fix merge) 2015-12-08 03:27:53 +03:00
Alexandr Kondrashov
568073feb9 SVG: base64 > ASCII85 2015-12-08 02:48:05 +03:00
Alexandr Kondrashov
5f316e6dc3 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1 2015-12-08 02:18:32 +03: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 26da610bd03e7efe9255b2b88f14449972f7d616
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