mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-24 06:03:10 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4-dev' into mark-padding

Browse Source
This commit is contained in:
Mark Otto
2016-02-16 20:25:40 -08:00
parent 7441beba67 aca4be6539
commit e194db05c8
25 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_dropdown.scss
View File

@@ -42,7 +42,7 @@
z-index: $zindex-dropdown;
display: none; // none by default, but block on "open" of the menu
float: left;
min-width: 160px;
min-width: $dropdown-min-width;
padding: 5px 0;
margin: 2px 0 0; // override default ul
font-size: $font-size-base;

12
scss/_labels.scss
View File

@@ -5,8 +5,8 @@
.label {
display: inline-block;
padding: .25em .4em;
font-size: 75%;
padding: $label-padding-y $label-padding-x;
font-size: $label-font-size;
font-weight: $label-font-weight;
line-height: 1;
color: $label-color;
@@ -43,11 +43,9 @@ a.label {
// Make them extra rounded with a modifier to replace v3's badges.
.label-pill {
padding-right: .6em;
padding-left: .6em;
// Use a higher than normal value to ensure completely rounded edges when
// customizing padding or font-size on labels.
@include border-radius(10rem);
padding-right: $label-pill-padding-x;
padding-left: $label-pill-padding-x;
@include border-radius($label-pill-border-radius);
}
// Colors

4
scss/_type.scss
View File

@@ -60,14 +60,14 @@ hr {
small,
.small {
font-size: 80%;
font-size: $small-font-size;
font-weight: normal;
}
mark,
.mark {
padding: $mark-padding;
background-color: $state-warning-bg;
background-color: $mark-bg;
}

13
scss/_variables.scss
View File

@@ -114,7 +114,7 @@ $link-hover-decoration: underline !default;
// Grid breakpoints
//
// Define the minimum and maximum dimensions at which your layout will change,
// Define the minimum dimensions at which your layout will change,
// adapting to different screen sizes, for use in media queries.
$grid-breakpoints: (
@@ -193,6 +193,8 @@ $headings-color: inherit !default;
$lead-font-size: 1.25rem !default;
$lead-font-weight: 300 !default;
$small-font-size: 80% !default;
$text-muted: $gray-light !default;
$abbr-border-color: $gray-light !default;
@@ -428,6 +430,7 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www
//
// Dropdown menu container and contents.
$dropdown-min-width: 160px !default;
$dropdown-bg: #fff !default;
$dropdown-border-color: rgba(0,0,0,.15) !default;
$dropdown-border-width: $border-width !default;
@@ -551,6 +554,7 @@ $state-info-border: darken($state-info-bg, 7%) !default;
$state-warning-text: #8a6d3b !default;
$state-warning-bg: #fcf8e3 !default;
$mark-bg: $state-warning-bg !default;
$state-warning-border: darken($state-warning-bg, 5%) !default;
$state-danger-text: #a94442 !default;
@@ -620,8 +624,15 @@ $label-danger-bg: $brand-danger !default;
$label-color: #fff !default;
$label-link-hover-color: #fff !default;
$label-font-size: 75% !default;
$label-font-weight: bold !default;
$label-padding-x: .4em !default;
$label-padding-y: .25em !default;
$label-pill-padding-x: .6em !default;
// Use a higher than normal value to ensure completely rounded edges when
// customizing padding or font-size on labels.
$label-pill-border-radius: 10rem !default;
// Modals

4
scss/mixins/_grid-framework.scss
View File

@@ -15,8 +15,8 @@
flex-grow: 1;
max-width: 100%;
min-height: 1px;
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
}
}