Merge pull request #74 from Esri/chore/merge-conflicts

chore: fix merge conflicts
Esri · Mar 21, 2023 · 2f9193b · 2f9193b
2 parents f770d74 + 7f7bef0
commit 2f9193b
Show file tree

Hide file tree

Showing 15 changed files with 1,651 additions and 30 deletions.
diff --git a/tokens/$metadata.json b/tokens/$metadata.json
@@ -5,15 +5,23 @@
     "component/accordion-item",
     "component/accordion",
     "component/action",
-    "component/alert",
-    "component/avatar",
     "component/button",
     "component/fab",
-    "component/card",
     "component/checkbox",
     "component/chip",
-    "component/combobox",
     "component/dropdown",
+    "component/action-bar",
+    "component/action-bar-grid",
+    "component/action-pad",
+    "component/action-pad-grid",
+    "component/alert",
+    "component/avatar",
+    "component/block",
+    "component/block-section",
+    "component/card",
+    "component/checkbox",
+    "component/chip",
+    "component/date-picker",
     "component/color-picker",
     "component/input-date-picker",
     "component/input-datetime-local",
@@ -28,15 +36,19 @@
     "component/input-time",
     "component/input-text",
     "component/input-week",
-    "component/textarea",
     "component/date-picker",
+    "component/modal-medium",
+    "component/notice",
+    "component/textarea",
     "component/label",
     "component/link",
     "component/loader",
     "component/radio",
     "component/tab-title",
     "component/tabs",
     "component/rating",
+    "component/tab-title",
+    "component/tabs",
     "component/tip",
     "component/tooltip",
     "component/pagination",
@@ -46,7 +58,6 @@
     "component/switch",
     "component/[template-comp-name]",
     "component/accordion_backup",
-    "component/accordion_backup_Copy",
     "calcite/light",
     "calcite/dark",
     "brand/global",

diff --git a/tokens/$themes.json b/tokens/$themes.json
@@ -248,9 +248,18 @@
       "component/input-text": "enabled",
       "component/input-week": "enabled",
       "component/textarea": "enabled",
+      "component/tab-title": "enabled",
       "component/card": "enabled",
       "component/tabs": "enabled",
-      "component/tab-title": "enabled"
+      "component/action-bar": "enabled",
+      "component/action": "enabled",
+      "component/action-pad": "enabled",
+      "component/action-bar-grid": "enabled",
+      "component/action-pad-grid": "enabled",
+      "component/block": "enabled",
+      "component/block-section": "enabled",
+      "component/notice": "enabled",
+      "component/modal-medium": "enabled"
     },
     "$figmaStyleReferences": {
       "semantic.ui.color.brand.default.light": "S:959c4907a32cb62f2227db1c3fb7a88c3eedcbb9,",
@@ -776,4 +785,4 @@
       "semantic.font.hierarchy.caption": "S:d6be2a748447ac294a2d54be64dfe3a965256f85,"
     }
   }
