Skip to content

fix(button,table): move LESS functions out of LESS file and into variables #737

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

Merged
merged 2 commits into from
Jun 10, 2019
Merged

fix(button,table): move LESS functions out of LESS file and into variables #737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf65cde
fix(button): move LESS Functions out of LESS file and into separate v…
lubber-de May 10, 2019
7719484
fix(table): move LESS Functions out of LESS file and into separate va…
lubber-de May 10, 2019
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
69 changes: 14 additions & 55 deletions src/definitions/elements/button.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,10 @@ each(@colors, {
@la: @colors[@@color][lightActive];
@lt: @colors[@@color][lightText];
@ls: @colors[@@color][lightShadow];
@ty: @colors[@@color][tertiary];
@tyh: @colors[@@color][tertiaryHover];
@tyf: @colors[@@color][tertiaryFocus];
@tya: @colors[@@color][tertiaryActive];
@isDark: @colors[@@color][isDark];
@isVeryDark: @colors[@@color][isVeryDark];

Expand Down Expand Up @@ -1570,20 +1574,12 @@ each(@colors, {
.ui.tertiary.@{color}.button {
background: transparent;

.tertiaryButtonColor() when (@isVeryDark) {
@_tertiaryButtonColor: lighten(@c, 20%);
}
.tertiaryButtonColor() when not (@isVeryDark) {
@_tertiaryButtonColor: saturate(@c, 20%);
}
.tertiaryButtonColor();

& when (@tertiaryWithUnderline = true) {
box-shadow: inset 0 -@tertiaryLineHeight 0 @_tertiaryButtonColor ;
box-shadow: inset 0 -@tertiaryLineHeight 0 @ty;
}

& when (@tertiaryWithOverline = true) {
box-shadow: inset 0 @tertiaryLineHeight 0 @_tertiaryButtonColor ;
box-shadow: inset 0 @tertiaryLineHeight 0 @ty;
}

& when (@tertiaryWithUnderline = false) and (@tertiaryWithOverline = false){
Expand All @@ -1596,67 +1592,38 @@ each(@colors, {
.ui.tertiary.@{color}.buttons button:hover,
.ui.tertiary.@{color}.button:hover {

.tertiaryButtonColorHover() when (@isVeryDark) {
@_tertiaryButtonColorHover: lighten(@h, 40%);
}
.tertiaryButtonColorHover() when not (@isVeryDark) {
@_tertiaryButtonColorHover: desaturate(@h, 20%);
}
.tertiaryButtonColorHover();

& when (@tertiaryHoverWithUnderline = true) {
box-shadow: inset 0 -@tertiaryLineHeight 0 @_tertiaryButtonColorHover ;
box-shadow: inset 0 -@tertiaryLineHeight 0 @tyh;
}

& when (@tertiaryHoverWithOverline = true) {
box-shadow: inset 0 @tertiaryLineHeight 0 @_tertiaryButtonColorHover ;
box-shadow: inset 0 @tertiaryLineHeight 0 @tyh;
}

& when (@tertiaryHoverWithUnderline = false) and (@tertiaryHoverWithOverline = false) {
box-shadow: none ;
}

& when (@isVeryDark) {
color: lighten(@h, 20%) ;
}

& when not (@isVeryDark) {
color: @_tertiaryButtonColorHover ;
}
color: @tyh;
}

.ui.tertiary.@{color}.buttons .button:focus,
.ui.tertiary.@{color}.buttons .tertiary.button:focus,
.ui.tertiary.@{color}.button:focus {


.tertiaryButtonColorFocus() when (@isVeryDark) {
@_tertiaryButtonColorFocus: lighten(@f, 40%);
}
.tertiaryButtonColorFocus() when not (@isVeryDark) {
@_tertiaryButtonColorFocus: desaturate(@f, 20%);
}
.tertiaryButtonColorFocus();

& when (@tertiaryFocusWithUnderline = true) {
box-shadow: inset 0 -@tertiaryLineHeight 0 @_tertiaryButtonColorFocus ;
box-shadow: inset 0 -@tertiaryLineHeight 0 @tyf;
}

& when (@tertiaryFocusWithOverline = true) {
box-shadow: inset 0 @tertiaryLineHeight 0 @_tertiaryButtonColorFocus ;
box-shadow: inset 0 @tertiaryLineHeight 0 @tyf;
}

& when (@tertiaryFocusWithUnderline = false) and (@tertiaryFocusWithOverline = false) {
box-shadow: none;
}

& when (@isVeryDark) {
color: lighten(@f, 20%) ;
}

& when not (@isVeryDark) {
color: @_tertiaryButtonColorFocus ;
}
color: @tyf;
}

.ui.tertiary.@{color}.buttons .active.button,
Expand All @@ -1666,20 +1633,12 @@ each(@colors, {
.ui.tertiary.@{color}.buttons .tertiary.button:active,
.ui.tertiary.@{color}.button:active {

.tertiaryButtonColorActive() when (@isVeryDark) {
@_tertiaryButtonColorActive: lighten(@a, 20%);
}
.tertiaryButtonColorActive() when not (@isVeryDark) {
@_tertiaryButtonColorActive: saturate(@a, 20%);
}
.tertiaryButtonColorActive();

& when (@tertiaryActiveWithUnderline = true) {
box-shadow: inset 0 -@tertiaryLineHeight 0 @_tertiaryButtonColorActive ;
box-shadow: inset 0 -@tertiaryLineHeight 0 @tya;
}

& when (@tertiaryActiveWithOverline = true) {
box-shadow: inset 0 @tertiaryLineHeight 0 @_tertiaryButtonColorActive ;
box-shadow: inset 0 @tertiaryLineHeight 0 @tya;
}

& when (@tertiaryActiveWithUnderline = false) and (@tertiaryActiveWithOverline = false) {
Expand Down
60 changes: 60 additions & 0 deletions src/themes/default/globals/colors.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
lightHover : @lightPrimaryColorHover;
ribbon : @primaryRibbonShadow;
invertedRibbon : @primaryInvertedRibbonShadow;
tertiary : @primaryTertiaryColor;
tertiaryHover : @primaryTertiaryColorHover;
tertiaryFocus : @primaryTertiaryColorFocus;
tertiaryActive : @primaryTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -52,6 +56,10 @@
lightHover : @lightSecondaryColorHover;
ribbon : @secondaryRibbonShadow;
invertedRibbon : @secondaryInvertedRibbonShadow;
tertiary : @secondaryTertiaryColor;
tertiaryHover : @secondaryTertiaryColorHover;
tertiaryFocus : @secondaryTertiaryColorFocus;
tertiaryActive : @secondaryTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -78,6 +86,10 @@
lightHover : @lightRedHover;
ribbon : @redRibbonShadow;
invertedRibbon : @redInvertedRibbonShadow;
tertiary : @redTertiaryColor;
tertiaryHover : @redTertiaryColorHover;
tertiaryFocus : @redTertiaryColorFocus;
tertiaryActive : @redTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -104,6 +116,10 @@
lightHover : @lightOrangeHover;
ribbon : @orangeRibbonShadow;
invertedRibbon : @orangeInvertedRibbonShadow;
tertiary : @orangeTertiaryColor;
tertiaryHover : @orangeTertiaryColorHover;
tertiaryFocus : @orangeTertiaryColorFocus;
tertiaryActive : @orangeTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -130,6 +146,10 @@
lightHover : @lightYellowHover;
ribbon : @yellowRibbonShadow;
invertedRibbon : @yellowInvertedRibbonShadow;
tertiary : @yellowTertiaryColor;
tertiaryHover : @yellowTertiaryColorHover;
tertiaryFocus : @yellowTertiaryColorFocus;
tertiaryActive : @yellowTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -156,6 +176,10 @@
lightHover : @lightOliveHover;
ribbon : @oliveRibbonShadow;
invertedRibbon : @oliveInvertedRibbonShadow;
tertiary : @oliveTertiaryColor;
tertiaryHover : @oliveTertiaryColorHover;
tertiaryFocus : @oliveTertiaryColorFocus;
tertiaryActive : @oliveTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -182,6 +206,10 @@
lightHover : @lightGreenHover;
ribbon : @greenRibbonShadow;
invertedRibbon : @greenInvertedRibbonShadow;
tertiary : @greenTertiaryColor;
tertiaryHover : @greenTertiaryColorHover;
tertiaryFocus : @greenTertiaryColorFocus;
tertiaryActive : @greenTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -208,6 +236,10 @@
lightHover : @lightTealHover;
ribbon : @tealRibbonShadow;
invertedRibbon : @tealInvertedRibbonShadow;
tertiary : @tealTertiaryColor;
tertiaryHover : @tealTertiaryColorHover;
tertiaryFocus : @tealTertiaryColorFocus;
tertiaryActive : @tealTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -234,6 +266,10 @@
lightHover : @lightBlueHover;
ribbon : @blueRibbonShadow;
invertedRibbon : @blueInvertedRibbonShadow;
tertiary : @blueTertiaryColor;
tertiaryHover : @blueTertiaryColorHover;
tertiaryFocus : @blueTertiaryColorFocus;
tertiaryActive : @blueTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -260,6 +296,10 @@
lightHover : @lightVioletHover;
ribbon : @violetRibbonShadow;
invertedRibbon : @violetInvertedRibbonShadow;
tertiary : @violetTertiaryColor;
tertiaryHover : @violetTertiaryColorHover;
tertiaryFocus : @violetTertiaryColorFocus;
tertiaryActive : @violetTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -286,6 +326,10 @@
lightHover : @lightPurpleHover;
ribbon : @purpleRibbonShadow;
invertedRibbon : @purpleInvertedRibbonShadow;
tertiary : @purpleTertiaryColor;
tertiaryHover : @purpleTertiaryColorHover;
tertiaryFocus : @purpleTertiaryColorFocus;
tertiaryActive : @purpleTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -312,6 +356,10 @@
lightHover : @lightPinkHover;
ribbon : @pinkRibbonShadow;
invertedRibbon : @pinkInvertedRibbonShadow;
tertiary : @pinkTertiaryColor;
tertiaryHover : @pinkTertiaryColorHover;
tertiaryFocus : @pinkTertiaryColorFocus;
tertiaryActive : @pinkTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -338,6 +386,10 @@
lightHover : @lightBrownHover;
ribbon : @brownRibbonShadow;
invertedRibbon : @brownInvertedRibbonShadow;
tertiary : @brownTertiaryColor;
tertiaryHover : @brownTertiaryColorHover;
tertiaryFocus : @brownTertiaryColorFocus;
tertiaryActive : @brownTertiaryColorActive;
isDark : false;
isVeryDark : false;
};
Expand All @@ -364,6 +416,10 @@
lightHover : @lightGreyHover;
ribbon : @greyRibbonShadow;
invertedRibbon : @greyInvertedRibbonShadow;
tertiary : @greyTertiaryColor;
tertiaryHover : @greyTertiaryColorHover;
tertiaryFocus : @greyTertiaryColorFocus;
tertiaryActive : @greyTertiaryColorActive;
isDark : true;
isVeryDark : false;
};
Expand All @@ -390,6 +446,10 @@
lightHover : @lightBlackHover;
ribbon : @blackRibbonShadow;
invertedRibbon : @blackInvertedRibbonShadow;
tertiary : @blackTertiaryColor;
tertiaryHover : @blackTertiaryColorHover;
tertiaryFocus : @blackTertiaryColorFocus;
tertiaryActive : @blackTertiaryColorActive;
isDark : true;
isVeryDark : true;
};
Expand Down
62 changes: 62 additions & 0 deletions src/themes/default/globals/site.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,3 +1234,65 @@
@whiteActive : darken(@white, 5);
@offWhiteActive : darken(@offWhite, 5);
@darkWhiteActive : darken(@darkWhite, 5);

/*--- Tertiary ---*/
@primaryTertiaryColor : saturate(@primaryColor, 20%);
@primaryTertiaryColorHover : desaturate(@primaryColorHover, 20%);
@primaryTertiaryColorFocus : desaturate(@primaryColorFocus, 20%);
@primaryTertiaryColorActive : saturate(@primaryColorActive, 20%);
@secondaryTertiaryColor : saturate(@secondaryColor, 20%);
@secondaryTertiaryColorHover : desaturate(@secondaryColorHover, 20%);
@secondaryTertiaryColorFocus : desaturate(@secondaryColorFocus, 20%);
@secondaryTertiaryColorActive: saturate(@secondaryColorActive, 20%);
@redTertiaryColor : saturate(@red, 20%);
@redTertiaryColorHover : desaturate(@redHover, 20%);
@redTertiaryColorFocus : desaturate(@redFocus, 20%);
@redTertiaryColorActive : saturate(@redActive, 20%);
@orangeTertiaryColor : saturate(@orange, 20%);
@orangeTertiaryColorHover : desaturate(@orangeHover, 20%);
@orangeTertiaryColorFocus : desaturate(@orangeFocus, 20%);
@orangeTertiaryColorActive : saturate(@orangeActive, 20%);
@yellowTertiaryColor : saturate(@yellow, 20%);
@yellowTertiaryColorHover : desaturate(@yellowHover, 20%);
@yellowTertiaryColorFocus : desaturate(@yellowFocus, 20%);
@yellowTertiaryColorActive : saturate(@yellowActive, 20%);
@oliveTertiaryColor : saturate(@olive, 20%);
@oliveTertiaryColorHover : desaturate(@oliveHover, 20%);
@oliveTertiaryColorFocus : desaturate(@oliveFocus, 20%);
@oliveTertiaryColorActive : saturate(@oliveActive, 20%);
@greenTertiaryColor : saturate(@green, 20%);
@greenTertiaryColorHover : desaturate(@greenHover, 20%);
@greenTertiaryColorFocus : desaturate(@greenFocus, 20%);
@greenTertiaryColorActive : saturate(@greenActive, 20%);
@tealTertiaryColor : saturate(@teal, 20%);
@tealTertiaryColorHover : desaturate(@tealHover, 20%);
@tealTertiaryColorFocus : desaturate(@tealFocus, 20%);
@tealTertiaryColorActive : saturate(@tealActive, 20%);
@blueTertiaryColor : saturate(@blue, 20%);
@blueTertiaryColorHover : desaturate(@blueHover, 20%);
@blueTertiaryColorFocus : desaturate(@blueFocus, 20%);
@blueTertiaryColorActive : saturate(@blueActive, 20%);
@violetTertiaryColor : saturate(@violet, 20%);
@violetTertiaryColorHover : desaturate(@violetHover, 20%);
@violetTertiaryColorFocus : desaturate(@violetFocus, 20%);
@violetTertiaryColorActive : saturate(@violetActive, 20%);
@purpleTertiaryColor : saturate(@purple, 20%);
@purpleTertiaryColorHover : desaturate(@purpleHover, 20%);
@purpleTertiaryColorFocus : desaturate(@purpleFocus, 20%);
@purpleTertiaryColorActive : saturate(@purpleActive, 20%);
@pinkTertiaryColor : saturate(@pink, 20%);
@pinkTertiaryColorHover : desaturate(@pinkHover, 20%);
@pinkTertiaryColorFocus : desaturate(@pinkFocus, 20%);
@pinkTertiaryColorActive : saturate(@pinkActive, 20%);
@brownTertiaryColor : saturate(@brown, 20%);
@brownTertiaryColorHover : desaturate(@brownHover, 20%);
@brownTertiaryColorFocus : desaturate(@brownFocus, 20%);
@brownTertiaryColorActive : saturate(@brownActive, 20%);
@greyTertiaryColor : saturate(@grey, 20%);
@greyTertiaryColorHover : desaturate(@greyHover, 20%);
@greyTertiaryColorFocus : desaturate(@greyFocus, 20%);
@greyTertiaryColorActive : saturate(@greyActive, 20%);
@blackTertiaryColor : lighten(@black, 20%);
@blackTertiaryColorHover : lighten(@blackHover, 40%);
@blackTertiaryColorFocus : lighten(@blackFocus, 40%);
@blackTertiaryColorActive : lighten(@blackActive, 20%);