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

233 Commits

Author SHA1 Message Date
Mark Otto
fffaaed0fd Merge branch 'v4-dev' into v4-grid-redux 2016-02-06 15:09:32 -08:00
Mark Otto
9c69f6f5c5 Merge branch 'v4-dev' into v4-font-stack 2016-02-06 15:01:44 -08:00
Mark Otto
cd3af1fa1a Update to drop Open Sans, add Fira and Droid Sans 2016-02-06 13:23:00 -08:00
Mark Otto
414ae3aa1a use px in grid col padding since we're using px everywhere else for them 2016-02-06 13:01:52 -08:00
Mark Otto
d5e474b4ab linter 2016-02-06 12:29:53 -08:00
Mark Otto
73e5e89e0e Switch to native font stack 2016-02-05 23:01:59 -08:00
Mark Otto
b75116c679 Merge branch 'v4-card-fuckery' into v4-dev 2016-02-03 20:53:30 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Mark Otto
e672c15b6d Merge pull request #19002 from twbs/blockquote-border-width
Add $blockquote-border-width variable
2016-01-23 20:42:23 -08:00
Chris Rebert
8b67d4c762 Make translation of custom file input text easier; fixes #18922
[skip sauce]
2016-01-17 20:53:11 -08:00
Mark Otto
955e0405ea fuck around with card borders and more 2016-01-17 18:55:24 -08:00
Mark Otto
776337924e Merge pull request #18920 from twbs/v4-custom-forms-vars
v4: Custom forms variables
2016-01-17 17:54:45 -08:00
Mark Otto
3a2f0456bf Merge pull request #18883 from twbs/zindex-dropdown-backdrop
Use proper variable for .dropdown-backdrop's z-index
2016-01-17 15:25:58 -08:00
Mark Otto
5c12d5e469 add custom file vars, fix up custom select var 2016-01-17 15:21:16 -08:00
Mark Otto
6b318ef176 Hella vars for custom checkboxes and radios and selects 2016-01-16 22:29:51 -08:00
Chris Rebert
802c1cb5fc Extract variables for .modal-content box-shadow
[skip sauce]
[skip validator]
2016-01-16 20:25:00 -08:00
Chris Rebert
bbd449994a Extract $thumbnail-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
9b2d9f6e04 Extract $popover-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
58f7e602ae Extract $dropdown-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
a5b41e7254 Extract $btn-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
6293dd41cf Extract $kbd-box-shadow variable 2016-01-16 20:23:37 -08:00
Chris Rebert
7be17b4a35 Merge pull request #18821 from twbs/popover-vars
Add variables for padding of popover title & content
2016-01-16 14:08:14 -08:00
Chris Rebert
dda263d9ac Merge pull request #18820 from twbs/media-obj-vars
Add variables for media object margins and padding
2016-01-16 14:07:49 -08:00
Chris Rebert
a22c696485 Extract $blockquote-border-width variable
[skip sauce]
2016-01-14 22:27:08 -08:00
Chris Rebert
27a7fff0fb Use proper variable for .dropdown-backdrop's z-index 2016-01-13 16:21:52 -08:00
Chris Rebert
a4745dd7a1 Use proper units when adding/subtracting lengths
[skip sauce]
[skip validator]
2016-01-13 16:16:43 -08:00
Chris Rebert
ed3551415c Extract $btn-active-box-shadow variable & refactor accordingly
[skip sauce]
[skip validator]
2016-01-09 15:14:36 -08:00
Chris Rebert
46c9f4b143 Add $progress-box-shadow variable
[skip sauce]
[skip validator]
2016-01-09 14:59:08 -08:00
Chris Rebert
c919746a4f Add variables for padding of popover title & content
[skip sauce]
[skip validator]
2016-01-09 14:46:04 -08:00
Chris Rebert
4a667f5bb7 Add variables for media object margins and padding
[skip sauce]
[skip validator]
2016-01-09 14:34:59 -08:00
Chris Rebert
f646ed7920 Merge pull request #18466 from twbs/tooltip-padding-vars
Introduce $tooltip-padding & $tooltip-padding-x vars
2016-01-09 14:28:12 -08:00
Mark Otto
cf7795da93 Add liberation Mono to the font stack for the Linux peeps
Fixes #18609

