Merge pull request #210 from rei/pr/membership

membership palette v1
rei · Oct 28, 2024 · 1c001a9 · 1c001a9
2 parents a6c0997 + 3af88b6
commit 1c001a9
Show file tree

Hide file tree

Showing 23 changed files with 2,900 additions and 281 deletions.
diff --git a/dist/docsite/less/cdr-tokens.less b/dist/docsite/less/cdr-tokens.less
@@ -1749,29 +1749,3 @@
     @rules();
   }
 }
-
-
-// DEPRECATED summer 2024
-.cdr-xs-mq(@rules) {
-  @media (min-width: @cdr-breakpoint-xs) {
-    @rules();
-  }
-}
-
-.cdr-sm-mq(@rules) {
-  @media (min-width: @cdr-breakpoint-sm) {
-    @rules();
-  }
-}
-
-.cdr-md-mq(@rules) {
-  @media (min-width: @cdr-breakpoint-md) {
-    @rules();
-  }
-}
-
-.cdr-lg-mq(@rules) {
-  @media (min-width: @cdr-breakpoint-lg) {
-    @rules();
-  }
-}
diff --git a/dist/docsite/scss/cdr-tokens.scss b/dist/docsite/scss/cdr-tokens.scss
@@ -2451,32 +2451,3 @@ $cdr-knockout-color-icon-background-note: #c4b03b;
     @content;
   }
 }
-
-// DEPRECATED summer 2020
-@mixin cdr-xs-mq {
-  @include deprecate-mixin(2020, 'summer', 'cdr-xs-mq', 'cdr-xs-mq-up');
-  @media (min-width: #{$cdr-breakpoint-xs}) {
-    @content;
-  }
-}
-
-@mixin cdr-sm-mq {
-  @include deprecate-mixin(2020, 'summer', 'cdr-sm-mq', 'cdr-sm-mq-up');
-  @media (min-width: #{$cdr-breakpoint-sm}) {
-    @content;
-  }
-}
-
-@mixin cdr-md-mq {
-  @include deprecate-mixin(2020, 'summer', 'cdr-md-mq', 'cdr-md-mq-up');
-  @media (min-width: #{$cdr-breakpoint-md}) {
-    @content;
-  }
-}
-
-@mixin cdr-lg-mq {
-  @include deprecate-mixin(2020, 'summer', 'cdr-lg-mq', 'cdr-lg-mq-up');
-  @media (min-width: #{$cdr-breakpoint-lg}) {
-    @content;
-  }
-}
diff --git a/dist/rei-dot-com/android/colors.xml b/dist/rei-dot-com/android/colors.xml
@@ -278,4 +278,20 @@
   <color name="cdr_prominence_lifted_shadow_3_color">#124b4a48</color>
   <color name="cdr_prominence_lifted_shadow_4_color">#054b4a48</color>
   <color name="cdr_prominence_lifted_shadow_5_color">#004b4a48</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_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_subtle_color_text_button_primary_hover">#ff13352c</color>
+  <color name="cdr_membership_subtle_color_text_primary">#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>
 </resources>
diff --git a/dist/rei-dot-com/css/cdr-tokens.css b/dist/rei-dot-com/css/cdr-tokens.css
@@ -913,4 +913,20 @@
   --cdr-text-italic-variation: 'ital' 1;
   --cdr-text-italic-style: italic;
   --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-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-subtle-color-text-button-primary-hover: #13352c;
+  --cdr-membership-subtle-color-text-primary: #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;
 }
diff --git a/dist/rei-dot-com/figma/figma.json b/dist/rei-dot-com/figma/figma.json
@@ -373,7 +373,7 @@
         "rest": {
           "$value": "#406eb5",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-800}",
             "$type": "color"
@@ -382,7 +382,7 @@
         "hover": {
           "$value": "#406eb5",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-800}",
             "$type": "color"
@@ -391,7 +391,7 @@
         "active": {
           "$value": "#0b2d60",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-1000}",
             "$type": "color"
@@ -400,7 +400,7 @@
         "disabled": {
           "$value": "#d1cbbd",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.warm-grey-500}",
             "$type": "color"
@@ -409,7 +409,7 @@
         "visited": {
           "$value": "#406eb5",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-800}",
             "$type": "color"
@@ -1936,7 +1936,7 @@
         "rest": {
           "$value": "#406eb5",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-800}",
             "$type": "color"
@@ -1945,7 +1945,7 @@
         "hover": {
           "$value": "#406eb5",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-800}",
             "$type": "color"
@@ -1954,7 +1954,7 @@
         "active": {
           "$value": "#0b2d60",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-1000}",
             "$type": "color"
@@ -1963,7 +1963,7 @@
         "disabled": {
           "$value": "#dcd6cb",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.warm-grey-400}",
             "$type": "color"
@@ -1972,7 +1972,7 @@
         "visited": {
           "$value": "#406eb5",
           "$type": "color",
-          "filePath": "tokens/global/link.json5",
+          "filePath": "tokens/themes/rei-dot-com/link.json5",
           "original": {
             "$value": "{options.color.alpine-lake-blue-800}",
             "$type": "color"
@@ -11922,5 +11922,191 @@
         "property": "font-weight"
       }
     }
+  },
+  "membership": {
+    "vibrant": {
+      "color": {
+        "text": {
+          "button": {
+            "primary-hover": {
+              "$value": "#13352c",
+              "$type": "color",
+              "filePath": "tokens/themes/rei-dot-com/button.json5",
+              "original": {
+                "$value": "#13352C",
+                "$type": "color"
+              }
+            }
+          },
+          "primary": {
+            "$value": "#13352c",
+            "$type": "color",
+            "filePath": "tokens/themes/rei-dot-com/color.json5",
+            "original": {
+              "$value": "#13352C",
+              "$type": "color"
+            }
+          }
+        },
+        "background": {
+          "button": {
+            "primary": {
+              "rest": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              },
+              "active": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              }
+            }
+          },
+          "primary": {
+            "$value": "#ffdc52",
+            "$type": "color",
+            "filePath": "tokens/themes/rei-dot-com/color.json5",
+            "original": {
+              "$value": "#FFDC52",
+              "$type": "color"
+            }
+          }
+        },
+        "border": {
+          "button": {
+            "primary": {
+              "rest": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              },
+              "active": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              },
+              "hover": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "subtle": {
+      "color": {
+        "text": {
+          "button": {
+            "primary-hover": {
+              "$value": "#13352c",
+              "$type": "color",
+              "filePath": "tokens/themes/rei-dot-com/button.json5",
+              "original": {
+                "$value": "#13352C",
+                "$type": "color"
+              }
+            }
+          },
+          "primary": {
+            "$value": "#13352c",
+            "$type": "color",
+            "filePath": "tokens/themes/rei-dot-com/color.json5",
+            "original": {
+              "$value": "#13352C",
+              "$type": "color"
+            }
+          }
+        },
+        "background": {
+          "button": {
+            "primary": {
+              "rest": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              },
+              "active": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              }
+            }
+          },
+          "primary": {
+            "$value": "#bfb33e",
+            "$type": "color",
+            "filePath": "tokens/themes/rei-dot-com/color.json5",
+            "original": {
+              "$value": "#BFB33E",
+              "$type": "color"
+            }
+          }
+        },
+        "border": {
+          "button": {
+            "primary": {
+              "rest": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              },
+              "active": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              },
+              "hover": {
+                "$value": "#13352c",
+                "$type": "color",
+                "filePath": "tokens/themes/rei-dot-com/button.json5",
+                "original": {
+                  "$value": "#13352C",
+                  "$type": "color"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
 }