root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
19,163 Commits 125 Branches 94 Tags 673 MiB
Commit Graph

19163 Commits

Author SHA1 Message Date
Mark Otto c5170db844 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2017-06-16 21:28:29 -07:00
Mark Otto 9fe8f94341 hide for now 2017-06-16 21:28:24 -07:00
Patrick Yeo 9f0929013e (#22414) Rename for consistency `$list-group-link-*-*` to `$list-group-action-*-*` 2017-06-16 18:58:21 -07:00
Johann-S 6ed8a735d0 fix some errors in our js 2017-06-16 10:57:13 +02:00
Johann-S 11a5ca8ff3 Add back js-lint when we try to build our js 2017-06-16 10:57:13 +02:00
Mark Otto 54ee882e50 redo intro 2017-06-15 20:30:02 -07:00
Mark Otto 42d614347e fix broken button 2017-06-15 20:28:14 -07:00
Mark Otto 09e3509ff3 render the colors 2017-06-15 11:16:40 -07:00
Mark Otto 2ad2d71f66 add new color vars and maps 2017-06-15 11:16:27 -07:00
Mark Otto c31d524998 add color contrast and map-get functions 2017-06-15 11:15:48 -07:00
Mark Otto 516af79509 prep docs for displaying the colors 2017-06-15 11:15:28 -07:00
Mark Otto ae6440a480 clarify now that custom is gone 2017-06-15 09:32:26 -07:00
Mark Otto be39742d65 full build 2017-06-15 09:12:26 -07:00
Mark Otto 9c0e423008 Rename popover classes 
Part of an update to align the naming schemes across our components.

- Renames .popover-title to .popover-header
- Renames .popover-content to .popover-body

Refs: #22092
 2017-06-15 09:05:30 -07:00
Mark Otto 6c8c0aa4cf Rename .card-block to .card-body to match nomenclature of modals 2017-06-15 09:05:16 -07:00
Johann-S e6303d4500 Fix duplicate ID in our documentation 2017-06-15 11:45:32 +02:00
Mark Otto 8396039b4e docs css build 2017-06-14 21:57:56 -07:00
Mark Otto 846718e1a9 call functions file in docs css 2017-06-14 21:25:27 -07:00
Mark Otto 10ddcc9a7d build 2017-06-14 21:06:17 -07:00
Mark Otto e62b121226 Merge branch 'v4-dev' into rip-custom 2017-06-14 20:59:02 -07:00
Mark Otto ac96ecbec5 rearrange, add comments 2017-06-14 20:55:00 -07:00
Mark Otto 5da5a38f0d Move scss functions from top of variables to separate file, then import it into other build files 2017-06-14 20:55:00 -07:00
Mark Otto 5818374fdf Merge branch 'v4-dev' into rip-custom 2017-06-14 20:45:31 -07:00
Mark Otto 2e798301ca build 2017-06-14 20:44:32 -07:00
Mark Otto d7302c221a Merge branch 'form-tweaks' of https://github.com/twbs/bootstrap into form-tweaks 2017-06-14 20:31:43 -07:00
Mark Otto c2b68104b6 mention updates in migration doc 2017-06-14 20:31:17 -07:00
Patrick H. Lauke 658fbd5c96 Add note to migration guide 2017-06-14 19:52:37 -07:00
Patrick H. Lauke ff5c75510d Rename .form-control-static to .form-control-readonly-plain 2017-06-14 19:51:50 -07:00
Mark Otto 22bd955434 Merge branch 'v4-dev' into form-tweaks 2017-06-14 19:13:44 -07:00
Johann-S 8f431fc5b8 Update Popper.js 1.10.1 2017-06-14 21:13:42 +02:00
Johann-S f0124769c9 Collapse supports multi-target thanks to @vanduynslagerp (#22713) 2017-06-14 13:21:49 +02:00
Johann-S ddf0dbbd29 Use localhost because Win Edge block loopback access 2017-06-14 11:18:12 +02:00
Johann-S 4a2b183e48 Fix unit tests with no assertion 2017-06-14 11:18:12 +02:00
Johann-S 1ec68d748b Upgrade QUnit to 2.3.3 2017-06-14 11:18:12 +02:00
Mark Otto aa8c456a16 Remove the confusing _custom.scss file 2017-06-13 22:45:16 -07:00
Mark Otto 3fb1bf7a20 copy tweaks 2017-06-13 22:13:05 -07:00
Mark Otto d16ece5b2a Merge branch 'form-tweaks' of https://github.com/twbs/bootstrap into form-tweaks 2017-06-13 22:12:04 -07:00
Mark Otto 2259501418 tighten up sidebar 2017-06-13 22:11:52 -07:00
Mark Otto dc71bee83e rearrange, new examples, new docs 2017-06-13 22:11:44 -07:00
Mark Otto 7e5085b407 move from .gutters-sm to .form-row to be super explicit about intended use case 2017-06-13 22:11:29 -07:00
Mark Otto 21b874d19d Merge branch 'v4-dev' into form-tweaks 2017-06-13 20:15:42 -07:00
Patrick Yeo d7867377d9 (Fixes #22414) Rename for consistency `$custom-checkbox-radius`, `$custom-checkbox-checked-icon`, `$custom-checkbox-indeterminate-indicator-color`, `$custom-checkbox-indeterminate-icon`, `$custom-radio-radius`, `$custom-radio-checked-icon`, `$custom-select-sm-font-size`, to `$custom-checkbox-border-radius`, `$custom-checkbox-icon-checked`, `$custom-checkbox-indicator-indeterminate-color`, `$custom-checkbox-icon-indeterminate`, `$custom-radio-border-radius`, `$custom-radio-icon-checked`, `$custom-select-font-size-sm` respectively 2017-06-13 19:22:49 -07:00
Patrick Yeo a362d62d31 Rename `$font-size-h*` to `$h*-font-size` for consistency (#22414) 2017-06-13 08:46:29 -07:00
Patrick Yeo c349f59174 Rename for consistency `$table-sm-cell-padding`, `$table-bg-accent`, `$table-bg-hover`, `$table-bg-active`, `$table-inverse-bg-accent`, `$table-inverse-bg-hover` to `$table-cell-padding-sm`, `$table-accent-bg`, `$table-hover-bg`, `$table-active-bg`, `$table-inverse-accent-bg`, `$table-inverse-hover-bg`, respectively (#22414) 2017-06-13 08:46:15 -07:00
Patrick Yeo 4cc21bbf74 (#22414) Rename for consistency `$input-bg-disabled`, `$input-bg-focus`, `$input-border-color-focus`, `$input-box-shadow-focus`, `$input-color-focus`, `$input-color-placeholder` to `$input-disabled-bg`, `$input-focus-bg`, `$input-focus-border-color`, `$input-focus-box-shadow`, `$input-focus-color`, `$input-placeholder-color`, respectively 2017-06-13 08:45:50 -07:00
Patrick Yeo 2317b7fc96 (#22414) Rename for consistency `$custom-control-disabled-indicator-bg`, `$custom-control-disabled-description-color`, `$custom-control-checked-indicator-color`, `$custom-control-checked-indicator-bg`, `$custom-control-checked-indicator-box-shadow`, `$custom-control-focus-indicator-box-shadow`, `$custom-control-active-indicator-color`, `$custom-control-active-indicator-bg`, `$custom-control-active-indicator-box-shadow` to `$custom-control-indicator-disabled-bg`, `$custom-control-description-disabled-color`, `$custom-control-indicator-checked-color`, `$custom-control-indicator-checked-bg`, `$custom-control-indicator-checked-box-shadow`, `$custom-control-indicator-focus-box-shadow`, `$custom-control-indicator-active-color`, `$custom-control-indicator-active-bg`, `$custom-control-indicator-active-box-shadow`, respectively 2017-06-13 08:45:36 -07:00
Patrick Yeo 3ecb8b661b (#22414) Renamed for consistency `$nav-disabled-link-color`, `$nav-tabs-active-link-color`, `$nav-tabs-active-link-bg`, `$nav-tabs-active-link-border-color`, `$nav-pills-active-link-color`, `$nav-pills-active-link-bg` to `$nav-link-disabled-color`, `$nav-tabs-link-active-color`, `$nav-tabs-link-active-bg`, `$nav-tabs-link-active-border-color`, `$nav-pills-link-active-color`, `$nav-pills-link-active-bg`, respectively 2017-06-13 08:45:21 -07:00
Patrick Yeo 5e651615a3 (#22414) Renamed for consistency `$modal-dialog-sm-up-margin-y`, `$modal-content-xs-box-shadow`, `$modal-content-sm-up-box-shadow`, to `$modal-dialog-margin-y-sm-up`, `$modal-content-box-shadow-xs`, `$modal-content-box-shadow-sm-up`, respectively 2017-06-13 08:45:11 -07:00
Mark Otto 441f114681 Update _variables.scss 2017-06-13 08:44:55 -07:00
Mark Otto c5d4430367 Mention variable naming scheme to help with #22414 2017-06-13 08:44:55 -07:00