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

Jump to bottom

Update components to use token values #282

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Update components to use token values #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4e7722
refactor(Tokens): Remove every old color token
tarantilis Jan 20, 2023
879051e
refactor(Tokens): Use latest tokens for border, textColor, and theme …
tarantilis Jan 24, 2023
c4c080e
Merge branch 'develop' into assign-token-values
tarantilis Jan 24, 2023
fd6ca19
Merge branch 'develop' into assign-token-values
ichim-david Feb 1, 2023
76b3ae1
Merge branch 'develop' into assign-token-values
ichim-david Mar 29, 2023
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
4 changes: 2 additions & 2 deletions theme/themes/eea/collections/breadcrumb.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* Divider */
@dividerSpacing: @5px;
@dividerOpacity: 1;
@dividerColor: @deepBlue;
@dividerColor: @tertiaryColor;

@dividerSize: @relativeSmall;
@dividerVerticalAlign: baseline;
Expand All @@ -46,5 +46,5 @@
/*-------------------
States
--------------------*/
@activeColor: @textColor;
@activeColor: @textColorCSSVar;
@activeFontWeight: @normal;
4 changes: 2 additions & 2 deletions theme/themes/eea/collections/form.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
.ui.form .inline.field .help {
padding-top: @10px;
padding-bottom: @10px;
border-bottom: 1px solid @lightGreyBorderColor;
border-bottom: 1px solid @lightBorderColor;
}

