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

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'scss/mixins')
-rw-r--r--scss/mixins/_breakpoints.scss2
-rw-r--r--scss/mixins/_forms.scss14
-rw-r--r--scss/mixins/_hover.scss2
3 files changed, 9 insertions, 9 deletions
diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss
index d1ad684cc7..59f25a27e6 100644
--- a/scss/mixins/_breakpoints.scss
+++ b/scss/mixins/_breakpoints.scss
@@ -42,7 +42,7 @@
@return if($next, breakpoint-min($next, $breakpoints) - .02px, null);
}
-// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront.
+// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front.
// Useful for making responsive utilities.
//
// >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index a90db20231..2b89390acc 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -41,13 +41,13 @@
z-index: 5;
display: none;
max-width: 100%; // Contain to parent when possible
- padding: .5rem;
+ padding: $tooltip-padding-y $tooltip-padding-x;
margin-top: .1rem;
- font-size: .875rem;
- line-height: 1;
- color: $white;
- background-color: rgba($color, .8);
- border-radius: .2rem;
+ font-size: $tooltip-font-size;
+ line-height: $line-height-base;
+ color: color-yiq($color);
+ background-color: rgba($color, $tooltip-opacity);
+ @include border-radius($tooltip-border-radius);
}
.form-control {
@@ -181,7 +181,7 @@
~ .custom-file-label {
border-color: $color;
- &::before { border-color: inherit; }
+ &::after { border-color: inherit; }
}
~ .#{$state}-feedback,
diff --git a/scss/mixins/_hover.scss b/scss/mixins/_hover.scss
index c1224ffc53..192f847e17 100644
--- a/scss/mixins/_hover.scss
+++ b/scss/mixins/_hover.scss
@@ -1,6 +1,6 @@
// Hover mixin and `$enable-hover-media-query` are deprecated.
//
-// Origally added during our alphas and maintained during betas, this mixin was
+// Originally added during our alphas and maintained during betas, this mixin was
// designed to prevent `:hover` stickiness on iOS-an issue where hover styles
// would persist after initial touch.
//