-
-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #291 from Oksydan/bootstrap-5-migration
Bootstrap 5 migration
- Loading branch information
Showing
21 changed files
with
12,378 additions
and
4,227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| @import "~bootstrap/scss/functions"; | ||
| @import "~bootstrap/scss/mixins"; | ||
|
|
||
| @import "functions/index"; | ||
| @import "mixins/index"; | ||
| @import "variables/index"; | ||
| @import "mixins/index"; | ||
|
|
||
| @import "~bootstrap/scss/variables"; | ||
| @import "~bootstrap/scss/variables-dark"; | ||
| @import "~bootstrap/scss/maps"; | ||
| @import "~bootstrap/scss/mixins"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,5 @@ | |
| @import "forms"; | ||
| @import "badge"; | ||
| @import "progress"; | ||
| @import "tables"; | ||
| @import "modal"; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
|
|
||
| $modal-inner-padding: $spacer; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
|
|
||
| $table-cell-padding-y: .5rem; | ||
| $table-cell-padding-x: .5rem; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,8 @@ | |
|
|
||
| &__link { | ||
| color: $gray-600; | ||
| @include hover-focus() { | ||
| &:hover, | ||
| &:focus { | ||
| color: $gray-900; | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 0 additions & 29 deletions
29
_dev/css/theme/override/bootstrap/_bootstrap-backwards-compatibility.scss
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,8 @@ | |
| } | ||
| } | ||
|
|
||
| @include hover-focus() { | ||
| &:hover, | ||
| &:focus { | ||
| text-decoration: none; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,92 @@ | ||
| @use "sass:math"; | ||
|
|
||
| .custom-checkbox-color { | ||
| @extend .custom-checkbox; | ||
|
|
||
| .custom-control-label { | ||
| &::before { | ||
| /* stylelint-disable */ | ||
| display: none !important; | ||
| /* stylelint-enable */ | ||
| } | ||
| } | ||
|
|
||
| .custom-control-input:checked ~ .custom-control-label-dark { | ||
| &::after { | ||
| background-image: escape-svg($custom-checkbox-indicator-icon-checked-dark); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .custom-control-input-color { | ||
| position: absolute; | ||
| top: math.div(($font-size-base * $line-height-base - $custom-control-indicator-size), 2); | ||
| left: -($custom-control-gutter + $custom-control-indicator-size); | ||
| display: block; | ||
| width: $custom-control-indicator-size; | ||
| height: $custom-control-indicator-size; | ||
| pointer-events: none; | ||
| content: ""; | ||
| background-color: $custom-control-indicator-bg; | ||
| border: $custom-control-indicator-border-color solid $custom-control-indicator-border-width; | ||
| @include box-shadow($custom-control-indicator-box-shadow); | ||
| @include border-radius($custom-checkbox-indicator-border-radius); | ||
| } | ||
|
|
||
| .custom-checkbox-block { | ||
| padding-left: $custom-control-indicator-size; | ||
| .custom-control-label::after, | ||
| .custom-control-label::before { | ||
| left: -#{$custom-control-indicator-size}; | ||
| } | ||
| } | ||
|
|
||
| .custom-radio-color { | ||
| @extend .custom-radio; | ||
| position: relative; | ||
| width: $custom-color-control-indicator-size; | ||
| height: $custom-color-control-indicator-size; | ||
| padding-left: $custom-color-control-indicator-size; | ||
|
|
||
| .custom-control-input-color { | ||
| @extend .custom-control-input-color; | ||
| top: 0; | ||
| left: -#{$custom-color-control-indicator-size}; | ||
| width: $custom-color-control-indicator-size; | ||
| height: $custom-color-control-indicator-size; | ||
| border-radius: $custom-radio-indicator-border-radius; | ||
| } | ||
|
|
||
| .custom-control-label { | ||
| &::before { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| .custom-control-input { | ||
| width: 100%; | ||
| height: 100%; | ||
|
|
||
| &:checked ~ .custom-control-label { | ||
| &::after { | ||
| top: #{math.div(($custom-color-control-indicator-size - $custom-color-control-indicator-icon-size), 2)}; | ||
| right: #{math.div(($custom-color-control-indicator-size - $custom-color-control-indicator-icon-size), 2)}; | ||
| left: auto; | ||
| width: $custom-color-control-indicator-icon-size; | ||
| height: $custom-color-control-indicator-icon-size; | ||
| background-image: escape-svg($custom-checkbox-indicator-icon-checked); | ||
| } | ||
|
|
||
| .custom-control-input-color { | ||
| border-color: $custom-color-control-indicator-size-checked-border-color; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .custom-control-input:checked ~ .custom-control-label-dark { | ||
| &::after { | ||
| background-image: escape-svg($custom-checkbox-indicator-icon-checked-dark); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /* stylelint-disable */ | ||
| // KEEPING FOR MIGRATION REFERENCE | ||
| //.custom-checkbox-color { | ||
| // @extend .custom-checkbox; | ||
| // | ||
| // .custom-control-label { | ||
| // &::before { | ||
| // display: none !important; | ||
| // } | ||
| // } | ||
| // | ||
| // .custom-control-input:checked ~ .custom-control-label-dark { | ||
| // &::after { | ||
| // background-image: escape-svg($custom-checkbox-indicator-icon-checked-dark); | ||
| // } | ||
| // } | ||
| //} | ||
| // | ||
| //.custom-control-input-color { | ||
| // position: absolute; | ||
| // top: math.div(($font-size-base * $line-height-base - $custom-control-indicator-size), 2); | ||
| // left: -($custom-control-gutter + $custom-control-indicator-size); | ||
| // display: block; | ||
| // width: $custom-control-indicator-size; | ||
| // height: $custom-control-indicator-size; | ||
| // pointer-events: none; | ||
| // content: ""; | ||
| // background-color: $custom-control-indicator-bg; | ||
| // border: $custom-control-indicator-border-color solid $custom-control-indicator-border-width; | ||
| // @include border-radius($custom-checkbox-indicator-border-radius); | ||
| //} | ||
| // | ||
| //.custom-checkbox-block { | ||
| // padding-left: $custom-control-indicator-size; | ||
| // .custom-control-label::after, | ||
| // .custom-control-label::before { | ||
| // left: -#{$custom-control-indicator-size}; | ||
| // } | ||
| //} | ||
| // | ||
| //.custom-radio-color { | ||
| // @extend .custom-radio; | ||
| // position: relative; | ||
| // width: $custom-color-control-indicator-size; | ||
| // height: $custom-color-control-indicator-size; | ||
| // padding-left: $custom-color-control-indicator-size; | ||
| // | ||
| // .custom-control-input-color { | ||
| // @extend .custom-control-input-color; | ||
| // top: 0; | ||
| // left: -#{$custom-color-control-indicator-size}; | ||
| // width: $custom-color-control-indicator-size; | ||
| // height: $custom-color-control-indicator-size; | ||
| // border-radius: $custom-radio-indicator-border-radius; | ||
| // } | ||
| // | ||
| // .custom-control-label { | ||
| // &::before { | ||
| // display: none; | ||
| // } | ||
| // } | ||
| // | ||
| // | ||
| // .custom-control-input { | ||
| // width: 100%; | ||
| // height: 100%; | ||
| // | ||
| // &:checked ~ .custom-control-label { | ||
| // &::after { | ||
| // top: #{math.div(($custom-color-control-indicator-size - $custom-color-control-indicator-icon-size), 2)}; | ||
| // right: #{math.div(($custom-color-control-indicator-size - $custom-color-control-indicator-icon-size), 2)}; | ||
| // left: auto; | ||
| // width: $custom-color-control-indicator-icon-size; | ||
| // height: $custom-color-control-indicator-icon-size; | ||
| // background-image: escape-svg($custom-checkbox-indicator-icon-checked); | ||
| // } | ||
| // | ||
| // .custom-control-input-color { | ||
| // border-color: $custom-color-control-indicator-size-checked-border-color; | ||
| // } | ||
| // } | ||
| // } | ||
| // | ||
| // .custom-control-input:checked ~ .custom-control-label-dark { | ||
| // &::after { | ||
| // background-image: escape-svg($custom-checkbox-indicator-icon-checked-dark); | ||
| // } | ||
| // } | ||
| //} | ||
| /* stylelint-enable */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,3 @@ | |
| @import "form"; | ||
| @import "list-group"; | ||
| @import "custom-control"; | ||
| @import "bootstrap-backwards-compatibility"; | ||
Oops, something went wrong.