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 #289

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Update components to use token values #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2275db2
refactor(Tokens): Remove every old color token
tarantilis Jan 20, 2023
d1e5572
refactor(Borders): update components to use border color tokens
tarantilis Feb 1, 2023
8a94f73
refactor(Borders): Update segment and label
tarantilis Feb 1, 2023
d703d0d
Merge branch 'develop' into border-color-tokens
ichim-david Feb 1, 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
2 changes: 1 addition & 1 deletion 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: @borderColorTertiaryCSSVar;

@dividerSize: @relativeSmall;
@dividerVerticalAlign: baseline;
Expand Down
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
10 changes: 5 additions & 5 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, @blue-grey-5);

/* 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 @@ -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
8 changes: 4 additions & 4 deletions theme/themes/eea/collections/table.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: @blue-grey-5;
@headerVerticalPadding: @relativeSmall;
@headerHorizontalPadding: @cellHorizontalPadding;
@headerFontStyle: none;
Expand Down
8 changes: 4 additions & 4 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 @whiteBorderColor;
background: @searchButtonBackground;
border-radius: @searchButtonBorderRadius;
color: @searchButtonColor;
Expand All @@ -142,7 +142,7 @@ p.ui.button {
&:visited,
&:focus,
&:hover {
border: @buttonBorder @white;
border: @buttonBorder @whiteBorderColor;
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
30 changes: 2 additions & 28 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
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;
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
10 changes: 5 additions & 5 deletions theme/themes/eea/elements/label.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@verticalAlign: baseline;
@verticalMargin: 0;
@horizontalMargin: 0;
@backgroundColor: @grey;
@backgroundColor: @grey-4;
@color: @white;
@backgroundImage: none;
@verticalPadding: 0.5833em; /* medium is not @emSize custom value required */
Expand Down Expand Up @@ -153,20 +153,20 @@

/* Colors */
@globalLabelColor: @white;
@lowImportanceBackground: @deepBlue;
@lowImportanceBackground: @blue-grey-5;
@mediumImportanceBackground: #346F83;
@highImportanceBackground: #005293;
@highlightImportanceBackground: @secondaryColor;

