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

828 Commits

Author SHA1 Message Date
Chris Rebert
845ad69f93 Merge pull request #19250 from twbs/list-group-item-padding
Add $list-group-item-padding-{x,y} variables
2016-02-16 23:08:41 -08:00
Chris Rebert
aa7c5f93ce Add $card-columns-sm-up-column-gap variable
[skip sauce]
[skip validator]
2016-02-16 23:00:58 -08:00
Chris Rebert
1f02ab21ee Add $list-group-item-padding-{x,y} variables
[skip sauce]
[skip validator]
2016-02-16 22:57:10 -08:00
Chris Rebert
67ecc8ca98 Extract $code-padding-{x,y} variables
[skip sauce]
[skip validator]
2016-02-16 22:45:26 -08:00
Chris Rebert
881e51d4a7 Merge pull request #19246 from twbs/code-font-size
Extract $code-font-size variable
2016-02-16 22:41:55 -08:00
Chris Rebert
9fdae5f391 Extract $code-font-size variable
[skip sauce]
[skip validator]
2016-02-16 22:37:00 -08:00
Chris Rebert
3a4dbd9b3a Add $figure-caption-font-size variable
[skip sauce]
[skip validator]
2016-02-16 22:31:40 -08:00
Chris Rebert
cbdb043ee3 Extract $carousel-caption{-sm-up}-width variables
[skip sauce]
[skip validator]
2016-02-16 21:45:16 -08:00
Chris Rebert
1046e27dd3 Extract $dropdown-item-padding-x variable
[skip sauce]
[skip validator]
2016-02-16 21:16:55 -08:00
Chris Rebert
dcb29fc814 Extract $dropdown-margin-top variable
[skip sauce]
[skip validator]
2016-02-16 21:13:15 -08:00
Chris Rebert
104ace17cb Extract $carousel-indicator{-active}-size variables
[skip sauce]
[skip validator]
2016-02-16 21:00:10 -08:00
Chris Rebert
9f85c6e1d1 Extract $carousel-control-sm-up-size variable
[skip sauce]
[skip validator]
2016-02-16 20:50:48 -08:00
Chris Rebert
3003f530c9 Extract $carousel-icon-width variable
[skip sauce]
[skip validator]
2016-02-16 20:46:52 -08:00
Mark Otto
d6207d852a Merge branch 'fix-19094' of https://github.com/ameya-pandilwar/bootstrap into ameya-pandilwar-fix-19094 2016-02-16 20:28:51 -08:00
Mark Otto
e194db05c8 Merge branch 'v4-dev' into mark-padding 2016-02-16 20:25:40 -08:00
Mark Otto
853921df32 Merge pull request #19210 from twbs/small-font-size
Add $small-font-size variable
2016-02-16 20:23:54 -08:00
Mark Otto
6636e979d9 Merge pull request #19211 from twbs/mark-bg-var
Add $mark-bg so <mark>'s background-color can be customized independently of $state-warning-bg
2016-02-16 20:23:41 -08:00
Mark Otto
57a310c3d3 Merge pull request #19214 from twbs/label-font-size
Add $label-font-size variable in the name of not hardcoding values
2016-02-16 20:23:22 -08:00
Mark Otto
ca77f52875 Merge pull request #19215 from twbs/label-pill-border-radius
Add $label-pill-border-radius variable
2016-02-16 20:23:03 -08:00
Mark Otto
60f83096f1 Merge pull request #19218 from twbs/breakpoint-vars-are-minimums
Clarify that $grid-breakpoints are minimum widths for each breakpoint
2016-02-16 20:22:43 -08:00
Chris Rebert
ea1fa05285 Change comment to clarify that $grid-breakpoints are minimum widths for each breakpoint
(as opposed to maximums)