[skip sauce]
[skip validator]
2016-01-08 23:31:30 -08:00
Mark Otto
643bd8eaeb Merge pull request #18787 from twbs/btn-vars
Add variables for spacing of .btn-toolbar and split-button dropdown toggles
2016-01-07 00:47:40 -08:00
Mark Otto
7fdd521459 more variables spacing 2016-01-07 00:21:58 -08:00
Mark Otto
de027e637f pointless comments 2016-01-07 00:20:36 -08:00
Mark Otto
b39b8b631b more variables spacing 2016-01-07 00:20:25 -08:00
Mark Otto
ea9967c535 spacing 2016-01-07 00:19:48 -08:00
Chris Rebert
fb71efaeb2 Add variables for spacing of .btn-toolbar and split-button dropdown toggles
[skip sauce]
2016-01-06 16:42:21 -08:00
Mark Otto
fac0c31a27 New $nav-pills-active-link-* variables
- Renames old and unused $nav-pills-active-link-hover-* for
$nav-pills-active-link-* ones
- Puts those vars to use in place of defaults $component-* vars on nav
pills
2016-01-06 15:50:08 -08:00
Mark Otto
774a2ed37e Spacing y'all 2016-01-06 15:47:28 -08:00
Mark Otto
7da2e12852 Regroup nav variables 2016-01-06 15:46:48 -08:00
Mark Otto
93dda63b39 Revamp tabbed nav border variables
- Add new $nav-tabs-border-width for the bottom border on the .nav-tabs
parent class
- Use that new variable for the negative margin on nav-items within it
for consistent customization
- Drop the $nav-tabs-link-border-width for the new variable so it’s all
tied together
2016-01-06 15:45:26 -08:00
Mark Otto
7668a66bbe Add $nav-disabled-link-hover-bg variable 2016-01-06 15:42:32 -08:00
Mark Otto
030ab626a5 Add $nav-item-inline-spacer variable
So folks can customize the distance between nav links in inline navs.
2016-01-06 15:41:35 -08:00
Mark Otto
fe40de1816 follow up to #18782: remove pager vars 2016-01-06 15:00:28 -08:00
Chris Rebert
c3d1b7f256 Introduce $tooltip-padding-{x,y} & $tooltip-margin vars
[skip sauce]
2016-01-06 14:56:16 -08:00
Mark Otto
11df78ec74 Revamp custom form styles
- Less nesting with more specific classes
- New class names for most elements to avoid unnecessary and potentially confusing shorthand
- Require new class and markup for the description (though it's only necessary for disable states, it's now part of the entire component's markup for all states just in case)
- Change up colors and variables for regular and disabled states
2016-01-05 23:25:42 -08:00
markau
871a003ca2 Fixes #17918: Add styles for disabled custom checkboxes and radios 2016-01-05 00:47:32 -08:00
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
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
c6a276dd74 Set $progress-bg to color we are actually using 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
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
Alexandr Kondrashov
c4c9e1959f Fix size of validation feedback icons 2015-12-08 14:54:37 +03: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
Mark Otto
ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
Mark Otto
60ad55b8f7 fixes #17776 2015-12-08 00:16:46 -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
Mark Otto
49674a8eba fixes #18425 by using vars for 1px borders 2015-12-06 16:45:40 -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
Chris Rebert
e8dcb2f917 Add $list-inline-padding variable
[skip sauce]
[skip validator]
2015-12-04 01:56:49 -08:00
Chris Rebert
3f2943424f Remove reference to defunct Customizer from v3
[ci skip]
2015-11-29 20:54:45 -08:00
Chris Rebert
ca68331b8b Add $list-group-border-width; refs #18150
[skip sauce]
2015-11-15 12:46:46 -08:00
Chris Rebert
e54a9d7e8d $list-group-border => $list-group-border-color
[skip sauce]
2015-11-15 12:43:43 -08:00
Chris Rebert
6a66d2dd92 Add $table-border-width; refs #18150 2015-11-14 23:24:48 -08:00
Chris Rebert
c174d7ab4e Add $popover-border-width; refs #18150 2015-11-14 23:11:20 -08:00
Chris Rebert
e3eaeb96e8 Add $thumbnail-border-width; refs #18150 2015-11-14 22:56:20 -08:00
Chris Rebert
13ac07a862 $thumbnail-border => $thumbnail-border-color 2015-11-14 22:54:53 -08:00
Chris Rebert
203264d7af Add $pagination-border-width; refs #18150 2015-11-14 22:53:18 -08:00
Chris Rebert
5f45f652f7 Rename $pagination-border => $pagination-border-color for clarity 2015-11-14 22:51:18 -08:00
Chris Rebert
687610e6f1 Add $pager-border-width; refs #18150 2015-11-14 22:50:40 -08:00
Chris Rebert
a4594bd445 $pager-border => $pager-border-color 2015-11-14 22:48:18 -08:00
Chris Rebert
a420b66210 Add $nav-tabs-link-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
1f29c306a6 Add $input-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
2d02910e01 $input-border => $input-border-color 2015-11-14 22:40:43 -08:00
Chris Rebert
2ea8950b26 Add $dropdown-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
76f7056321 $dropdown-border => $dropdown-border-color 2015-11-14 22:28:45 -08:00
Mark Otto
cbb5e25482 Merge pull request #17939 from chrisbell08/#17895_alert_border_width
#17895 Added $alert-border-width that defaults to $border-width
2015-11-12 23:50:51 -08:00
Mark Otto
d917f474f4 Merge pull request #17708 from biokillos/feature/add-variable-for-card-link-hover-state
Add variable for card-link hover state
2015-11-12 23:29:48 -08:00
Mark Otto
6a526d4890 Merge pull request #17596 from neilhem/remove-fallback-colors
remove not used popover fallback variables
2015-11-12 23:23:53 -08:00
Mark Otto
9f66e7309c fix broke shit, ugh my bad 2015-11-12 23:15:31 -08:00
Mark Otto
6fd1c80d37 Merge pull request #17153 from kkirsche/patch-17
v4 — Change .has-error to .has-danger for uniformity.
2015-11-12 22:20:07 -08:00
Mark Otto
f29eb4d213 Merge pull request #17241 from tagliala/font-size-sm-fix
v4: Change the default value of $font-size-sm to .875rem
2015-11-12 22:07:06 -08:00
Chris Bell
be1bb9ec3e #17895 Added $alert-border-width that defaults to $border-width 2015-10-15 15:57:15 +01:00
Chris Rebert
2feaf0a27c Make $card-border-radius default to $border-radius
They already share the same value (`.25rem`)
Refs #17597
[skip sauce]
2015-10-12 16:32:15 -07:00
Chris Rebert
a180a3362a Move border-radius mixin from scss/_mixins.scss to scss/mixins/_border-radius.scss
Reunites the family.
Closes #17791
2015-10-08 08:56:13 -04:00
Gleb Mazovetskiy
eabed0edf8 Change grid and container sizes to px
Changes grid and container sizes to `px`, as the
viewport pixel size does not depend on the font size.

The actual em values were inconsistent with the docs,
while the docs were not the same as the comments:

* `sm` breakpoint was 34em (544px) not 480px.
* `lg` container max-width was 60rem (960px), less gutter than `md`.
  Changed to 940px, same as Bootstrap 3.
* `xl` container max-width was 72.25rem which is 1140px not 1156px.
  Changed to 1140px matching the comment but not the docs.

Addresses #17070 and #17388.
2015-09-27 14:39:17 +01:00
Andrey
55994f3274 Add variable for card-link hover state 2015-09-26 14:57:13 +02:00
Aleksey Khudyakov
7ad9d233f2 Add variable for card background color 2015-09-23 09:40:34 +10:00