mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4' into v4_builds

Browse Source
This commit is contained in:
Mark Otto
2015-06-19 16:26:33 -07:00
parent 8410afe0e1 3df2d085ed
commit bc29c016b7
131 changed files with 3875 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scss/.csslintrc
View File

@@ -1,20 +0,0 @@
{
"adjoining-classes": false,
"box-sizing": false,
"box-model": false,
"compatible-vendor-prefixes": false,
"fallback-colors": false,
"floats": false,
"font-sizes": false,
"gradients": false,
"important": false,
"known-properties": false,
"outline-none": false,
"qualified-headings": false,
"regex-selectors": false,
"shorthand": false,
"text-indent": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false
}

3
scss/_badge.scss
View File

@@ -11,10 +11,11 @@
padding-left: .6em;
font-size: .75em;
font-weight: $badge-font-weight;
color: $badge-color;
line-height: $line-height-base;
color: $badge-color;
text-align: center;
white-space: nowrap;
vertical-align: middle;
background-color: $badge-bg;
@include border-radius($badge-border-radius);

4
scss/_button-group.scss
View File

@@ -183,11 +183,11 @@
border-radius: 0;
}
&:first-child:not(:last-child) {
border-top-right-radius: $border-radius-base;
border-top-right-radius: $btn-border-radius-base;
@include border-bottom-radius(0);
}
&:last-child:not(:first-child) {
border-bottom-left-radius: $border-radius-base;
border-bottom-left-radius: $btn-border-radius-base;
@include border-top-radius(0);
}
}

8
scss/_buttons.scss
View File

@@ -17,7 +17,7 @@
cursor: pointer;
user-select: none;
border: $border-width solid transparent;
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
transition: all .2s ease-in-out;
&,
@@ -130,14 +130,14 @@ fieldset[disabled] a.btn {
.btn-lg {
// line-height: ensure even-numbered height of button next to large input
@include button-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $border-radius-lg);
@include button-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
}
.btn-sm {
// line-height: ensure proper height of button next to small input
@include button-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $border-radius-sm);
@include button-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
}
.btn-xs {
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-sm, $border-radius-sm);
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-sm, $btn-border-radius-sm);
}

2
scss/_card.scss
View File

@@ -198,8 +198,8 @@ $card-cap-bg: #f5f5f5;
.card {
flex: 1 0 0;
margin-left: .625rem;
margin-right: .625rem;
margin-left: .625rem;
}
}
} @else {

3
scss/_carousel.scss
View File

@@ -29,7 +29,7 @@
@media all and (transform-3d), (-webkit-transform-3d) {
transition: transform .6s ease-in-out;
backface-visibility: hidden;
perspective: 1000;
perspective: 1000px;
&.next,
&.active.right {
@@ -144,6 +144,7 @@
right: 50%;
margin-right: -10px;
}
.icon-prev {
&:before {
content: "\2039";// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)

40
scss/_forms.scss
View File

@@ -33,6 +33,12 @@
height: $input-height-base;
}
// Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand {
background-color: transparent;
border: 0;
}
// Customize the `:focus` state to imitate native WebKit styles.
@include form-control-focus();
@@ -91,24 +97,26 @@
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
// @media screen and (-webkit-min-device-pixel-ratio: 0) {
// input[type="date"],
// input[type="time"],
// input[type="datetime-local"],
// input[type="month"] {
// line-height: $input-height-base;
@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
&.form-control {
line-height: $input-height-base;
}
// &.input-sm,
// .input-group-sm & {
// line-height: $input-height-sm;
// }
&.input-sm,
.input-group-sm &.form-control {
line-height: $input-height-sm;
}
// &.input-lg,
// .input-group-lg & {
// line-height: $input-height-lg;
// }
// }
// }
&.input-lg,
.input-group-lg &.form-control {
line-height: $input-height-lg;
}
}
}
// Static form control text

1
scss/_input-group.scss
View File

@@ -179,6 +179,7 @@
&:last-child {
> .btn,
> .btn-group {
z-index: 2;
margin-left: -1px;
}
}

9
scss/_list-group.scss
View File

