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 for link colors on membership #227

Merged
merged 2 commits into from
Dec 6, 2024
Merged

fix for link colors on membership #227

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
76e3d80
fix for link colors on membership
mhewson Nov 27, 2024
94a3ee3
merge
mhewson Dec 4, 2024
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
12 changes: 12 additions & 0 deletions dist/rei-dot-com/android/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,18 +269,30 @@
<color name="cdr_prominence_lifted_color">#332e2e2b</color>
<color name="cdr_membership_vibrant_color_text_button_primary_hover">#ff13352c</color>
<color name="cdr_membership_vibrant_color_text_primary">#ff13352c</color>
<color name="cdr_membership_vibrant_color_text_link_rest">#ff13352c</color>
<color name="cdr_membership_vibrant_color_text_link_hover">#ff13352c</color>
<color name="cdr_membership_vibrant_color_text_link_visited">#ff13352c</color>
<color name="cdr_membership_vibrant_color_background_button_primary_rest">#ff13352c</color>
<color name="cdr_membership_vibrant_color_background_button_primary_active">#ff13352c</color>
<color name="cdr_membership_vibrant_color_background_primary">#ffffdc52</color>
<color name="cdr_membership_vibrant_color_border_button_primary_rest">#ff13352c</color>
<color name="cdr_membership_vibrant_color_border_button_primary_active">#ff13352c</color>
<color name="cdr_membership_vibrant_color_border_button_primary_hover">#ff13352c</color>
<color name="cdr_membership_vibrant_color_border_link_rest">#ff13352c</color>
<color name="cdr_membership_vibrant_color_border_link_hover">#ff13352c</color>
<color name="cdr_membership_vibrant_color_border_link_visited">#ff13352c</color>
<color name="cdr_membership_subtle_color_text_button_primary_hover">#ff13352c</color>
<color name="cdr_membership_subtle_color_text_primary">#ff13352c</color>
<color name="cdr_membership_subtle_color_text_link_rest">#ff13352c</color>
<color name="cdr_membership_subtle_color_text_link_hover">#ff13352c</color>
<color name="cdr_membership_subtle_color_text_link_visited">#ff13352c</color>
<color name="cdr_membership_subtle_color_background_button_primary_rest">#ff13352c</color>
<color name="cdr_membership_subtle_color_background_button_primary_active">#ff13352c</color>
<color name="cdr_membership_subtle_color_background_primary">#ffbfb33e</color>
<color name="cdr_membership_subtle_color_border_button_primary_rest">#ff13352c</color>
<color name="cdr_membership_subtle_color_border_button_primary_active">#ff13352c</color>
<color name="cdr_membership_subtle_color_border_button_primary_hover">#ff13352c</color>
<color name="cdr_membership_subtle_color_border_link_rest">#ff13352c</color>
<color name="cdr_membership_subtle_color_border_link_hover">#ff13352c</color>
<color name="cdr_membership_subtle_color_border_link_visited">#ff13352c</color>
</resources>
12 changes: 12 additions & 0 deletions dist/rei-dot-com/css/cdr-tokens.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,18 +848,30 @@
--cdr-text-strong-weight: 700;
--cdr-membership-vibrant-color-text-button-primary-hover: #13352c;
--cdr-membership-vibrant-color-text-primary: #13352c;
--cdr-membership-vibrant-color-text-link-rest: #13352c;
--cdr-membership-vibrant-color-text-link-hover: #13352c;
--cdr-membership-vibrant-color-text-link-visited: #13352c;
--cdr-membership-vibrant-color-background-button-primary-rest: #13352c;
--cdr-membership-vibrant-color-background-button-primary-active: #13352c;
--cdr-membership-vibrant-color-background-primary: #ffdc52;
--cdr-membership-vibrant-color-border-button-primary-rest: #13352c;
--cdr-membership-vibrant-color-border-button-primary-active: #13352c;
--cdr-membership-vibrant-color-border-button-primary-hover: #13352c;
--cdr-membership-vibrant-color-border-link-rest: #13352c;
--cdr-membership-vibrant-color-border-link-hover: #13352c;
--cdr-membership-vibrant-color-border-link-visited: #13352c;
--cdr-membership-subtle-color-text-button-primary-hover: #13352c;
--cdr-membership-subtle-color-text-primary: #13352c;
--cdr-membership-subtle-color-text-link-rest: #13352c;
--cdr-membership-subtle-color-text-link-hover: #13352c;
--cdr-membership-subtle-color-text-link-visited: #13352c;
--cdr-membership-subtle-color-background-button-primary-rest: #13352c;
--cdr-membership-subtle-color-background-button-primary-active: #13352c;
--cdr-membership-subtle-color-background-primary: #bfb33e;
--cdr-membership-subtle-color-border-button-primary-rest: #13352c;
--cdr-membership-subtle-color-border-button-primary-active: #13352c;
--cdr-membership-subtle-color-border-button-primary-hover: #13352c;
--cdr-membership-subtle-color-border-link-rest: #13352c;
--cdr-membership-subtle-color-border-link-hover: #13352c;
--cdr-membership-subtle-color-border-link-visited: #13352c;
}
92 changes: 81 additions & 11 deletions dist/rei-dot-com/figma/figma.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,27 +1496,27 @@
"rest": {
"$value": "{color.alpine-lake-blue-800}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"hover": {
"$value": "{color.alpine-lake-blue-800}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"active": {
"$value": "{color.alpine-lake-blue-1000}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"disabled": {
"$value": "{color.warm-grey-250}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"visited": {
"$value": "{color.alpine-lake-blue-800}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
}
},
"message": {
Expand Down Expand Up @@ -1803,27 +1803,27 @@
"rest": {
"$value": "{color.alpine-lake-blue-800}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"hover": {
"$value": "{color.alpine-lake-blue-800}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"active": {
"$value": "{color.alpine-lake-blue-1000}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"disabled": {
"$value": "{color.warm-grey-250}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
},
"visited": {
"$value": "{color.alpine-lake-blue-800}",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
"filePath": "tokens/global/link.json5"
}
},
"message": {
Expand Down Expand Up @@ -5047,6 +5047,23 @@
"$value": "#13352c",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/color.json5"
},
"link": {
"rest": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"hover": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"visited": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
}
}
},
"background": {
Expand Down Expand Up @@ -5089,6 +5106,23 @@
"filePath": "tokens/themes/rei-dot-com/button.json5"
}
}
},
"link": {
"rest": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"hover": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"visited": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
}
}
}
}
Expand All @@ -5107,6 +5141,23 @@
"$value": "#13352c",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/color.json5"
},
"link": {
"rest": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"hover": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"visited": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
}
}
},
"background": {
Expand Down Expand Up @@ -5149,9 +5200,28 @@
"filePath": "tokens/themes/rei-dot-com/button.json5"
}
}
},
"link": {
"rest": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"hover": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
},
"visited": {
"$value": "#13352C",
"$type": "color",
"filePath": "tokens/themes/rei-dot-com/link.json5"
}
}
}
}
}
}
},
"doccategory": "palettes",
"docexample": "palette"
}
14 changes: 13 additions & 1 deletion dist/rei-dot-com/ios/CdrColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,20 +273,32 @@ CdrProminenceFloatingColor,
CdrProminenceLiftedColor,
CdrMembershipVibrantColorTextButtonPrimaryHover,
CdrMembershipVibrantColorTextPrimary,
CdrMembershipVibrantColorTextLinkRest,
CdrMembershipVibrantColorTextLinkHover,
CdrMembershipVibrantColorTextLinkVisited,
CdrMembershipVibrantColorBackgroundButtonPrimaryRest,
CdrMembershipVibrantColorBackgroundButtonPrimaryActive,
CdrMembershipVibrantColorBackgroundPrimary,
CdrMembershipVibrantColorBorderButtonPrimaryRest,
CdrMembershipVibrantColorBorderButtonPrimaryActive,
CdrMembershipVibrantColorBorderButtonPrimaryHover,
CdrMembershipVibrantColorBorderLinkRest,
CdrMembershipVibrantColorBorderLinkHover,
CdrMembershipVibrantColorBorderLinkVisited,
CdrMembershipSubtleColorTextButtonPrimaryHover,
CdrMembershipSubtleColorTextPrimary,
CdrMembershipSubtleColorTextLinkRest,
CdrMembershipSubtleColorTextLinkHover,
CdrMembershipSubtleColorTextLinkVisited,
CdrMembershipSubtleColorBackgroundButtonPrimaryRest,
CdrMembershipSubtleColorBackgroundButtonPrimaryActive,
CdrMembershipSubtleColorBackgroundPrimary,
CdrMembershipSubtleColorBorderButtonPrimaryRest,
CdrMembershipSubtleColorBorderButtonPrimaryActive,
CdrMembershipSubtleColorBorderButtonPrimaryHover
CdrMembershipSubtleColorBorderButtonPrimaryHover,
CdrMembershipSubtleColorBorderLinkRest,
CdrMembershipSubtleColorBorderLinkHover,
CdrMembershipSubtleColorBorderLinkVisited
};

