chore: fix conflicts

Codeinwp · Nov 20, 2023 · 142b81d · 142b81d
1 parent 004a372
commit 142b81d
Show file tree

Hide file tree

Showing 12 changed files with 547 additions and 432 deletions.
diff --git a/styles/apple-clean.json b/styles/apple-clean.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#B23E3E",
           "name": "Accent Secondary"
         }

diff --git a/styles/blue-cream.json b/styles/blue-cream.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#222B81",
           "name": "Accent Secondary"
         }

diff --git a/styles/blue-retro.json b/styles/blue-retro.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#F7B81C",
           "name": "Accent Secondary"
         }

diff --git a/styles/clean-cut.json b/styles/clean-cut.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#0F100F",
           "name": "Accent Secondary"
         }

diff --git a/styles/dark-fit.json b/styles/dark-fit.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#34654E",
           "name": "Accent Secondary"
         }

diff --git a/styles/garden-flow.json b/styles/garden-flow.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#3F5A41",
           "name": "Accent Secondary"
         }

diff --git a/styles/green-corn.json b/styles/green-corn.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#F99E34",
           "name": "Accent Secondary"
         }

diff --git a/styles/light-serif.json b/styles/light-serif.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#0F0F0F",
           "name": "Accent Secondary"
         }

diff --git a/styles/night-owl.json b/styles/night-owl.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#4C32B4",
           "name": "Accent Secondary"
         }

diff --git a/styles/purple-dawn.json b/styles/purple-dawn.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#D45A3A",
           "name": "Accent Secondary"
         }

diff --git a/styles/wooden.json b/styles/wooden.json
@@ -31,7 +31,7 @@
           "name": "Accent"
         },
         {
-          "slug": "ti-accent-secondary",
+          "slug": "raft-accent-secondary",
           "color": "#3E3428",
           "name": "Accent Secondary"
         }