@@ -45,12 +45,13 @@
}
// Linked list items
// Interactive list items
//
// Use anchor elements instead of `li`s or `div`s to create linked list items.
// Includes an extra `.active` modifier class for showing selected items.
// Use anchor or button elements instead of `li`s or `div`s to create interactive
// list items. Includes an extra `.active` modifier class for selected items.
a.list-group-item {
a.list-group-item,
button.list-group-item {
color: $list-group-link-color;
.list-group-item-heading {

5
scss/_media.scss
View File

@@ -47,6 +47,11 @@
.media-object {
display: block;
// Fix collapse in webkit from max-width: 100% and display: table-cell.
&.img-thumbnail {
max-width: none;
}
}

1
scss/_mixins.scss
View File

@@ -35,6 +35,7 @@
@import "mixins/screen-reader";
@import "mixins/size";
@import "mixins/tab-focus";
@import "mixins/reset-text";
@import "mixins/text-emphasis";
@import "mixins/text-truncate";

19
scss/_normalize.scss
View File

@@ -1,9 +1,9 @@
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
//
// 1. Set default font family to sans-serif.
// 2. Prevent iOS text size adjust after orientation change, without disabling
// user zoom.
// 2. Prevent iOS and IE text size adjust after device orientation change,
// without disabling user zoom.
//
html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
//
// Address `[hidden]` styling not present in IE 8/9/10.
// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
// Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
//
[hidden],
@@ -91,7 +91,8 @@ a {
}
//
// Improve readability when focused and also mouse hovered in all browsers.
// Improve readability of focused elements when they are also in an
// active/hover state.
//
a {
@@ -213,7 +214,6 @@ figure {
//
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
@@ -354,15 +354,12 @@ input[type="number"]::-webkit-outer-spin-button {
//
// 1. Address `appearance` set to `searchfield` in Safari and Chrome.
// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
// (include `-moz` to future-proof).
// 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
//
input[type="search"] {
-webkit-appearance: textfield; // 1
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; // 2
box-sizing: content-box;
box-sizing: content-box; //2
}
//

4
scss/_pagination.scss
View File

@@ -79,9 +79,9 @@
//
.pagination-lg {
@include pagination-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $border-radius-lg);
@include pagination-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $border-radius-lg);
}
.pagination-sm {
@include pagination-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $border-radius-sm);
@include pagination-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $border-radius-sm);
}

12
scss/_popover.scss
View File

@@ -11,14 +11,10 @@
display: block;
max-width: $popover-max-width;
padding: 1px;
// Reset font and text properties given new insertion method
font-family: $font-family-base;
font-size: $font-size-base;
font-weight: normal;
line-height: $line-height-base;
text-align: left;
// Overrides for proper insertion
white-space: normal;
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
// So reset our font and text properties to avoid inheriting weird values.
@include reset-text();
font-size: $font-size-sm;
background-color: $popover-bg;
background-clip: padding-box;
border: 1px solid $popover-border-color;

9
scss/_responsive-embed.scss
View File

@@ -26,12 +26,17 @@
}
}
// Modifier class for 21:9 aspect ratio
.embed-responsive-21by9 {
padding-bottom: percentage(9 / 21);
}
// Modifier class for 16:9 aspect ratio
.embed-responsive-16by9 {
padding-bottom: 56.25%;
padding-bottom: percentage(9 / 16);
}
// Modifier class for 4:3 aspect ratio
.embed-responsive-4by3 {
padding-bottom: 75%;
padding-bottom: percentage(3 / 4);
}

8
scss/_tooltip.scss
View File

@@ -8,11 +8,10 @@
position: absolute;
z-index: $zindex-tooltip;
display: block;
// Reset font and text properties given new insertion method
font-family: $font-family-base;
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
// So reset our font and text properties to avoid inheriting weird values.
@include reset-text();
font-size: $font-size-sm;
font-weight: normal;
line-height: 1.4;
opacity: 0;
&.in { opacity: $tooltip-opacity; }
@@ -77,7 +76,6 @@
padding: 3px 8px;
color: $tooltip-color;
text-align: center;
text-decoration: none;
background-color: $tooltip-bg;
@include border-radius($border-radius-base);
}

5
scss/_variables.scss
View File

@@ -169,6 +169,11 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
$btn-link-disabled-color: $gray-light !default;
// Allows for customizing button radius independently from global border radius
$btn-border-radius-base: $border-radius-base;
$btn-border-radius-lg: $border-radius-lg;
$btn-border-radius-sm: $border-radius-sm;
// Forms

2
scss/bootstrap-flex.scss vendored
View File

@@ -5,4 +5,4 @@
$enable-flex: true;
@import "bootstrap.scss";
@import "bootstrap";

3
scss/mixins/_list-group.scss
View File

@@ -6,7 +6,8 @@
background-color: $background;
}
a.list-group-item-#{state} {
a.list-group-item-#{state},
button.list-group-item-#{state} {
color: $color;
.list-group-item-heading {

3
scss/mixins/_pagination.scss
View File

@@ -1,11 +1,12 @@
// Pagination
@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
> li {
> a,
> span {
padding: $padding-vertical $padding-horizontal;
font-size: $font-size;
line-height: $line-height;
}
&:first-child {
> a,

18
scss/mixins/_reset-text.scss Normal file
View File

@@ -0,0 +1,18 @@
@mixin reset-text {
font-family: $font-family-base;
// We deliberately do NOT reset font-size.
font-style: normal;
font-weight: normal;
letter-spacing: normal;
line-break: auto;
line-height: $line-height-base;
text-align: left; // Fallback for where `start` is not supported
text-align: start;
text-decoration: none;
text-shadow: none;
text-transform: none;
white-space: normal;
word-break: normal;
word-spacing: normal;
word-wrap: normal;
}