[ci skip]
2016-02-16 01:24:34 -08:00
Chris Rebert
cdc0a7a748 Introduce $mark-bg variable so that <mark>'s background-color can be customized independently of $state-warning-bg
[skip sauce]
[skip validator]
2016-02-16 00:44:55 -08:00
Chris Rebert
4c6946b3a9 Extract $dropdown-min-width variable
[skip sauce]
[skip validator]
2016-02-16 00:42:10 -08:00
Chris Rebert
08d23959ac Add $label-pill-border-radius variable
[skip sauce]
[skip validator]
2016-02-16 00:37:45 -08:00
Chris Rebert
2c034cf542 Add $label-font-size variable in the name of not hardcoding values
[skip sauce]
[skip validator]
2016-02-16 00:27:53 -08:00
Chris Rebert
c80cf45960 Extract $label-pill-padding-x variable
[skip sauce]
[skip validator]
2016-02-16 00:25:18 -08:00
Chris Rebert
1d634a07ce Extract $label-padding-{x,y} variables
[skip sauce]
[skip validator]
2016-02-16 00:18:30 -08:00
Chris Rebert
4278eb57ab Add $small-font-size variable
[skip sauce]
[skip validator]
2016-02-15 23:59:53 -08:00
Chris Rebert
7441beba67 Add $mark-padding variable
[skip sauce]
[skip validator]
2016-02-15 23:55:20 -08:00
Chris Rebert
ef89acb974 Extract $modal-content-border-width variable
[skip sauce]
[skip validator]
2016-02-15 23:45:28 -08:00
Chris Rebert
ece0775bee Extract $modal-{header,footer}-border-width variables
[skip sauce]
[skip validator]
2016-02-15 23:35:57 -08:00
Chris Rebert
e1be284d0c Extract $modal-dialog-sm-up-margin-y variable
[skip sauce]
[skip validator]
2016-02-15 23:24:41 -08:00
Chris Rebert
b35aa23453 Extract new $modal-dialog-margin variable
[skip sauce]
[skip validator]
2016-02-15 23:10:38 -08:00
Ameya Pandilwar
4ed5fa77ff Rename .label class to .tag 2016-02-11 03:54:30 -05:00
Chris Rebert
a1bf344c4f Merge pull request #18925 from twbs/fixes-18922
Make translation of custom file input text easier
2016-02-09 01:38:14 -08:00
Mark Otto
c3e4cbdfb0 Move to a translucent input border with background-clip: padding-box for improved blending across different background-colors 2016-02-08 22:28:11 -08:00
Mark Otto
e455b6b8d2 Merge branch 'v4-dev' into v4-form-sizing 2016-02-07 22:48:26 -08:00
Mark Otto
38c93371c1 updated button/form-control padding and line-height
- Moves from no set line-height (inherited of 1.5) to declared 1.25 for
all inputs and buttons (regardless of size modifier).

- Updates padding to be `.5rem` instead of `.375rem` so that padding is
more likely to be whole numbers based on the root font-size.

- Whole numbers will be beneficial in avoiding odd fractional pixels
that can lead to misalignment as shown in #18607.

- Large buttons and inputs are now a tad wider, and smaller
buttons/inputs a tad shorter and narrower, too.
2016-02-07 22:46:50 -08:00
Chris Rebert
35617a4b22 Assert that $grid-breakpoints and $container-max-widths are in ascending order; fixes #18549
[skip sauce]
2016-02-07 02:53:37 -08:00
Chris Rebert
ecdfc71d1f Add $enable-print-styles variable for _print.scss; fixes #19101
[skip sauce]
2016-02-06 21:35:19 -08:00
Mark Otto
d7d0e186bd Merge branch 'v4-dev' into v4-split-buttons 2016-02-06 20:33:26 -08:00
Mark Otto
9ca44d29f5 Follow up to #19099: Correct grid gutter value 2016-02-06 20:12:55 -08:00
Mark Otto
11606d391e update to latest from @thekondrashov's jsfiddle 2016-02-06 18:05:07 -08:00
Mark Otto
198e34a096 Merge branch 'patch-1' of https://github.com/thekondrashov/bootstrap into thekondrashov-patch-1 2016-02-06 17:00:57 -08:00
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
f6ad665c26 Switch up some split button stuff
- New vars
- New function for stripping units so we can combine rems and ems in math functions
- Add new classes for sizing and spacing around the split dropdown toggle so that the caret isn't misaligned
2016-01-08 13:23:24 -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
Mark Otto
85f08df3b0 fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width 2015-09-15 21:11:15 -07:00
Rakhat Jabagin
73b056ae50 remove not used popover fallback variables 2015-09-14 14:37:47 +06:00
Alexandr Kondrashov
c9725926b2 Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
	scss/_custom-forms.scss
	scss/_variables.scss
