Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2018-04-30 19:24:29 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2018-04-30 19:24:29 +0300
commitdee70cd0e7cbb8a2c327097030db76b2904c54c6 (patch)
tree7527dc7c08e93ff88386f7e988b53884005bdfdf /assets/stylesheets/bootstrap
parentd2ab4619a70c79f5cb9ffdfac2a321c01192e8c7 (diff)
rake update[v4.1.1]
Diffstat (limited to 'assets/stylesheets/bootstrap')
-rw-r--r--assets/stylesheets/bootstrap/_carousel.scss1
-rw-r--r--assets/stylesheets/bootstrap/_code.scss8
-rw-r--r--assets/stylesheets/bootstrap/_custom-forms.scss11
-rw-r--r--assets/stylesheets/bootstrap/_input-group.scss3
-rw-r--r--assets/stylesheets/bootstrap/_print.scss17
-rw-r--r--assets/stylesheets/bootstrap/_reboot.scss6
-rw-r--r--assets/stylesheets/bootstrap/_variables.scss3
-rw-r--r--assets/stylesheets/bootstrap/mixins/_forms.scss10
-rw-r--r--assets/stylesheets/bootstrap/mixins/_hover.scss2
-rw-r--r--assets/stylesheets/bootstrap/mixins/_text-hide.scss6
-rw-r--r--assets/stylesheets/bootstrap/utilities/_text.scss2
11 files changed, 45 insertions, 24 deletions
diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss
index 6274fc4..de51d1b 100644
--- a/assets/stylesheets/bootstrap/_carousel.scss
+++ b/assets/stylesheets/bootstrap/_carousel.scss
@@ -189,6 +189,7 @@
margin-right: $carousel-indicator-spacer;
margin-left: $carousel-indicator-spacer;
text-indent: -999px;
+ cursor: pointer;
background-color: rgba($carousel-indicator-active-bg, .5);
// Use pseudo classes to increase the hit area by 10px on top and bottom.
diff --git a/assets/stylesheets/bootstrap/_code.scss b/assets/stylesheets/bootstrap/_code.scss
index 9de20fa..9b2e027 100644
--- a/assets/stylesheets/bootstrap/_code.scss
+++ b/assets/stylesheets/bootstrap/_code.scss
@@ -1,11 +1,3 @@
-// Inline and block code styles
-code,
-kbd,
-pre,
-samp {
- font-family: $font-family-monospace;
-}
-
// Inline code
code {
font-size: $code-font-size;
diff --git a/assets/stylesheets/bootstrap/_custom-forms.scss b/assets/stylesheets/bootstrap/_custom-forms.scss
index 54fa875..cd75d8b 100644
--- a/assets/stylesheets/bootstrap/_custom-forms.scss
+++ b/assets/stylesheets/bootstrap/_custom-forms.scss
@@ -54,16 +54,17 @@
// Custom control indicators
//
-// Build the custom controls out of psuedo-elements.
+// Build the custom controls out of pseudo-elements.
.custom-control-label {
+ position: relative;
margin-bottom: 0;
// Background-color and (when enabled) gradient
&::before {
position: absolute;
top: (($line-height-base - $custom-control-indicator-size) / 2);
- left: 0;
+ left: -$custom-control-gutter;
display: block;
width: $custom-control-indicator-size;
height: $custom-control-indicator-size;
@@ -78,7 +79,7 @@
&::after {
position: absolute;
top: (($line-height-base - $custom-control-indicator-size) / 2);
- left: 0;
+ left: -$custom-control-gutter;
display: block;
width: $custom-control-indicator-size;
height: $custom-control-indicator-size;
@@ -285,7 +286,7 @@
bottom: 0;
z-index: 3;
display: block;
- height: calc(#{$custom-file-height} - #{$custom-file-border-width} * 2);
+ height: $custom-file-height-inner;
padding: $custom-file-padding-y $custom-file-padding-x;
line-height: $custom-file-line-height;
color: $custom-file-button-color;
@@ -298,7 +299,7 @@
// Range
//
-// Style range inputs the same across browsers. Vendor-specific rules for psuedo
+// Style range inputs the same across browsers. Vendor-specific rules for pseudo
// elements cannot be mixed. As such, there are no shared styles for focus or
// active states on prefixed selectors.
diff --git a/assets/stylesheets/bootstrap/_input-group.scss b/assets/stylesheets/bootstrap/_input-group.scss
index 78d7bc9..a559f15 100644
--- a/assets/stylesheets/bootstrap/_input-group.scss
+++ b/assets/stylesheets/bootstrap/_input-group.scss
@@ -47,8 +47,7 @@
&:not(:last-child) .custom-file-label,
&:not(:last-child) .custom-file-label::after { @include border-right-radius(0); }
- &:not(:first-child) .custom-file-label,
- &:not(:first-child) .custom-file-label::after { @include border-left-radius(0); }
+ &:not(:first-child) .custom-file-label { @include border-left-radius(0); }
}
}
diff --git a/assets/stylesheets/bootstrap/_print.scss b/assets/stylesheets/bootstrap/_print.scss
index 410216d..1df9487 100644
--- a/assets/stylesheets/bootstrap/_print.scss
+++ b/assets/stylesheets/bootstrap/_print.scss
@@ -112,6 +112,7 @@
background-color: $white !important;
}
}
+
.table-bordered {
th,
td {
@@ -119,6 +120,22 @@
}
}
+ .table-dark {
+ color: inherit;
+
+ th,
+ td,
+ thead th,
+ tbody + tbody {
+ border-color: $table-border-color;
+ }
+ }
+
+ .table .thead-dark th {
+ color: inherit;
+ border-color: $table-border-color;
+ }
+
// Bootstrap specific changes end
}
}
diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss
index dd23f16..7383422 100644
--- a/assets/stylesheets/bootstrap/_reboot.scss
+++ b/assets/stylesheets/bootstrap/_reboot.scss
@@ -42,7 +42,7 @@ html {
// stylelint-disable selector-list-comma-newline-after
// Shim for "new" HTML5 structural elements to display correctly (IE10, older browsers)
-article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
+article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
display: block;
}
// stylelint-enable selector-list-comma-newline-after
@@ -232,15 +232,13 @@ a:not([href]):not([tabindex]) {
// Code
//
-// stylelint-disable font-family-no-duplicate-names
pre,
code,
kbd,
samp {
- font-family: monospace, monospace; // Correct the inheritance and scaling of font size in all browsers.
+ font-family: $font-family-monospace;
font-size: 1em; // Correct the odd `em` font sizing in all browsers.
}
-// stylelint-enable font-family-no-duplicate-names
pre {
// Remove browser default top margin
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index 1e17429..73451a0 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -526,6 +526,7 @@ $custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-s
$custom-range-thumb-active-bg: lighten($component-active-bg, 35%) !default;
$custom-file-height: $input-height !default;
+$custom-file-height-inner: $input-height-inner !default;
$custom-file-focus-border-color: $input-focus-border-color !default;
$custom-file-focus-box-shadow: $input-btn-focus-box-shadow !default;
@@ -898,7 +899,7 @@ $carousel-control-icon-width: 20px !default;
$carousel-control-prev-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"), "#", "%23") !default;
$carousel-control-next-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"), "#", "%23") !default;
-$carousel-transition: transform .6s ease !default; // Define transform transition first if using multiple transitons (e.g., `transform 2s ease, opacity .5s ease-out`)
+$carousel-transition: transform .6s ease !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`)
// Close
diff --git a/assets/stylesheets/bootstrap/mixins/_forms.scss b/assets/stylesheets/bootstrap/mixins/_forms.scss
index dec18ba..3db995e 100644
--- a/assets/stylesheets/bootstrap/mixins/_forms.scss
+++ b/assets/stylesheets/bootstrap/mixins/_forms.scss
@@ -68,6 +68,16 @@
}
}
+ .form-control-file {
+ .was-validated &:#{$state},
+ &.is-#{$state} {
+ ~ .#{$state}-feedback,
+ ~ .#{$state}-tooltip {
+ display: block;
+ }
+ }
+ }
+
.form-check-input {
.was-validated &:#{$state},
&.is-#{$state} {
diff --git a/assets/stylesheets/bootstrap/mixins/_hover.scss b/assets/stylesheets/bootstrap/mixins/_hover.scss
index 57823e3..c1224ff 100644
--- a/assets/stylesheets/bootstrap/mixins/_hover.scss
+++ b/assets/stylesheets/bootstrap/mixins/_hover.scss
@@ -5,7 +5,7 @@
// would persist after initial touch.
//
// For backward compatibility, we've kept these mixins and updated them to
-// always return their regular psuedo-classes instead of a shimmed media query.
+// always return their regular pseudo-classes instead of a shimmed media query.
//
// Issue: https://github.com/twbs/bootstrap/issues/25195
diff --git a/assets/stylesheets/bootstrap/mixins/_text-hide.scss b/assets/stylesheets/bootstrap/mixins/_text-hide.scss
index 4b8f218..9ffab16 100644
--- a/assets/stylesheets/bootstrap/mixins/_text-hide.scss
+++ b/assets/stylesheets/bootstrap/mixins/_text-hide.scss
@@ -1,5 +1,5 @@
// CSS image replacement
-@mixin text-hide() {
+@mixin text-hide($ignore-warning: false) {
// stylelint-disable-next-line font-family-no-missing-generic-family-keyword
font: 0/0 a;
color: transparent;
@@ -7,5 +7,7 @@
background-color: transparent;
border: 0;
- @warn "The `text-hide()` mixin has been deprecated as of v4.1.0. It will be removed entirely in v5.";
+ @if ($ignore-warning != true) {
+ @warn "The `text-hide()` mixin has been deprecated as of v4.1.0. It will be removed entirely in v5.";
+ }
}
diff --git a/assets/stylesheets/bootstrap/utilities/_text.scss b/assets/stylesheets/bootstrap/utilities/_text.scss
index 4f6eba5..9d96c46 100644
--- a/assets/stylesheets/bootstrap/utilities/_text.scss
+++ b/assets/stylesheets/bootstrap/utilities/_text.scss
@@ -54,5 +54,5 @@
// Misc
.text-hide {
- @include text-hide();
+ @include text-hide($ignore-warning: true);
}