/* Hover Colors */
@lowImportanceHoverBackground: darken(@deepBlue,5);
@lowImportanceHoverBackground: darken(@blue-grey-5,5);
@mediumImportanceHoverBackground: darken(#346F83,5);
@highImportanceHoverBackground: darken(#005293,5);
@highlightImportanceHoverBackground: darken(@secondaryColor,5);

@importanceHoverTextColor: @white;

@lowImportanceBasicTextColor: @deepBlue;
@lowImportanceBasicTextColor: @blue-grey-5;
@mediumImportanceBasicTextColor: #346F83;
@highImportanceBasicTextColor: #005293;
@highlightImportanceBasicTextColor: @secondaryColor;
Expand Down Expand Up @@ -248,7 +248,7 @@
@emptyCircleSize: 0.5em;

/* Pointing */
@pointingBorderColor: @grey;
@pointingBorderColor: @backgroundColor;
@pointingBorderWidth: 0;
@pointingVerticalDistance: 1em;
@pointingTriangleSize: 0.6666em;
Expand Down
2 changes: 1 addition & 1 deletion theme/themes/eea/elements/segment.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

.ui.segment.dashed {
border: 3px dashed #ccc;
border: 3px dashed @borderColor;
box-shadow: none;
}

Expand Down
2 changes: 1 addition & 1 deletion theme/themes/eea/extras/banner.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@
@sharePopupFontWeight: 500;
@sharePopupLineHeight: 1rem;
// Actions
@sharePopupActionsIconColor: @pineGreen;
@sharePopupActionsIconColor: @secondaryColor;
@sharePopupActionsIconMargin: 0;
4 changes: 2 additions & 2 deletions theme/themes/eea/extras/contextNavigation.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@sidenavHeaderFontSize: @font-size-3;
@sidenavHeaderFontWeight: @font-weight-7;
@sidenavHeaderPadding: @rem-space-4;
@sidenavHeaderBorderBottom: @2px solid @blue-grey-5;
@sidenavHeaderBorderBottom: @2px solid @borderColorTertiaryCSSVar;
@sidenavHeaderIconMarginRight: @rem-space-4;

/* Header icon */
Expand All @@ -24,7 +24,7 @@
@sidenavHeaderIconPaddingRight: @rem-space-4;

/* Content */
@sidenavContentBorderBottom: 1px solid @tertiaryColor;
@sidenavContentBorderBottom: 1px solid @borderColorTertiaryCSSVar;

/* Nav item */
@sidenavItemPadding: @rem-space-2 0 @rem-space-2 @rem-space-8;
Expand Down
4 changes: 2 additions & 2 deletions theme/themes/eea/extras/custom.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
.tabs-block {
.border-left {
border-right: none !important;
border-left: 0.0625rem solid @midGray !important;
border-left: 0.0625rem solid @darkBorderColor !important;

.item.active {
border-right: none !important;
Expand All @@ -153,7 +153,7 @@

.border-top {
border: none !important;
border-top: 0.0625rem solid @midGray !important;
border-top: 0.0625rem solid @darkBorderColor !important;

&::before {
border-top: none !important;
Expand Down
8 changes: 4 additions & 4 deletions theme/themes/eea/extras/downloadLabeledIcon.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/* Label */
@downloadLabeledIconLabelWidth: 100%;
@downloadLabeledIconLabelFontSize: 0.875rem;
@downloadLabeledIconLabelColor: @deepBlue;
@downloadLabeledIconLabelColor: @blue-grey-5;

/* Wrapper */
@downloadLabeledIconWrapperWidth: 100%;
Expand All @@ -20,7 +20,7 @@
@downloadLabeledIconIconFontSize: 1.563rem;
@downloadLabeledIconWrapperIconHeight: 1.25rem;
@downloadLabeledIconIconWidth: 1.25rem;
@downloadLabeledIconColor: @mediumPersianBlue;
@downloadLabeledIconColor: @blue-4;

/* Link Wrapper */
@downloadLabeledIconLinkWrapperBackgroundColor: #f9f9f9;
Expand All @@ -33,13 +33,13 @@
/* List */
@downloadLabeledIconUlMargin: 0.25rem 0;
@downloadLabeledIconUlPaddingInlineStart: 0.25rem 0px;
@downloadLabeledIconLiHover: @japaneseIndigo;
@downloadLabeledIconLiHover: @blue-grey-6;

/* Link */
@downloadLabeledIconALinkFontWeight: 700;
@downloadLabeledIconLinkFontSize: 0.875rem;
@downloadLabeledIconLinkIconFontSize: 1rem;
@downloadLabeledIconLinkIconPadding: 0.125rem 0.875rem;
@downloadLabeledIconLinkIconLineHeight: 1.25rem;
@downloadLabeledIconALinkColor: @japaneseIndigo;
@downloadLabeledIconALinkColor: @blue-grey-6;
@downloadLabeledIconALinkColorHover: @white;
10 changes: 5 additions & 5 deletions theme/themes/eea/extras/header.variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
@mainMenuItemPadding : @rem-space-050 @rem-space-2;
@mainMenuItemActiveColor : @secondaryColor;
@mainMenuItemBorder : 4px solid transparent;
@mainMenuItemActiveBorder : 4px solid @secondaryColor;
@mainMenuItemActiveBorder : 4px solid @borderColorSecondaryCSSVar;
@mainMenuInvertedItemActiveBorder : 4px solid @white;
@mainMenuItemAlignSelf : flex-end;

Expand All @@ -139,7 +139,7 @@
@subsiteDividerHeight : 110%;
@subsiteDividerWidth : 1px;
@subsiteDividerTopPosition : 50%;
@subsiteDividerColor : @secondaryColorCSSVar;
@subsiteDividerColor : @secondaryColor;
@mobileSubsiteFontSize : unit(@h6, em);
@tabletSubsiteFontSize : unit(@h4, em);
@computerSubsiteFontSize : unit(@h2, em);
Expand All @@ -152,7 +152,7 @@
@mobileActionsBoxWidth: 44px;
@tabletActionsBoxWidth: 66px;
@computerActionsBoxWidth: 72px;
@burgerActionBackgroundColor: @darkMidnightBlue;
@burgerActionBackgroundColor: @blue-6;

/* Mega menu and Search popup */
@mobilePopupMarginTop : 5vh;
Expand All @@ -161,7 +161,7 @@

/* Mega menu */
@mobileMegaMenuWidth: 94%;
@megaMenuBackgroundColor: @darkMidnightBlue;
@megaMenuBackgroundColor: @blue-6;
@megaMenuTextDisplay: flex;
@megaMenuTextColor: @white;
@megaMenuTextHoverDecoration: underline;
Expand All @@ -182,7 +182,7 @@
@megaMenuListItemFontSize: @font-size-1;
@megaMenuListItemFontWeight: @font-weight-4;
@megaMenuListItemPadding: @rem-space-2 0;
@megaMenuListItemActiveBorder: 4px solid #FFF;
@megaMenuListItemActiveBorder: 4px solid @white;
@megaMenuListItemActivePadding: 8px;

/* Topics */
Expand Down
Loading