@interface CdrColor : NSObject
Expand Down
12 changes: 12 additions & 0 deletions dist/rei-dot-com/ios/CdrColor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ + (NSArray *)values {
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:1.000f green:0.863f blue:0.322f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
Expand All @@ -294,9 +297,18 @@ + (NSArray *)values {
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.749f green:0.702f blue:0.243f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f],
[UIColor colorWithRed:0.075f green:0.208f blue:0.173f alpha:1.000f]
];
});
Expand Down
14 changes: 13 additions & 1 deletion dist/rei-dot-com/js/cdr-tokens.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,18 +848,30 @@ module.exports = {
"CdrTextStrongWeight": "700",
"CdrMembershipVibrantColorTextButtonPrimaryHover": "#13352c",
"CdrMembershipVibrantColorTextPrimary": "#13352c",
"CdrMembershipVibrantColorTextLinkRest": "#13352C",
"CdrMembershipVibrantColorTextLinkHover": "#13352C",
"CdrMembershipVibrantColorTextLinkVisited": "#13352C",
"CdrMembershipVibrantColorBackgroundButtonPrimaryRest": "#13352c",
"CdrMembershipVibrantColorBackgroundButtonPrimaryActive": "#13352c",
"CdrMembershipVibrantColorBackgroundPrimary": "#ffdc52",
"CdrMembershipVibrantColorBorderButtonPrimaryRest": "#13352c",
"CdrMembershipVibrantColorBorderButtonPrimaryActive": "#13352c",
"CdrMembershipVibrantColorBorderButtonPrimaryHover": "#13352c",
"CdrMembershipVibrantColorBorderLinkRest": "#13352C",
"CdrMembershipVibrantColorBorderLinkHover": "#13352C",
"CdrMembershipVibrantColorBorderLinkVisited": "#13352C",
"CdrMembershipSubtleColorTextButtonPrimaryHover": "#13352c",
"CdrMembershipSubtleColorTextPrimary": "#13352c",
"CdrMembershipSubtleColorTextLinkRest": "#13352C",
"CdrMembershipSubtleColorTextLinkHover": "#13352C",
"CdrMembershipSubtleColorTextLinkVisited": "#13352C",
"CdrMembershipSubtleColorBackgroundButtonPrimaryRest": "#13352c",
"CdrMembershipSubtleColorBackgroundButtonPrimaryActive": "#13352c",
"CdrMembershipSubtleColorBackgroundPrimary": "#bfb33e",
"CdrMembershipSubtleColorBorderButtonPrimaryRest": "#13352c",
"CdrMembershipSubtleColorBorderButtonPrimaryActive": "#13352c",
"CdrMembershipSubtleColorBorderButtonPrimaryHover": "#13352c"
"CdrMembershipSubtleColorBorderButtonPrimaryHover": "#13352c",
"CdrMembershipSubtleColorBorderLinkRest": "#13352C",
"CdrMembershipSubtleColorBorderLinkHover": "#13352C",
"CdrMembershipSubtleColorBorderLinkVisited": "#13352C"
};
12 changes: 12 additions & 0 deletions dist/rei-dot-com/js/cdr-tokens.d.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,17 +847,29 @@ export const CdrTextItalicStyle : string;
export const CdrTextStrongWeight : string;
export const CdrMembershipVibrantColorTextButtonPrimaryHover : string;
export const CdrMembershipVibrantColorTextPrimary : string;
export const CdrMembershipVibrantColorTextLinkRest : string;
export const CdrMembershipVibrantColorTextLinkHover : string;
export const CdrMembershipVibrantColorTextLinkVisited : string;
export const CdrMembershipVibrantColorBackgroundButtonPrimaryRest : string;
export const CdrMembershipVibrantColorBackgroundButtonPrimaryActive : string;
export const CdrMembershipVibrantColorBackgroundPrimary : string;
export const CdrMembershipVibrantColorBorderButtonPrimaryRest : string;
export const CdrMembershipVibrantColorBorderButtonPrimaryActive : string;
export const CdrMembershipVibrantColorBorderButtonPrimaryHover : string;
export const CdrMembershipVibrantColorBorderLinkRest : string;
export const CdrMembershipVibrantColorBorderLinkHover : string;
export const CdrMembershipVibrantColorBorderLinkVisited : string;
export const CdrMembershipSubtleColorTextButtonPrimaryHover : string;
export const CdrMembershipSubtleColorTextPrimary : string;
export const CdrMembershipSubtleColorTextLinkRest : string;
export const CdrMembershipSubtleColorTextLinkHover : string;
export const CdrMembershipSubtleColorTextLinkVisited : string;
export const CdrMembershipSubtleColorBackgroundButtonPrimaryRest : string;
export const CdrMembershipSubtleColorBackgroundButtonPrimaryActive : string;
export const CdrMembershipSubtleColorBackgroundPrimary : string;
export const CdrMembershipSubtleColorBorderButtonPrimaryRest : string;
export const CdrMembershipSubtleColorBorderButtonPrimaryActive : string;
export const CdrMembershipSubtleColorBorderButtonPrimaryHover : string;
export const CdrMembershipSubtleColorBorderLinkRest : string;
export const CdrMembershipSubtleColorBorderLinkHover : string;
export const CdrMembershipSubtleColorBorderLinkVisited : string;
12 changes: 12 additions & 0 deletions dist/rei-dot-com/js/cdr-tokens.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,17 +847,29 @@ export const CdrTextItalicStyle = "italic";
export const CdrTextStrongWeight = "700";
export const CdrMembershipVibrantColorTextButtonPrimaryHover = "#13352c";
export const CdrMembershipVibrantColorTextPrimary = "#13352c";
export const CdrMembershipVibrantColorTextLinkRest = "#13352C";
export const CdrMembershipVibrantColorTextLinkHover = "#13352C";
export const CdrMembershipVibrantColorTextLinkVisited = "#13352C";
export const CdrMembershipVibrantColorBackgroundButtonPrimaryRest = "#13352c";
export const CdrMembershipVibrantColorBackgroundButtonPrimaryActive = "#13352c";
export const CdrMembershipVibrantColorBackgroundPrimary = "#ffdc52";
export const CdrMembershipVibrantColorBorderButtonPrimaryRest = "#13352c";
export const CdrMembershipVibrantColorBorderButtonPrimaryActive = "#13352c";
export const CdrMembershipVibrantColorBorderButtonPrimaryHover = "#13352c";
export const CdrMembershipVibrantColorBorderLinkRest = "#13352C";
export const CdrMembershipVibrantColorBorderLinkHover = "#13352C";
export const CdrMembershipVibrantColorBorderLinkVisited = "#13352C";
export const CdrMembershipSubtleColorTextButtonPrimaryHover = "#13352c";
export const CdrMembershipSubtleColorTextPrimary = "#13352c";
export const CdrMembershipSubtleColorTextLinkRest = "#13352C";
export const CdrMembershipSubtleColorTextLinkHover = "#13352C";
export const CdrMembershipSubtleColorTextLinkVisited = "#13352C";
export const CdrMembershipSubtleColorBackgroundButtonPrimaryRest = "#13352c";
export const CdrMembershipSubtleColorBackgroundButtonPrimaryActive = "#13352c";
export const CdrMembershipSubtleColorBackgroundPrimary = "#bfb33e";
export const CdrMembershipSubtleColorBorderButtonPrimaryRest = "#13352c";
export const CdrMembershipSubtleColorBorderButtonPrimaryActive = "#13352c";
export const CdrMembershipSubtleColorBorderButtonPrimaryHover = "#13352c";
export const CdrMembershipSubtleColorBorderLinkRest = "#13352C";
export const CdrMembershipSubtleColorBorderLinkHover = "#13352C";
export const CdrMembershipSubtleColorBorderLinkVisited = "#13352C";
Loading
Loading