-]
+]
diff --git a/tokens/calcite/dark.json b/tokens/calcite/dark.json
@@ -1192,43 +1192,210 @@
         }
       },
       "action": {
+        "indicator": {
+          "value": "$action.indicator.dark",
+          "type": "color"
+        },
+        "font": {
+          "value": "$action.font.dark",
+          "type": "color"
+        },
+        "icon": {
+          "value": "$action.icon.dark",
+          "type": "color"
+        },
         "background": {
           "default": {
-            "value": "$action.background.default.light",
+            "value": "$action.background.default.dark",
             "type": "color"
           },
           "active": {
-            "value": "$action.background.active.light",
+            "value": "$action.background.active.dark",
             "type": "color"
           }
+        }
+      },
+      "action-bar": {
+        "border": {
+          "value": "$action-bar.border.dark",
+          "type": "color"
         },
-        "indicator": {
-          "value": "$action.indicator.light",
+        "background": {
+          "value": "$action-bar.background.dark",
+          "type": "color"
+        }
+      },
+      "action-pad": {
+        "border": {
+          "value": "$action-pad.border.dark",
+          "type": "color"
+        },
+        "background": {
+          "value": "$action-pad.background.dark",
+          "type": "color"
+        }
+      },
+      "action-bar-grid": {
+        "border": {
+          "value": "$action-bar-grid.border.dark",
+          "type": "color"
+        },
+        "background": {
+          "value": "$action-bar-grid.background.dark",
+          "type": "color"
+        }
+      },
+      "action-pad-grid": {
+        "border": {
+          "value": "$action-pad-grid.border.dark",
           "type": "color"
         },
+        "background": {
+          "value": "$action-pad-grid.background.dark",
+          "type": "color"
+        }
+      },
+      "block": {
         "font": {
-          "default": {
-            "value": "$action.font.default.light",
+          "heading": {
+            "value": "$block.font.heading.dark",
             "type": "color"
           },
-          "active": {
-            "value": "$action.font.active.light",
+          "description": {
+            "value": "$block.font.description.dark",
+            "type": "color"
+          },
+          "content": {
+            "value": "$block.font.content.dark",
             "type": "color"
           }
         },
         "icon": {
           "default": {
-            "value": "$action.icon.default.light",
+            "value": "$action.icon.default.dark",
             "type": "color"
           },
           "active": {
-            "value": "$action.icon.active.light",
+            "value": "$action.icon.active.dark",
             "type": "color"
           }
         },
         "loader": {
-          "value": "$action.loader-icon.light",
+          "value": "$action.loader-icon.dark",
+          "type": "color"
+        }
+          "idle": {
+            "value": "$block.icon.idle.dark",
+            "type": "color"
+          },
+          "valid": {
+            "value": "$block.icon.valid.dark",
+            "type": "color"
+          },
+          "invalid": {
+            "value": "$block.icon.invalid.dark",
+            "type": "color"
+          },
+          "drag-handle": {
+            "value": "$block.icon.drag-handle.dark",
+            "type": "color"
+          },
+          "chevron": {
+            "value": "$block.icon.chevron.dark",
+            "type": "color"
+          }
+        },
+        "border": {
+          "value": "$block.border.light",
+          "type": "color"
+        },
+        "background": {
+          "value": "$block.background.dark",
+          "type": "color"
+        }
+      },
+      "block-section": {
+        "font": {
+          "value": "$block-section.font.dark",
+          "type": "color"
+        },
+        "icon": {
+          "valid": {
+            "value": "$block-section.icon.valid.dark",
+            "type": "color"
+          },
+          "invalid": {
+            "value": "$block-section.icon.invalid.dark",
+            "type": "color"
+          },
+          "chevron": {
+            "value": "$block-section.icon.chevron.dark",
+            "type": "color"
+          }
+        },
+        "background": {
+          "value": "$block-section.background.dark",
+          "type": "color"
+        }
+      },
+      "notice": {
+        "font": {
+          "title": {
+            "value": "$notice.font.title.dark",
+            "type": "color"
+          },
+          "message": {
+            "value": "$notice.font.message.dark",
+            "type": "color"
+          }
+        },
+        "background": {
+          "value": "$notice.background.dark",
           "type": "color"
+        },
+        "icon": {
+          "info": {
+            "value": "$notice.icon.info.dark",
+            "type": "color"
+          },
+          "success": {
+            "value": "$notice.icon.success.dark",
+            "type": "color"
+          },
+          "warning": {
+            "value": "$notice.icon.warning.dark",
+            "type": "color"
+          },
+          "danger": {
+            "value": "$notice.icon.danger.dark",
+            "type": "color"
+          },
+          "brand": {
+            "value": "$notice.icon.brand.dark",
+            "type": "color"
+          }
+        },
+        "highlight": {
+          "info": {
+            "value": "$notice.highlight.info.dark",
+            "type": "color"
+          },
+          "success": {
+            "value": "$notice.highlight.success.dark",
+            "type": "color"
+          },
+          "warning": {
+            "value": "$notice.highlight.warning.dark",
+            "type": "color"
+          },
+          "danger": {
+            "value": "$notice.highlight.danger.dark",
+            "type": "color"
+          },
+          "brand": {
+            "value": "$notice.highlight.brand.dark",
+            "type": "color"
+          }
         }
       }
     }