comfortable_mexican_sofa 2.0.18 → 2.0.19
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.travis.yml +19 -14
- data/Gemfile +2 -2
- data/LICENSE +1 -1
- data/README.md +4 -2
- data/app/assets/config/manifest.js +0 -0
- data/app/assets/javascripts/comfy/admin/cms/application.js +1 -2
- data/app/assets/javascripts/comfy/vendor/bootstrap.bundle.min.js +7 -0
- data/app/assets/javascripts/comfy/vendor/bootstrap.bundle.min.js.map +1 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_alert.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_badge.scss +8 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_breadcrumb.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_button-group.scss +9 -18
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_buttons.scss +9 -16
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_card.scss +36 -48
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_carousel.scss +37 -76
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_close.scss +15 -8
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_code.scss +5 -5
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_custom-forms.scss +140 -54
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_dropdown.scss +34 -9
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_forms.scss +29 -34
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_functions.scss +8 -8
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_grid.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_images.scss +2 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_input-group.scss +43 -8
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_jumbotron.scss +1 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_list-group.scss +39 -5
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_media.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_mixins.scss +6 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_modal.scss +78 -17
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_nav.scss +2 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_navbar.scss +9 -14
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_pagination.scss +0 -5
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_popover.scss +47 -59
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_print.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_progress.scss +15 -6
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_reboot.scss +47 -44
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_root.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_spinners.scss +55 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_tables.scss +5 -8
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_toasts.scss +44 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_tooltip.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_transitions.scss +0 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_type.scss +16 -16
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_utilities.scss +2 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/_variables.scss +371 -177
- data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-grid.scss +4 -7
- data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap-reboot.scss +3 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/bootstrap.scss +5 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_alert.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_background-variant.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_badge.scss +7 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_border-radius.scss +29 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_box-shadow.scss +16 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_breakpoints.scss +3 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_buttons.scss +12 -14
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_caret.scss +4 -8
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_clearfix.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_deprecate.scss +10 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_float.scss +3 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_forms.scss +58 -13
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_gradients.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_grid-framework.scss +3 -4
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_grid.scss +9 -10
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_hover.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_image.scss +2 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_list-group.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_lists.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_nav-divider.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_pagination.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_reset-text.scss +1 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_resize.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_screen-reader.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_size.scss +1 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_table-row.scss +10 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_text-emphasis.scss +5 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_text-hide.scss +1 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_text-truncate.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_transition.scss +5 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/mixins/_visibility.scss +1 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_align.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_background.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_borders.scss +17 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_clearfix.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_display.scss +6 -18
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_embed.scss +7 -20
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_flex.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_float.scss +5 -3
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_overflow.scss +5 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_position.scss +0 -5
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_screenreaders.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_shadows.scss +0 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_sizing.scss +8 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_spacing.scss +23 -1
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_stretched-link.scss +19 -0
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_text.scss +19 -5
- data/app/assets/stylesheets/comfy/vendor/bootstrap/utilities/_visibility.scss +4 -2
- data/app/assets/stylesheets/comfy/vendor/bootstrap/vendor/_rfs.scss +204 -0
- data/app/models/comfy/cms/file.rb +6 -1
- data/app/models/comfy/cms/fragment.rb +6 -2
- data/app/models/comfy/cms/layout.rb +16 -8
- data/app/models/comfy/cms/page.rb +12 -17
- data/app/views/comfy/admin/cms/files/index.html.haml +4 -2
- data/app/views/comfy/admin/cms/pages/_form.html.haml +2 -2
- data/app/views/comfy/admin/cms/pages/index.html.haml +2 -2
- data/config/locales/ar.yml +262 -0
- data/config/locales/ca.yml +0 -1
- data/config/locales/cs.yml +0 -1
- data/config/locales/da.yml +0 -1
- data/config/locales/de.yml +60 -61
- data/config/locales/en.yml +0 -1
- data/config/locales/es.yml +0 -1
- data/config/locales/fi.yml +0 -1
- data/config/locales/fr.yml +0 -1
- data/config/locales/gr.yml +0 -1
- data/config/locales/hr.yml +262 -0
- data/config/locales/it.yml +0 -1
- data/config/locales/ja.yml +0 -1
- data/config/locales/nb.yml +0 -1
- data/config/locales/nl.yml +0 -1
- data/config/locales/pl.yml +0 -1
- data/config/locales/pt-BR.yml +0 -1
- data/config/locales/ru.yml +0 -1
- data/config/locales/sk.yml +0 -1
- data/config/locales/sv.yml +0 -1
- data/config/locales/tr.yml +0 -1
- data/config/locales/uk.yml +0 -1
- data/config/locales/zh-CN.yml +0 -1
- data/config/locales/zh-TW.yml +0 -1
- data/lib/comfortable_mexican_sofa/configuration.rb +2 -0
- data/lib/comfortable_mexican_sofa/seeds.rb +6 -2
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- data/lib/tasks/cms_seeds.rake +7 -7
- metadata +15 -5
- data/app/assets/javascripts/comfy/vendor/bootstrap.min.js +0 -7
- data/app/assets/javascripts/comfy/vendor/popper.min.js +0 -6
@@ -1,14 +1,10 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap Grid v4.
|
3
|
-
* Copyright 2011-
|
4
|
-
* Copyright 2011-
|
2
|
+
* Bootstrap Grid v4.3.1 (https://getbootstrap.com/)
|
3
|
+
* Copyright 2011-2019 The Bootstrap Authors
|
4
|
+
* Copyright 2011-2019 Twitter, Inc.
|
5
5
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
6
6
|
*/
|
7
7
|
|
8
|
-
@at-root {
|
9
|
-
@-ms-viewport { width: device-width; } // stylelint-disable-line at-rule-no-vendor-prefix
|
10
|
-
}
|
11
|
-
|
12
8
|
html {
|
13
9
|
box-sizing: border-box;
|
14
10
|
-ms-overflow-style: scrollbar;
|
@@ -30,3 +26,4 @@ html {
|
|
30
26
|
@import "grid";
|
31
27
|
@import "utilities/display";
|
32
28
|
@import "utilities/flex";
|
29
|
+
@import "utilities/spacing";
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap Reboot v4.
|
3
|
-
* Copyright 2011-
|
4
|
-
* Copyright 2011-
|
2
|
+
* Bootstrap Reboot v4.3.1 (https://getbootstrap.com/)
|
3
|
+
* Copyright 2011-2019 The Bootstrap Authors
|
4
|
+
* Copyright 2011-2019 Twitter, Inc.
|
5
5
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
6
6
|
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
|
7
7
|
*/
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap v4.
|
3
|
-
* Copyright 2011-
|
4
|
-
* Copyright 2011-
|
2
|
+
* Bootstrap v4.3.1 (https://getbootstrap.com/)
|
3
|
+
* Copyright 2011-2019 The Bootstrap Authors
|
4
|
+
* Copyright 2011-2019 Twitter, Inc.
|
5
5
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
6
6
|
*/
|
7
7
|
|
@@ -34,9 +34,11 @@
|
|
34
34
|
@import "media";
|
35
35
|
@import "list-group";
|
36
36
|
@import "close";
|
37
|
+
@import "toasts";
|
37
38
|
@import "modal";
|
38
39
|
@import "tooltip";
|
39
40
|
@import "popover";
|
40
41
|
@import "carousel";
|
42
|
+
@import "spinners";
|
41
43
|
@import "utilities";
|
42
44
|
@import "print";
|
File without changes
|
File without changes
|
@@ -2,11 +2,16 @@
|
|
2
2
|
color: color-yiq($bg);
|
3
3
|
background-color: $bg;
|
4
4
|
|
5
|
-
&
|
5
|
+
@at-root a#{&} {
|
6
6
|
@include hover-focus {
|
7
7
|
color: color-yiq($bg);
|
8
|
-
text-decoration: none;
|
9
8
|
background-color: darken($bg, 10%);
|
10
9
|
}
|
10
|
+
|
11
|
+
&:focus,
|
12
|
+
&.focus {
|
13
|
+
outline: 0;
|
14
|
+
box-shadow: 0 0 0 $badge-focus-width rgba($bg, .5);
|
15
|
+
}
|
11
16
|
}
|
12
17
|
}
|
@@ -1,9 +1,13 @@
|
|
1
|
+
// stylelint-disable property-blacklist
|
1
2
|
// Single side border-radius
|
2
3
|
|
3
|
-
@mixin border-radius($radius: $border-radius) {
|
4
|
+
@mixin border-radius($radius: $border-radius, $fallback-border-radius: false) {
|
4
5
|
@if $enable-rounded {
|
5
6
|
border-radius: $radius;
|
6
7
|
}
|
8
|
+
@else if $fallback-border-radius != false {
|
9
|
+
border-radius: $fallback-border-radius;
|
10
|
+
}
|
7
11
|
}
|
8
12
|
|
9
13
|
@mixin border-top-radius($radius) {
|
@@ -33,3 +37,27 @@
|
|
33
37
|
border-bottom-left-radius: $radius;
|
34
38
|
}
|
35
39
|
}
|
40
|
+
|
41
|
+
@mixin border-top-left-radius($radius) {
|
42
|
+
@if $enable-rounded {
|
43
|
+
border-top-left-radius: $radius;
|
44
|
+
}
|
45
|
+
}
|
46
|
+
|
47
|
+
@mixin border-top-right-radius($radius) {
|
48
|
+
@if $enable-rounded {
|
49
|
+
border-top-right-radius: $radius;
|
50
|
+
}
|
51
|
+
}
|
52
|
+
|
53
|
+
@mixin border-bottom-right-radius($radius) {
|
54
|
+
@if $enable-rounded {
|
55
|
+
border-bottom-right-radius: $radius;
|
56
|
+
}
|
57
|
+
}
|
58
|
+
|
59
|
+
@mixin border-bottom-left-radius($radius) {
|
60
|
+
@if $enable-rounded {
|
61
|
+
border-bottom-left-radius: $radius;
|
62
|
+
}
|
63
|
+
}
|
@@ -1,5 +1,20 @@
|
|
1
1
|
@mixin box-shadow($shadow...) {
|
2
2
|
@if $enable-shadows {
|
3
|
-
|
3
|
+
$result: ();
|
4
|
+
|
5
|
+
@if (length($shadow) == 1) {
|
6
|
+
// We can pass `@include box-shadow(none);`
|
7
|
+
$result: $shadow;
|
8
|
+
} @else {
|
9
|
+
// Filter to avoid invalid properties for example `box-shadow: none, 1px 1px black;`
|
10
|
+
@for $i from 1 through length($shadow) {
|
11
|
+
@if nth($shadow, $i) != "none" {
|
12
|
+
$result: append($result, nth($shadow, $i), "comma");
|
13
|
+
}
|
14
|
+
}
|
15
|
+
}
|
16
|
+
@if (length($result) > 0) {
|
17
|
+
box-shadow: $result;
|
18
|
+
}
|
4
19
|
}
|
5
20
|
}
|
@@ -16,7 +16,7 @@
|
|
16
16
|
// md
|
17
17
|
@function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) {
|
18
18
|
$n: index($breakpoint-names, $name);
|
19
|
-
@return if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);
|
19
|
+
@return if($n != null and $n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);
|
20
20
|
}
|
21
21
|
|
22
22
|
// Minimum breakpoint width. Null for the smallest (first) breakpoint.
|
@@ -39,10 +39,10 @@
|
|
39
39
|
// 767.98px
|
40
40
|
@function breakpoint-max($name, $breakpoints: $grid-breakpoints) {
|
41
41
|
$next: breakpoint-next($name, $breakpoints);
|
42
|
-
@return if($next, breakpoint-min($next, $breakpoints) - .
|
42
|
+
@return if($next, breakpoint-min($next, $breakpoints) - .02, null);
|
43
43
|
}
|
44
44
|
|
45
|
-
// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash
|
45
|
+
// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front.
|
46
46
|
// Useful for making responsive utilities.
|
47
47
|
//
|
48
48
|
// >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
|
@@ -19,9 +19,9 @@
|
|
19
19
|
&.focus {
|
20
20
|
// Avoid using mixin so we can pass custom focus shadow properly
|
21
21
|
@if $enable-shadows {
|
22
|
-
box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba($border, .5);
|
22
|
+
box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
23
23
|
} @else {
|
24
|
-
box-shadow: 0 0 0 $btn-focus-width rgba($border, .5);
|
24
|
+
box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
25
25
|
}
|
26
26
|
}
|
27
27
|
|
@@ -31,6 +31,10 @@
|
|
31
31
|
color: color-yiq($background);
|
32
32
|
background-color: $background;
|
33
33
|
border-color: $border;
|
34
|
+
// Remove CSS gradients if they're enabled
|
35
|
+
@if $enable-gradients {
|
36
|
+
background-image: none;
|
37
|
+
}
|
34
38
|
}
|
35
39
|
|
36
40
|
&:not(:disabled):not(.disabled):active,
|
@@ -45,10 +49,10 @@
|
|
45
49
|
|
46
50
|
&:focus {
|
47
51
|
// Avoid using mixin so we can pass custom focus shadow properly
|
48
|
-
@if $enable-shadows {
|
49
|
-
box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($border, .5);
|
52
|
+
@if $enable-shadows and $btn-active-box-shadow != none {
|
53
|
+
box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
50
54
|
} @else {
|
51
|
-
box-shadow: 0 0 0 $btn-focus-width rgba($border, .5);
|
55
|
+
box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);
|
52
56
|
}
|
53
57
|
}
|
54
58
|
}
|
@@ -56,11 +60,9 @@
|
|
56
60
|
|
57
61
|
@mixin button-outline-variant($color, $color-hover: color-yiq($color), $active-background: $color, $active-border: $color) {
|
58
62
|
color: $color;
|
59
|
-
background-color: transparent;
|
60
|
-
background-image: none;
|
61
63
|
border-color: $color;
|
62
64
|
|
63
|
-
|
65
|
+
@include hover {
|
64
66
|
color: $color-hover;
|
65
67
|
background-color: $active-background;
|
66
68
|
border-color: $active-border;
|
@@ -98,12 +100,8 @@
|
|
98
100
|
// Button sizes
|
99
101
|
@mixin button-size($padding-y, $padding-x, $font-size, $line-height, $border-radius) {
|
100
102
|
padding: $padding-y $padding-x;
|
101
|
-
font-size
|
103
|
+
@include font-size($font-size);
|
102
104
|
line-height: $line-height;
|
103
105
|
// Manually declare to provide an override to the browser default
|
104
|
-
@
|
105
|
-
border-radius: $border-radius;
|
106
|
-
} @else {
|
107
|
-
border-radius: 0;
|
108
|
-
}
|
106
|
+
@include border-radius($border-radius, 0);
|
109
107
|
}
|
@@ -29,10 +29,8 @@
|
|
29
29
|
@if $enable-caret {
|
30
30
|
&::after {
|
31
31
|
display: inline-block;
|
32
|
-
|
33
|
-
|
34
|
-
margin-left: $caret-width * .85;
|
35
|
-
vertical-align: $caret-width * .85;
|
32
|
+
margin-left: $caret-spacing;
|
33
|
+
vertical-align: $caret-vertical-align;
|
36
34
|
content: "";
|
37
35
|
@if $direction == down {
|
38
36
|
@include caret-down;
|
@@ -50,10 +48,8 @@
|
|
50
48
|
|
51
49
|
&::before {
|
52
50
|
display: inline-block;
|
53
|
-
|
54
|
-
|
55
|
-
margin-right: $caret-width * .85;
|
56
|
-
vertical-align: $caret-width * .85;
|
51
|
+
margin-right: $caret-spacing;
|
52
|
+
vertical-align: $caret-vertical-align;
|
57
53
|
content: "";
|
58
54
|
@include caret-left;
|
59
55
|
}
|
File without changes
|
@@ -0,0 +1,10 @@
|
|
1
|
+
// Deprecate mixin
|
2
|
+
//
|
3
|
+
// This mixin can be used to deprecate mixins or functions.
|
4
|
+
// `$enable-deprecation-messages` is a global variable, `$ignore-warning` is a variable that can be passed to
|
5
|
+
// some deprecated mixins to suppress the warning (for example if the mixin is still be used in the current version of Bootstrap)
|
6
|
+
@mixin deprecate($name, $deprecate-version, $remove-version, $ignore-warning: false) {
|
7
|
+
@if ($enable-deprecation-messages != false and $ignore-warning != true) {
|
8
|
+
@warn "#{$name} has been deprecated as of #{$deprecate-version}. It will be removed entirely in #{$remove-version}.";
|
9
|
+
}
|
10
|
+
}
|
@@ -2,10 +2,13 @@
|
|
2
2
|
|
3
3
|
@mixin float-left {
|
4
4
|
float: left !important;
|
5
|
+
@include deprecate("The `float-left` mixin", "v4.3.0", "v5");
|
5
6
|
}
|
6
7
|
@mixin float-right {
|
7
8
|
float: right !important;
|
9
|
+
@include deprecate("The `float-right` mixin", "v4.3.0", "v5");
|
8
10
|
}
|
9
11
|
@mixin float-none {
|
10
12
|
float: none !important;
|
13
|
+
@include deprecate("The `float-none` mixin", "v4.3.0", "v5");
|
11
14
|
}
|
@@ -26,12 +26,12 @@
|
|
26
26
|
}
|
27
27
|
|
28
28
|
|
29
|
-
@mixin form-validation-state($state, $color) {
|
29
|
+
@mixin form-validation-state($state, $color, $icon) {
|
30
30
|
.#{$state}-feedback {
|
31
31
|
display: none;
|
32
32
|
width: 100%;
|
33
33
|
margin-top: $form-feedback-margin-top;
|
34
|
-
font-size
|
34
|
+
@include font-size($form-feedback-font-size);
|
35
35
|
color: $color;
|
36
36
|
}
|
37
37
|
|
@@ -41,21 +41,61 @@
|
|
41
41
|
z-index: 5;
|
42
42
|
display: none;
|
43
43
|
max-width: 100%; // Contain to parent when possible
|
44
|
-
padding:
|
44
|
+
padding: $form-feedback-tooltip-padding-y $form-feedback-tooltip-padding-x;
|
45
45
|
margin-top: .1rem;
|
46
|
-
font-size
|
47
|
-
line-height:
|
48
|
-
color: $
|
49
|
-
background-color: rgba($color,
|
50
|
-
border-radius
|
46
|
+
@include font-size($form-feedback-tooltip-font-size);
|
47
|
+
line-height: $form-feedback-tooltip-line-height;
|
48
|
+
color: color-yiq($color);
|
49
|
+
background-color: rgba($color, $form-feedback-tooltip-opacity);
|
50
|
+
@include border-radius($form-feedback-tooltip-border-radius);
|
51
|
+
}
|
52
|
+
|
53
|
+
.form-control {
|
54
|
+
.was-validated &:#{$state},
|
55
|
+
&.is-#{$state} {
|
56
|
+
border-color: $color;
|
57
|
+
|
58
|
+
@if $enable-validation-icons {
|
59
|
+
padding-right: $input-height-inner;
|
60
|
+
background-image: $icon;
|
61
|
+
background-repeat: no-repeat;
|
62
|
+
background-position: center right $input-height-inner-quarter;
|
63
|
+
background-size: $input-height-inner-half $input-height-inner-half;
|
64
|
+
}
|
65
|
+
|
66
|
+
&:focus {
|
67
|
+
border-color: $color;
|
68
|
+
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
|
69
|
+
}
|
70
|
+
|
71
|
+
~ .#{$state}-feedback,
|
72
|
+
~ .#{$state}-tooltip {
|
73
|
+
display: block;
|
74
|
+
}
|
75
|
+
}
|
76
|
+
}
|
77
|
+
|
78
|
+
// stylelint-disable-next-line selector-no-qualifying-type
|
79
|
+
textarea.form-control {
|
80
|
+
.was-validated &:#{$state},
|
81
|
+
&.is-#{$state} {
|
82
|
+
@if $enable-validation-icons {
|
83
|
+
padding-right: $input-height-inner;
|
84
|
+
background-position: top $input-height-inner-quarter right $input-height-inner-quarter;
|
85
|
+
}
|
86
|
+
}
|
51
87
|
}
|
52
88
|
|
53
|
-
.form-control,
|
54
89
|
.custom-select {
|
55
90
|
.was-validated &:#{$state},
|
56
91
|
&.is-#{$state} {
|
57
92
|
border-color: $color;
|
58
93
|
|
94
|
+
@if $enable-validation-icons {
|
95
|
+
padding-right: $custom-select-feedback-icon-padding-right;
|
96
|
+
background: $custom-select-background, $icon $custom-select-bg no-repeat $custom-select-feedback-icon-position / $custom-select-feedback-icon-size;
|
97
|
+
}
|
98
|
+
|
59
99
|
&:focus {
|
60
100
|
border-color: $color;
|
61
101
|
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
|
@@ -68,6 +108,7 @@
|
|
68
108
|
}
|
69
109
|
}
|
70
110
|
|
111
|
+
|
71
112
|
.form-control-file {
|
72
113
|
.was-validated &:#{$state},
|
73
114
|
&.is-#{$state} {
|
@@ -99,7 +140,7 @@
|
|
99
140
|
color: $color;
|
100
141
|
|
101
142
|
&::before {
|
102
|
-
|
143
|
+
border-color: $color;
|
103
144
|
}
|
104
145
|
}
|
105
146
|
|
@@ -110,13 +151,18 @@
|
|
110
151
|
|
111
152
|
&:checked {
|
112
153
|
~ .custom-control-label::before {
|
154
|
+
border-color: lighten($color, 10%);
|
113
155
|
@include gradient-bg(lighten($color, 10%));
|
114
156
|
}
|
115
157
|
}
|
116
158
|
|
117
159
|
&:focus {
|
118
160
|
~ .custom-control-label::before {
|
119
|
-
box-shadow: 0 0 0
|
161
|
+
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
|
162
|
+
}
|
163
|
+
|
164
|
+
&:not(:checked) ~ .custom-control-label::before {
|
165
|
+
border-color: $color;
|
120
166
|
}
|
121
167
|
}
|
122
168
|
}
|
@@ -128,8 +174,6 @@
|
|
128
174
|
&.is-#{$state} {
|
129
175
|
~ .custom-file-label {
|
130
176
|
border-color: $color;
|
131
|
-
|
132
|
-
&::before { border-color: inherit; }
|
133
177
|
}
|
134
178
|
|
135
179
|
~ .#{$state}-feedback,
|
@@ -139,6 +183,7 @@
|
|
139
183
|
|
140
184
|
&:focus {
|
141
185
|
~ .custom-file-label {
|
186
|
+
border-color: $color;
|
142
187
|
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
|
143
188
|
}
|
144
189
|
}
|
File without changes
|
@@ -8,9 +8,8 @@
|
|
8
8
|
%grid-column {
|
9
9
|
position: relative;
|
10
10
|
width: 100%;
|
11
|
-
|
12
|
-
padding-
|
13
|
-
padding-left: ($gutter / 2);
|
11
|
+
padding-right: $gutter / 2;
|
12
|
+
padding-left: $gutter / 2;
|
14
13
|
}
|
15
14
|
|
16
15
|
@each $breakpoint in map-keys($breakpoints) {
|
@@ -37,7 +36,7 @@
|
|
37
36
|
.col#{$infix}-auto {
|
38
37
|
flex: 0 0 auto;
|
39
38
|
width: auto;
|
40
|
-
max-width:
|
39
|
+
max-width: 100%; // Reset earlier grid tiers
|
41
40
|
}
|
42
41
|
|
43
42
|
@for $i from 1 through $columns {
|
@@ -2,10 +2,10 @@
|
|
2
2
|
//
|
3
3
|
// Generate semantic grid columns with these mixins.
|
4
4
|
|
5
|
-
@mixin make-container() {
|
5
|
+
@mixin make-container($gutter: $grid-gutter-width) {
|
6
6
|
width: 100%;
|
7
|
-
padding-right:
|
8
|
-
padding-left:
|
7
|
+
padding-right: $gutter / 2;
|
8
|
+
padding-left: $gutter / 2;
|
9
9
|
margin-right: auto;
|
10
10
|
margin-left: auto;
|
11
11
|
}
|
@@ -20,22 +20,21 @@
|
|
20
20
|
}
|
21
21
|
}
|
22
22
|
|
23
|
-
@mixin make-row() {
|
23
|
+
@mixin make-row($gutter: $grid-gutter-width) {
|
24
24
|
display: flex;
|
25
25
|
flex-wrap: wrap;
|
26
|
-
margin-right:
|
27
|
-
margin-left:
|
26
|
+
margin-right: -$gutter / 2;
|
27
|
+
margin-left: -$gutter / 2;
|
28
28
|
}
|
29
29
|
|
30
|
-
@mixin make-col-ready() {
|
30
|
+
@mixin make-col-ready($gutter: $grid-gutter-width) {
|
31
31
|
position: relative;
|
32
32
|
// Prevent columns from becoming too narrow when at smaller grid tiers by
|
33
33
|
// always setting `width: 100%;`. This works because we use `flex` values
|
34
34
|
// later on to override this initial width.
|
35
35
|
width: 100%;
|
36
|
-
|
37
|
-
padding-
|
38
|
-
padding-left: ($grid-gutter-width / 2);
|
36
|
+
padding-right: $gutter / 2;
|
37
|
+
padding-left: $gutter / 2;
|
39
38
|
}
|
40
39
|
|
41
40
|
@mixin make-col($size, $columns: $grid-columns) {
|