Skip to content
GitLab
Commit 2eaef44e authored by Mark Otto's avatar Mark Otto Committed by GitHub
Browse files

Merge pull request #20951 from sbaechler/font-weights 

Use a variable for the default font weights. Fixes #20741
parents 182a642b 8402d232
12 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!26437merge,!22391V4 dev,!22547Finished a new translation for bootstrap,!22143Fix selectable disabled toggle radio buttons,!22598test,!21067dfsa,!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!17021v4
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 14 deletions
+17 -14
scss/_buttons.scss
+ 1
- 1
View file @ 2eaef44e
...@@ -105,7 +105,7 @@ fieldset[disabled] a.btn { ...@@ -105,7 +105,7 @@ fieldset[disabled] a.btn {
// Make a button look and behave like a link // Make a button look and behave like a link
.btn-link { .btn-link {
font-weight: normal; font-weight: $font-weight-normal;
color: $link-color; color: $link-color;
border-radius: 0; border-radius: 0;
......
scss/_dropdown.scss
+ 1
- 1
View file @ 2eaef44e
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
width: 100%; // For `<button>`s width: 100%; // For `<button>`s
padding: 3px $dropdown-item-padding-x; padding: 3px $dropdown-item-padding-x;
clear: both; clear: both;
font-weight: normal; font-weight: $font-weight-normal;
color: $dropdown-link-color; color: $dropdown-link-color;
text-align: inherit; // For `<button>`s text-align: inherit; // For `<button>`s
white-space: nowrap; // prevent links from randomly breaking onto new lines white-space: nowrap; // prevent links from randomly breaking onto new lines
......
scss/_input-group.scss
+ 1
- 1
View file @ 2eaef44e
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
padding: $input-padding-y $input-padding-x; padding: $input-padding-y $input-padding-x;
margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom
font-size: $font-size-base; font-size: $font-size-base;
font-weight: normal; font-weight: $font-weight-normal;
line-height: $input-line-height; line-height: $input-line-height;
color: $input-color; color: $input-color;
text-align: center; text-align: center;
......
scss/_normalize.scss
+ 1
- 1
View file @ 2eaef44e
...@@ -270,7 +270,7 @@ textarea { ...@@ -270,7 +270,7 @@ textarea {
// //
optgroup { optgroup {
font-weight: bold; font-weight: $font-weight-bold;
} }
// //
......
scss/_type.scss
+ 1
- 1
View file @ 2eaef44e
...@@ -61,7 +61,7 @@ hr { ...@@ -61,7 +61,7 @@ hr {
small, small,
.small { .small {
font-size: $small-font-size; font-size: $small-font-size;
font-weight: normal; font-weight: $font-weight-normal;
} }
mark, mark,
......
scss/_variables.scss
+ 9
- 6
View file @ 2eaef44e
...@@ -193,6 +193,9 @@ $font-size-lg: 1.25rem !default; ...@@ -193,6 +193,9 @@ $font-size-lg: 1.25rem !default;
$font-size-sm: .875rem !default; $font-size-sm: .875rem !default;
$font-size-xs: .75rem !default; $font-size-xs: .75rem !default;
$font-weight-normal: normal !default;
$font-weight-bold: bold !default;
$line-height-base: 1.5 !default; $line-height-base: 1.5 !default;
$font-size-h1: 2.5rem !default; $font-size-h1: 2.5rem !default;
...@@ -237,10 +240,10 @@ $hr-border-width: $border-width !default; ...@@ -237,10 +240,10 @@ $hr-border-width: $border-width !default;
$mark-padding: .2em !default; $mark-padding: .2em !default;
$dt-font-weight: bold !default; $dt-font-weight: $font-weight-bold !default;
$kbd-box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25) !default; $kbd-box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25) !default;
$nested-kbd-font-weight: bold !default; $nested-kbd-font-weight: $font-weight-bold !default;
$list-inline-padding: 5px !default; $list-inline-padding: 5px !default;
...@@ -286,7 +289,7 @@ $table-border-color: $gray-lighter !default; ...@@ -286,7 +289,7 @@ $table-border-color: $gray-lighter !default;
$btn-padding-x: 1rem !default; $btn-padding-x: 1rem !default;
$btn-padding-y: .5rem !default; $btn-padding-y: .5rem !default;
$btn-line-height: 1.25 !default; $btn-line-height: 1.25 !default;
$btn-font-weight: normal !default; $btn-font-weight: $font-weight-normal !default;
$btn-box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075) !default; $btn-box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075) !default;
$btn-active-box-shadow: inset 0 3px 5px rgba(0,0,0,.125) !default; $btn-active-box-shadow: inset 0 3px 5px rgba(0,0,0,.125) !default;
...@@ -684,7 +687,7 @@ $tag-danger-bg: $brand-danger !default; ...@@ -684,7 +687,7 @@ $tag-danger-bg: $brand-danger !default;
$tag-color: #fff !default; $tag-color: #fff !default;
$tag-link-hover-color: #fff !default; $tag-link-hover-color: #fff !default;
$tag-font-size: 75% !default; $tag-font-size: 75% !default;
$tag-font-weight: bold !default; $tag-font-weight: $font-weight-bold !default;
$tag-padding-x: .4em !default; $tag-padding-x: .4em !default;
$tag-padding-y: .25em !default; $tag-padding-y: .25em !default;
...@@ -729,7 +732,7 @@ $modal-sm: 300px !default; ...@@ -729,7 +732,7 @@ $modal-sm: 300px !default;
$alert-padding-x: 1.25rem !default; $alert-padding-x: 1.25rem !default;
$alert-padding-y: .75rem !default; $alert-padding-y: .75rem !default;
$alert-border-radius: $border-radius !default; $alert-border-radius: $border-radius !default;
$alert-link-font-weight: bold !default; $alert-link-font-weight: $font-weight-bold !default;
$alert-border-width: $border-width !default; $alert-border-width: $border-width !default;
$alert-success-bg: $state-success-bg !default; $alert-success-bg: $state-success-bg !default;
...@@ -849,7 +852,7 @@ $carousel-icon-width: 20px !default; ...@@ -849,7 +852,7 @@ $carousel-icon-width: 20px !default;
// Close // Close
$close-font-weight: bold !default; $close-font-weight: $font-weight-bold !default;
$close-color: #000 !default; $close-color: #000 !default;
$close-text-shadow: 0 1px 0 #fff !default; $close-text-shadow: 0 1px 0 #fff !default;
......
scss/mixins/_reset-text.scss
+ 1
- 1
View file @ 2eaef44e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
font-family: $font-family-base; font-family: $font-family-base;
// We deliberately do NOT reset font-size or word-wrap. // We deliberately do NOT reset font-size or word-wrap.
font-style: normal; font-style: normal;
font-weight: normal; font-weight: $font-weight-normal;
letter-spacing: normal; letter-spacing: normal;
line-break: auto; line-break: auto;
line-height: $line-height-base; line-height: $line-height-base;
......
scss/utilities/_text.scss
+ 2
- 2
View file @ 2eaef44e
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
// Weight and italics // Weight and italics
.font-weight-normal { font-weight: normal; } .font-weight-normal { font-weight: $font-weight-normal; }
.font-weight-bold { font-weight: bold; } .font-weight-bold { font-weight: $font-weight-bold; }
.font-italic { font-style: italic; } .font-italic { font-style: italic; }
// Contextual colors // Contextual colors
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment