rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-07 04:54:24 +01:00
Code Issues Actions Packages Releases Activity

clarify usage of base font-size so we know what's up

Browse Source
This commit is contained in:
Mark Otto 2017-01-03 13:51:06 -08:00 committed by Mark Otto
parent 57d3a25fec
commit 0ffd369afd
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_close.scss
View File

@ -1,6 +1,6 @@
.close { .close {
float: right; float: right;
font-size: ($font-size-base * 1.5); font-size: $close-font-size;
font-weight: $close-font-weight; font-weight: $close-font-weight;
line-height: 1; line-height: 1;
color: $close-color; color: $close-color;

2
scss/_dropdown.scss
View File

@ -44,7 +44,7 @@
min-width: $dropdown-min-width; min-width: $dropdown-min-width;
padding: $dropdown-padding-y 0; padding: $dropdown-padding-y 0;
margin: $dropdown-margin-top 0 0; // override default ul margin: $dropdown-margin-top 0 0; // override default ul
font-size: $font-size-base; font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues
color: $body-color; color: $body-color;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
list-style: none; list-style: none;

2
scss/_input-group.scss
View File

@ -69,7 +69,7 @@
.input-group-addon { .input-group-addon {
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; // Match inputs
font-weight: $font-weight-normal; font-weight: $font-weight-normal;
line-height: $input-line-height; line-height: $input-line-height;
color: $input-color; color: $input-color;

2
scss/_popover.scss
View File

@ -130,7 +130,7 @@
// Offset the popover to account for the popover arrow // Offset the popover to account for the popover arrow
.popover-title { .popover-title {
padding: $popover-title-padding-y $popover-title-padding-x; padding: $popover-title-padding-y $popover-title-padding-x;
margin: 0; // reset heading margin margin-bottom: 0; // Reset the default from Reboot
font-size: $font-size-base; font-size: $font-size-base;
background-color: $popover-title-bg; background-color: $popover-title-bg;
border-bottom: $popover-border-width solid darken($popover-title-bg, 5%); border-bottom: $popover-border-width solid darken($popover-title-bg, 5%);

1
scss/_variables.scss
View File

@ -938,6 +938,7 @@ $carousel-transition: transform .6s ease-in-out !default;
// Close // Close
$close-font-size: $font-size-base * 1.5 !default;
$close-font-weight: $font-weight-bold !default; $close-font-weight: $font-weight-bold !default;
$close-color: $black !default; $close-color: $black !default;
$close-text-shadow: 0 1px 0 $white !default; $close-text-shadow: 0 1px 0 $white !default;