Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nested-mixins): get rid of nester mixins (fix #316) #331

Merged
merged 2 commits into from
Mar 28, 2018
Merged

fix(nested-mixins): get rid of nester mixins (fix #316) #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d774127
fix(nested-mixins): get rid of nester mixins (fix #316)
mishkolesnikov Mar 28, 2018
6492662
Merge branch 'master' into feature/nested-mixins
nnixaa Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 36 additions & 34 deletions src/framework/theme/components/checkbox/_checkbox.component.theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,41 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

@mixin nb-checkbox-theme() {
@mixin hover-border($color) {
.customised-control-input:checked ~ .customised-control-indicator {
border-color: $color;
}
.customised-control-input:hover:enabled ~ .customised-control-indicator {
border-color: lighten($color, 10%);
}
}

@mixin checkmark($size, $color, $border-size) {
&::before {
content: '';
position: absolute;
height: calc(#{$size} * 0.6);
width: calc(#{$size} * 0.4);
border: solid $color;
border-width: 0 $border-size $border-size 0;
transform: rotate(45deg);
}
// locally used mixin
@mixin hover-border($color) {
.customised-control-input:checked ~ .customised-control-indicator {
border-color: $color;
}

@mixin set-style($bg, $size, $border-size, $border-color) {
background-color: $bg;
width: $size;
height: $size;
border: $border-size solid $border-color;
.customised-control-input:hover:enabled ~ .customised-control-indicator {
border-color: lighten($color, 10%);
}

@mixin description-style {
color: nb-theme(color-fg-heading);
padding-left: 0.25rem;
}
// locally used mixin
@mixin chackbox-checkmark($size, $color, $border-size) {
&::before {
content: '';
position: absolute;
height: calc(#{$size} * 0.6);
width: calc(#{$size} * 0.4);
border: solid $color;
border-width: 0 $border-size $border-size 0;
transform: rotate(45deg);
}
}
// locally used mixin
@mixin set-style($bg, $size, $border-size, $border-color) {
background-color: $bg;
width: $size;
height: $size;
border: $border-size solid $border-color;
}
// locally used mixin
@mixin description-style {
color: nb-theme(color-fg-heading);
padding-left: 0.25rem;
}

@mixin nb-checkbox-theme() {
nb-checkbox {
.customised-control {
position: relative;
Expand All @@ -64,7 +65,7 @@
display: flex;
justify-content: center;

@include checkmark(
@include chackbox-checkmark(
nb-theme(checkbox-size),
nb-theme(checkbox-checkmark),
nb-theme(checkbox-border-size)
Expand All @@ -89,7 +90,7 @@
display: flex;
justify-content: center;

@include checkmark(
@include chackbox-checkmark(
nb-theme(checkbox-checked-size),
nb-theme(checkbox-checked-checkmark),
nb-theme(checkbox-checked-border-size)
Expand All @@ -108,7 +109,7 @@
display: flex;
justify-content: center;

@include checkmark(
@include chackbox-checkmark(
nb-theme(checkbox-disabled-size),
nb-theme(checkbox-checkmark),
nb-theme(checkbox-disabled-border-size)
Expand All @@ -133,7 +134,7 @@
display: flex;
justify-content: center;

@include checkmark(
@include chackbox-checkmark(
nb-theme(checkbox-disabled-size),
nb-theme(checkbox-disabled-checkmark),
nb-theme(checkbox-disabled-border-size)
Expand Down Expand Up @@ -163,3 +164,4 @@
}
}
}

16 changes: 9 additions & 7 deletions src/framework/theme/styles/global/bootstrap/_custom-forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

@mixin custom-forms() {
@mixin hover-checked-border($color) {
.custom-control-input:hover ~ .custom-control-indicator,
.custom-control-input:checked ~ .custom-control-indicator,
.custom-control-input:hover:checked ~ .custom-control-indicator {
border-color: $color;
}
// locally used mixin
@mixin hover-checked-border($color) {
.custom-control-input:hover ~ .custom-control-indicator,
.custom-control-input:checked ~ .custom-control-indicator,
.custom-control-input:hover:checked ~ .custom-control-indicator {
border-color: $color;
}
}

@mixin custom-forms() {
.custom-control {
margin: 0;
min-height: inherit;
Expand Down Expand Up @@ -111,3 +112,4 @@
}
}
}

91 changes: 46 additions & 45 deletions src/framework/theme/styles/global/bootstrap/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,52 @@
@import '../../core/mixins';
@import './custom-forms';

// locally used mixin
@mixin checkmark($size, $color, $wight, $opacity: 1) {
~ .custom-control-label::after {
background-image: none;
content: '';
position: absolute;
height: calc(#{$size} * 0.6);
width: calc(#{$size} * 0.4);
top: calc(#{$size} * 0.4);
left: calc(#{$size} * 0.3);
border: solid $color;
border-width: 0 $wight $wight 0;
transform: rotate(45deg);
opacity: $opacity;
}
}
// locally used mixin
@mixin radio($size, $color, $opacity) {
~ .custom-control-label::after {
content: '';
position: absolute;
background-color: $color;
height: calc(#{$size} * 0.5);
width: calc(#{$size} * 0.5);
border: solid $color 0.35rem;
border-radius: 50%;
opacity: $opacity;
top: calc(#{$size} * 0.5);
left: calc(#{$size} * 0.21);
}
}
// locally used mixin
@mixin label($color, $opacity) {
~ .custom-control-label {
opacity: $opacity;
&::before {
color: transparent;
background-color: transparent;
border: 2px solid $color;
height: 1.25rem;
width: 1.25rem;
opacity: $opacity;
}
}
}

@mixin nb-b-forms-theme() {

.input-group-addon,
Expand Down Expand Up @@ -67,51 +113,6 @@
}
}

@mixin checkmark($size, $color, $wight, $opacity) {
~ .custom-control-label::after {
background-image: none;
content: '';
position: absolute;
height: calc(#{$size} * 0.6);
width: calc(#{$size} * 0.4);
top: calc(#{$size} * 0.4);
left: calc(#{$size} * 0.3);
border: solid $color;
border-width: 0 $wight $wight 0;
transform: rotate(45deg);
opacity: $opacity;
}
}

@mixin radio($size, $color, $opacity) {
~ .custom-control-label::after {
content: '';
position: absolute;
background-color: $color;
height: calc(#{$size} * 0.5);
width: calc(#{$size} * 0.5);
border: solid $color 0.35rem;
border-radius: 50%;
opacity: $opacity;
top: calc(#{$size} * 0.5);
left: calc(#{$size} * 0.21);
}
}

@mixin label($color, $opacity) {
~ .custom-control-label {
opacity: $opacity;
&::before {
color: transparent;
background-color: transparent;
border: 2px solid $color;
height: 1.25rem;
width: 1.25rem;
opacity: $opacity;
}
}
}

.custom-control {
position: relative;
display: block;
Expand Down