.ui.form p.help {
Expand Down Expand Up @@ -102,7 +102,7 @@
.ui.form .inline.field .link-form-container {
.wrapper {
display: flex;
border-bottom: 1px solid @lightGreyBorderColor;
border-bottom: 1px solid @lightBorderColor;

.ui.input.input-anchorlink-theme {
vertical-align: unset;
Expand Down
10 changes: 5 additions & 5 deletions theme/themes/eea/collections/form.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
@labelFontSize: @14px;
@labelFontWeight: normal;
@labelTextTransform: none;
@labelColor: @textColor;
@labelColor: @textColorCSSVar;
@formErrorLabelColor: @white;

/* Input */
@inputFont: @pageFont;
@inputWidth: 100%;
@inputFontSize: 1em;
@inputPadding: (@inputVerticalPadding + ((1em - @inputLineHeight) / 2)) @inputHorizontalPadding;
@inputBorderColor : rgba(0, 0, 0, 0.32);
@inputBorderColor : @darkBorderColor;
@inputBorder: 1px solid @inputBorderColor;
@inputBorderRadius: @absoluteBorderRadius;
@inputColor: @textColor;
@inputColor: @textColorCSSVar;
@inputTransition:
color @defaultDuration @defaultEasing,
border-color @defaultDuration @defaultEasing
Expand Down Expand Up @@ -90,7 +90,7 @@
/* Input Focus */
@inputFocusBackground: @inputBackground;
@inputFocusBorderColor: @focusedFormBorderColor;
@inputFocusColor: @textColor;
@inputFocusColor: @textColorCSSVar;
@inputFocusBoxShadow: @inputFocusPointerSize 0em 0em 0em @selectedBorderColor inset;
@inputFocusBorderRadius: @inputBorderRadius;

Expand Down Expand Up @@ -205,7 +205,7 @@
--------------------*/

@fieldWrapperLabelBackground: transparent;
@fieldWrapperLabelColor: @textColor;
@fieldWrapperLabelColor: @textColorCSSVar;
@fieldWrapperLabelPadding: unit((@inputVerticalPadding + @1px), rem) 0;


8 changes: 4 additions & 4 deletions theme/themes/eea/collections/menu.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
/*
.ui.pagination.pointing.secondary.menu .active.item {
padding: (@tinyGap - @1px) @tinyGap;
border-bottom: @secondaryPointingActiveBorderWidth solid @secondaryColor;
border-bottom: @secondaryPointingActiveBorderWidth solid @borderColorSecondaryCSSVar;
margin-bottom: -@secondaryPointingctiveItemMarginBottom;
color: @secondaryPointingActiveTextColor;

Expand All @@ -263,7 +263,7 @@
/*
.ui.pagination.pointing.secondary.menu .item:hover {
padding: (@tinyGap - @1px) @tinyGap;
border-bottom: @secondaryPointingActiveBorderWidth solid @secondaryColor;
border-bottom: @secondaryPointingActiveBorderWidth solid @borderColorSecondaryCSSVar;
margin-bottom: -@secondaryPointingctiveItemMarginBottom;
color: @paginationColor;
}
Expand All @@ -285,7 +285,7 @@
.ui.secondary.pointing.menu:not(.vertical):not(.pagination) .item:active {
padding: (@secondaryPointingItemVerticalPadding - @1px)
@secondaryPointingItemHorizontalPadding;
border-bottom: @secondaryPointingActiveBorderWidth solid @secondaryColor;
border-bottom: @secondaryPointingActiveBorderWidth solid @borderColorSecondaryCSSVar;
margin-bottom: -@secondaryPointingctiveItemMarginBottom;
color: var(--text-color, @secondaryPointingActiveTextColor);
}
Expand Down Expand Up @@ -313,7 +313,7 @@
bottom: @1px;
width: -moz-available;
width: -webkit-fill-available;
border-top: 1px solid @midGray;
border-top: 1px solid @darkBorderColor;
content: ' ';
}

Expand Down
12 changes: 6 additions & 6 deletions theme/themes/eea/collections/menu.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
color @defaultDuration @defaultEasing
;
@itemFontWeight: @normal;
@itemTextColor: var(--text-color, @deepBlue);
@itemTextColor: var(--text-color, @tertiaryColor);

/* Divider */
@dividerSize: 1px;
Expand Down Expand Up @@ -245,7 +245,7 @@
/* Pointing */
@secondaryPointingBorderWidth: @1px;
@secondaryPointingActiveBorderWidth: @3px;
@secondaryPointingBorderColor: @midGray;
@secondaryPointingBorderColor: @darkBorderColor;
@secondaryPointingItemMargin: 0 1.25rem;
@secondaryPointingItemVerticalPadding: @tinyGap;
@secondaryPointingItemActiveVerticalPadding: unit((@relativeTiny - @3px), rem);
Expand All @@ -256,7 +256,7 @@

@secondaryPointingHoverTextColor: var(--text-color-hover, @textColor);

@secondaryPointingActiveBorderColor: @secondaryColor;
@secondaryPointingActiveBorderColor: @borderColorSecondaryCSSVar;
@secondaryPointingActiveTextColor: @secondaryColor;
@secondaryPointingActiveFontWeight: @normal;

Expand All @@ -269,7 +269,7 @@
@secondaryVerticalPointingItemMargin: 0em -@secondaryPointingBorderWidth 0em 0em;


@secondaryPointingItemBorderBottom: @1px solid @midGray;
@secondaryPointingItemBorderBottom: @1px solid @darkBorderColor;
@secondaryPointingItemMaxWidth: 15.625rem;

/* Inverted Secondary */
Expand Down Expand Up @@ -310,7 +310,7 @@

/* Icon */
@iconMenuTextAlign: center;
@iconMenuItemColor: @grey;
@iconMenuItemColor: @grey-4;
@iconMenuInvertedItemColor: @white;


Expand Down Expand Up @@ -342,7 +342,7 @@
/* Pagination */
@paginationFontSize: 0.875rem;
@paginationWidth: 100%;
@paginationColor: @deepBlue;
@paginationColor: @itemTextColor;
@paginationMinWidth: 2em;
@paginationActiveBackground: @transparentBlack;
@paginationActiveTextColor: @selectedTextColor;
Expand Down
14 changes: 7 additions & 7 deletions theme/themes/eea/collections/table.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
color @defaultDuration @defaultEasing
;
@background: @white;
@color: @textColor;
@color: @textColorCSSVar;
@borderWidth: 1px;
@border: 0;
@boxShadow: none;
Expand All @@ -29,22 +29,22 @@
---------------*/

/* Table Row */
@rowBorder: 1px solid @midGray;
@rowBorder: 1px solid @darkBorderColor;

/* Table Cell */
@cellVerticalPadding: @relativeMini;
@cellHorizontalPadding: @relativeMini;
@cellVerticalAlign: inherit;
@cellTextAlign: center;
@cellBorder: 1px solid @secondaryColor;
@cellBorder: 1px solid @borderColorSecondaryCSSVar;

/* Table Header */
@headerBorder: 1px solid @secondaryColor;
@headerBorder: 1px solid @borderColorSecondaryCSSVar;
@headerDivider: none;
@headerBackground: @white;
@headerAlign: inherit;
@headerVerticalAlign: inherit;
@headerColor: @deepBlue;
@headerColor: @tertiaryColor;
@headerVerticalPadding: @relativeSmall;
@headerHorizontalPadding: @cellHorizontalPadding;
@headerFontStyle: none;
Expand All @@ -61,7 +61,7 @@
@footerBackground: @white;
@footerAlign: inherit;
@footerVerticalAlign: middle;
@footerColor: @textColor;
@footerColor: @textColorCSSVar;
@footerVerticalPadding: @cellVerticalPadding;
@footerHorizontalPadding: @cellHorizontalPadding;
@footerFontStyle: @normal;
Expand Down Expand Up @@ -140,7 +140,7 @@
@warningColorHover: darken(@warningColor, 3);

/* Active */
@activeColor: @textColor;
@activeColor: @textColorCSSVar;
@activeBackgroundColor: #E0E0E0;
@activeBoxShadow: @stateMarkerWidth 0px 0px @activeColor inset;

Expand Down
10 changes: 5 additions & 5 deletions theme/themes/eea/elements/button.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ p.ui.button {
/* Advanced Search Button - to be deleted*/
.ui.button.search {
box-sizing: border-box;
border: @buttonBorder @white;
border: @buttonBorder @lightBorderColor;
background: @searchButtonBackground;
border-radius: @searchButtonBorderRadius;
color: @searchButtonColor;
Expand All @@ -142,7 +142,7 @@ p.ui.button {
&:visited,
&:focus,
&:hover {
border: @buttonBorder @white;
border: @buttonBorder @lightBorderColor;
background: @searchButtonBackground;
color: @searchButtonColor;
}
Expand Down Expand Up @@ -185,7 +185,7 @@ p.ui.button {
/* Primary - button.less - L:3128 */
.ui.inverted.primary.buttons .button,
.ui.inverted.primary.button {
box-shadow: 0px 0px 0px @invertedBorderSize @primaryColor inset !important;
box-shadow: 0px 0px 0px @invertedBorderSize @borderColorPrimaryCSSVar inset !important;
color: @primaryColor;
}

Expand Down Expand Up @@ -223,7 +223,7 @@ p.ui.button {
/* Secondary - button.less - L:3128 */
.ui.inverted.secondary.buttons .button,
.ui.inverted.secondary.button {
box-shadow: 0px 0px 0px @invertedBorderSize @secondaryColor inset !important;
box-shadow: 0px 0px 0px @invertedBorderSize @borderColorSecondaryCSSVar inset !important;
color: @secondaryColor;
}

Expand Down Expand Up @@ -267,7 +267,7 @@ p.ui.button {

.ui.inverted.tertiary.buttons .button,
.ui.inverted.tertiary.button {
box-shadow: 0px 0px 0px @invertedBorderSize @tertiaryColor inset !important;
box-shadow: 0px 0px 0px @invertedBorderSize @borderColorTertiaryCSSVar inset !important;
color: @tertiaryColor;
}

Expand Down
34 changes: 4 additions & 30 deletions theme/themes/eea/elements/button.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,10 @@
Element
--------------------*/



/* Button */
@buttonBorder: @relative2px solid;
@buttonDisabledOpacity: 1;

/* Primary Button */
@primaryButtonColor: @primaryColor;
@primaryButtonColorHover: @darkMidnightBlue;
@primaryButtonBackgroundActive: @mediumPersianBlue;
@primaryButtonDisabledBackground: @midBlue;

/* Secondary Button */
@secondaryButtonBackground: transparent;
@secondaryButtonColor: @darkMidnightBlue;
@secondaryButtonColorHover : @white;
@secondaryBorder: @buttonBorder @darkMidnightBlue;
@secondaryBorderHover: @buttonBorder @darkMidnightBlue;
@secondaryButtonDisabledColor: @weldonBlue;

/* Secondary Button Inverted */
@secondaryButtonInvertedColor: @white;
@secondaryButtonInvertedColorHover: @darkMidnightBlue;

/* Action Button */
@actionButtonColor: @white;
@actionButtonBackground: @darkCyan;
@actionButtonBackgroundHover: #2E6173;
@actionButtonBackgroundActive: @pineGreen;

/* Text Button */
@textButtonBackground: transparent;
@textButtonFocusedBoxShadow: 0 0 0 2px @primaryColorHover inset;
Expand All @@ -50,7 +24,7 @@

@verticalMargin: 0.25em;
@horizontalMargin: 0.25em;
@backgroundColor: @silverGray;
@backgroundColor: @grey-2;
@backgroundImage: none;
@background: @backgroundColor @backgroundImage;
@lineHeight: 1em;
Expand Down Expand Up @@ -126,7 +100,7 @@
--------------------*/

/* Hovered */
@hoverBackgroundColor: @midGray;
@hoverBackgroundColor: @grey-3;
@hoverBackgroundImage: @backgroundImage;
@hoverBoxShadow: @boxShadow;
@hoverColor: @hoveredTextColor;
Expand Down Expand Up @@ -243,7 +217,7 @@
/* Basic */
@basicBorderRadius: @borderRadius;
@basicBorderSize: @2px;
@basicTextColor: @textColor;
@basicTextColor: @textColorCSSVar;
@basicColoredBorderSize: @2px;

@basicBackground: transparent none;
Expand All @@ -257,7 +231,7 @@
@basicHoverBackground: #FFFFFF;
@basicHoverTextColor: @hoveredTextColor;
@basicHoverBoxShadow:
0px 0px 0px @basicBorderSize @textColor inset,
0px 0px 0px @basicBorderSize @textColorCSSVar inset,
0px 0px 0px 0px @borderColor inset
;
/* Basic Focus */
Expand Down
6 changes: 3 additions & 3 deletions theme/themes/eea/elements/divider.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@
@shortMarginInline: auto;

/* Color */
@dividerPrimary : @primaryColor;
@dividerSecondary : @secondaryColor;
@dividerTertiary : @tertiaryColor;
@dividerPrimary : @borderColorPrimaryCSSVar;
@dividerSecondary : @borderColorSecondaryCSSVar;
@dividerTertiary : @borderColorTertiaryCSSVar;
4 changes: 2 additions & 2 deletions theme/themes/eea/elements/input.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@

&:active,
&:focus {
border: @borderWidth solid @secondaryColor;
border: @borderWidth solid @borderColorSecondaryCSSVar;
color: @textColor;
}
}
Expand All @@ -101,7 +101,7 @@ textarea {

&:active,
&:focus {
border: @borderWidth solid @secondaryColor;
border: @borderWidth solid @borderColorSecondaryCSSVar;
}
}

Expand Down
2 changes: 1 addition & 1 deletion theme/themes/eea/elements/input.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@textAlign: left;
@background: @inputBackground;
@borderWidth: 1px;
@border: @borderWidth solid @midGray;
@border: @borderWidth solid @darkBorderColor;
@boxShadow: none;

@borderRadius: @defaultBorderRadius;
Expand Down
Loading