Skip to content

B
bootstrap
Commit ed42fc9b authored by Mark Otto's avatar Mark Otto
Browse files
Options

line-height-base to line-height var

parent 03a5ff6b
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
scss/_badge.scss
View file @ ed42fc9b
......@@ -11,7 +11,7 @@
padding-left: .6em;
font-size: .75em;
font-weight: $badge-font-weight;
line-height: $line-height-base;
line-height: $line-height;
color: $badge-color;
text-align: center;
white-space: nowrap;
......
scss/_buttons.scss
View file @ ed42fc9b
......@@ -17,7 +17,7 @@
cursor: pointer;
user-select: none;
border: $border-width solid transparent;
@include button-size($padding-y, $padding-x, $font-size-base, $line-height-base, $btn-border-radius);
@include button-size($padding-y, $padding-x, $font-size-base, $line-height, $btn-border-radius);
transition: all .2s ease-in-out;
&,
......
scss/_code.scss
View file @ ed42fc9b
......@@ -43,7 +43,7 @@ pre {
margin-top: 0;
margin-bottom: 1rem;
font-size: 90%;
line-height: $line-height-base;
line-height: $line-height;
color: $pre-color;
// Account for some code outputs that place code tags in pre tags
......
scss/_dropdown.scss
View file @ ed42fc9b
......@@ -60,7 +60,7 @@
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: $line-height-base;
line-height: $line-height;
color: $dropdown-link-color;
white-space: nowrap; // prevent links from randomly breaking onto new lines
}
......@@ -141,7 +141,7 @@
display: block;
padding: 3px 20px;
font-size: $font-size-sm;
line-height: $line-height-base;
line-height: $line-height;
color: $dropdown-header-color;
white-space: nowrap; // as with > li > a
}
......
scss/_forms.scss
View file @ ed42fc9b
......@@ -14,7 +14,7 @@
// height: $input-height;
padding: $padding-y $padding-x;
font-size: $font-size-base;
line-height: $line-height-base;
line-height: $line-height;
color: $input-color;
background-color: $input-bg;
// Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
......
scss/_images.scss
View file @ ed42fc9b
......@@ -11,7 +11,7 @@
// Image thumbnails
.img-thumbnail {
padding: $thumbnail-padding;
line-height: $line-height-base;
line-height: $line-height;
background-color: $thumbnail-bg;
border: 1px solid $thumbnail-border;
border-radius: $thumbnail-border-radius;
......
scss/_pagination.scss
View file @ ed42fc9b
......@@ -19,7 +19,7 @@
float: left; // Collapse white-space
padding: $padding-y $padding-x;
margin-left: -1px;
line-height: $line-height-base;
line-height: $line-height;
color: $pagination-color;
text-decoration: none;
background-color: $pagination-bg;
......
scss/_reboot.scss
View file @ ed42fc9b
......@@ -68,7 +68,7 @@ body {
// Make the `body` use the `font-size-root`
font-family: $font-family-base;
font-size: $font-size-base;
line-height: $line-height-base;
line-height: $line-height;
// Go easy on the eyes and use something other than `#000` for text
color: $text-color;
// By default, `<body>` has no `background-color` so we set one as a best practice.
......@@ -290,6 +290,6 @@ input[type="search"] {
output {
display: inline-block;
// font-size: $font-size-base;
// line-height: $line-height-base;
// line-height: $line-height;
// color: $input-color;
}
scss/_tables.scss
View file @ ed42fc9b
......@@ -15,7 +15,7 @@
th,
td {
padding: $table-cell-padding;
line-height: $line-height-base;
line-height: $line-height;
vertical-align: top;
border-top: 1px solid $table-border-color;
}
......
scss/_type.scss
View file @ ed42fc9b
......@@ -144,7 +144,7 @@ mark,
footer {
display: block;
font-size: 80%; // back to default font-size
line-height: $line-height-base;
line-height: $line-height;
color: $blockquote-small-color;
&:before {
......
scss/_variables.scss
View file @ ed42fc9b
......@@ -189,7 +189,7 @@ $input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-placeholder: #999 !default;
$input-height: (($font-size-base * $line-height-base) + ($padding-y * 2) + ($border-width * 2)) !default;
$input-height: (($font-size-base * $line-height) + ($padding-y * 2) + ($border-width * 2)) !default;
$input-height-lg: (($font-size-lg * $line-height-lg) + ($padding-lg-y * 2) + ($border-width * 2)) !default;
$input-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-y * 2) + ($border-width * 2)) !default;
......@@ -466,7 +466,7 @@ $label-link-hover-color: #fff !default;
$modal-inner-padding: 15px !default;
$modal-title-padding: 15px !default;
$modal-title-line-height: $line-height-base !default;
$modal-title-line-height: $line-height !default;
$modal-content-bg: #fff !default;
$modal-content-border-color: rgba(0,0,0,.2) !default;
......
scss/mixins/_reset-text.scss
View file @ ed42fc9b
......@@ -5,7 +5,7 @@
font-weight: normal;
letter-spacing: normal;
line-break: auto;
line-height: $line-height-base;
line-height: $line-height;
text-align: left; // Fallback for where `start` is not supported
text-align: start;
text-decoration: none;
......
Markdown is supported
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