2015-09-11 16:43:00 +03:00
Mark Otto
8f9e50c02d fixes #17385: add var for default link decoration 2015-09-01 21:14:51 -07:00
Mark Otto
29c3eddaeb fixes #17412: reverse display heading classes to match h1-h6 headings 2015-09-01 21:11:53 -07:00
Mark Otto
d119800489 fix #17356 2015-09-01 21:01:12 -07:00
Mark Otto
a748e251fd Merge pull request #17259 from twbs/v4gc
v4: Conditional predefined grid classes
2015-09-01 20:16:22 -07:00
Catalin Zalog
18395219cc Apply !default to SCSS variables
Missed one variable :(
2015-09-01 11:26:01 +03:00
XhmikosR
9420297dc2 SCSS lint fixes.
[ci skip]
2015-08-25 15:38:20 +03:00
Mark Otto
7633d4c603 Make predefined grid classes conditional
- Add explicit -grid-classes variable and set to true by default
- Wrap .row and .col generation in the boolean var
2015-08-23 22:13:58 -07:00
Catalin Zalog
793db36640 Apply !default to SCSS variables
!default to all variables.
2015-08-24 01:44:16 +03:00
Geremia Taglialatela
0376146d71 Change the default value of $font-size-sm to .875rem 2015-08-23 11:35:00 +02:00
Alexandr Kondrashov
353e0a49a9 compress SVGs
Well compressed, but I'm sure it is possible to compress more
2015-08-22 03:50:31 +03:00
Mark Otto
ba6cf4839b Merge pull request #17069 from kkirsche/patch-9
Card variables should be in _variables.scss
2015-08-20 22:02:35 -07:00
Kevin Kirsche
9e8bd818b2 Card variables should be in _variables.scss
Fixes #17061
2015-08-19 17:35:34 -04:00
Chris Bell
333be22824 Update _variables.scss
Fixed spelling mistake. Changed table of "ontents" to "Contents".
2015-08-19 22:06:39 +01:00
Mark Otto
d6b6a20a0d rewrite navbar once more for lower key styles and a new take on modifiers for improved customization 2015-08-18 00:46:29 -07:00
Mark Otto
f1e10c37fd rewrite navbar bits some more 2015-08-17 23:43:59 -07:00
Mark Otto
609c1ac2ff tighten up padding on inputs and buttons, disable fixed heights for now 2015-08-17 23:42:39 -07:00
Mark Otto
f0a8e56f80 tweak heading sizes 2015-08-17 21:13:52 -07:00
Mark Otto
c064eef67b Massive cleanup
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
2015-08-14 22:45:55 -07:00
Mark Otto
1da01e68ba variables cleanup
- new vars for .lead size and weight (previously had none)
- new var for default margin-bottom on h1-h6 elements (previously had none)
- rearranged vars to combine two typography sections into one in variables.scss
- reassigned border-width var to hr-border-width
- made hr-border more specific as hr-border-color
2015-08-13 23:18:32 -07:00
Mark Otto
27fbc77ecb add note about variable structure 2015-08-13 23:13:38 -07:00
Mark Otto
9b1ee31567 nuke the shared padding vars and assign to individual components
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
2015-08-13 23:04:16 -07:00
Mark Otto
6af9412674 move form validation icon vars to variables file 2015-08-12 22:39:46 -07:00
Mark Otto
314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto
786b1682a5 small vars change 2015-08-12 18:22:02 -07:00
Mark Otto
a90f6c7093 reorder variables, rename -color to -color 2015-08-10 23:38:41 -07:00
Mark Otto
67765587d9 no more use for that 2015-08-10 23:30:13 -07:00
Mark Otto
8c173cd4f8 remove unused badge vars 2015-08-10 23:29:54 -07:00
Mark Otto
c871e4c130 clarify comment 2015-08-10 23:29:36 -07:00
Mark Otto
8e0324362e remove unused variable 2015-08-10 23:29:04 -07:00
Mark Otto
e7b1123310 update button borders to match bgs for easier outline button styling 2015-08-09 22:49:21 -07:00
Mark Otto
7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto
7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto
f534cabc7e wider horizontal padding 2015-08-05 23:14:41 -07:00
Mark Otto
d80f26fe49 unaffix sidebar and simplify styles of docs side nav to be more like v3 2015-08-05 00:38:36 -07:00
Mark Otto
0156fc1c9d mathematical! 2015-08-05 00:16:00 -07:00
Mark Otto
4665b9dd6f Add new variable for -box-shadow 2015-07-03 18:35:46 -07:00
Mark Otto
932ac79611 remove -darker 2015-07-03 18:33:31 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
03a5ff6b82 remove commented out var 2015-06-22 22:52:14 -07:00
Mark Otto
057f82f8c3 indentation 2015-06-22 22:52:09 -07:00
Mark Otto
acca337ced Remove var 2015-06-22 19:02:30 -07:00
Mark Otto
75cf69a1ab drop more -base, clean up var spacing 2015-06-22 18:57:56 -07:00
Mark Otto
0ca9b21c34 drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner 2015-06-22 18:53:04 -07:00
Mark Otto
4565281df3 rename -horizontal and -vertical vars to -x and -y for consistency 2015-06-22 16:33:17 -07:00
Mark Otto
ce9c0f0125 tweak small forms, small inputs; trying to equalize their rendered dimensions 2015-06-22 16:30:31 -07:00
Mark Otto
e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto
ddafee6ece disable flex to start 2015-05-22 22:33:45 -07:00
Mark Otto
7db7e59682 spacing 2015-04-29 11:49:41 -07:00
Mark Otto
b849be2edc rename media query var to match /cc @cvrebert 2015-04-29 11:49:25 -07:00
Mark Otto
95771f9658 clean up vars file a smidge 2015-04-29 11:48:58 -07:00
Mark Otto
47dfdc2880 darker secondary button border color 2015-04-29 11:42:38 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Mark Otto
209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -07:00
Mark Otto
250c2200bf no more dl-horizontal offset or page-header vars 2015-04-18 11:53:10 -07:00
Mark Otto
35be16cffa remove legend vars as we no longer use them 2015-04-18 11:39:13 -07:00
Mark Otto
611a127a1e change the type scale a bit again 2015-04-17 16:49:48 -07:00
Mark Otto
7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -07:00
Mark Otto
af9ab7b1a7 tweak the font-sizes for headings 2015-04-17 00:21:57 -07:00
Mark Otto
236a86502e fix spacer vars 2015-04-15 15:30:26 -07:00
Mark Otto
8303b7b8c9 nuke shadows for now 2015-04-14 01:01:15 -07:00
Mark Otto
53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
2015-03-29 00:08:54 -07:00
Mark Otto
7dcd9c5d63 remove all customizer comments from variables file 2015-03-09 14:18:25 +00:00
Mark Otto
517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Chris Rebert
fd13e33aa4 add $use-hover-media-query to control @media (hover:hover) usage 2015-01-22 11:39:57 -08:00
Chris Rebert
f6ef89d6c3 Use expressions for thirds to avoid precision issues 2015-01-21 15:11:25 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Gleb Mazovetskiy
93f51eb0e9 Automate breakpoints
Breakpoints and container widths are now defined as maps.
2014-12-24 22:27:11 +02:00
Gleb Mazovetskiy
e11208cc0b variables: fix fade-in 2014-12-20 16:37:43 +00:00
Mark Otto
1e136a70a2 Clean up some navbar.scss, drop the -float-breakpoint var entirely 2014-12-11 14:47:10 -08:00
Mark Otto
826aeec6e8 Merge pull request #13 from twbs/default-vars
Apply !default to SCSS variables
2014-12-11 12:20:05 -08:00
Chris Rebert
23aa0340df Apply !default to SCSS variables
Per @thomas-mcdonald
2014-12-09 16:24:05 -08:00
Gleb Mazovetskiy
5fefe06c3d Refactor grid-framework followup
* Split up calc-grid-column, generate selectors in make-grid
* Iterate over $grid-breakpoints and (pull, push, offset)
2014-12-07 16:22:39 +00:00
Mark Otto
bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto
c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00