Merge pull request #71 from caripizza/caripizza/68-remove-border-conf…

…licts-update-vars feat: Remove border conflicts with bg's, update Sass vars hex values
Esri · Jun 25, 2021 · 1952c50 · 1952c50
2 parents ba782b1 + a15b9c9
commit 1952c50
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.0.1 - 2021-06-03
+
+#### SASS variable updates
+
+- :warning: `$ui-border-2-light` is now `#d4d4d4` (`$blk-040`)
+- :warning: `$ui-border-3-light` is now `#dfdfdf` (`$blk-030`)
+- :warning: `$ui-border-1-dark` is now `#555555` (`$blk-160`)
+- :warning: `$ui-border-2-dark` is now `#4a4a4a` (`$blk-170`)
+- :warning: `$ui-border-3-dark` is now `#404040` (`$blk-180`)
+
+#### CSS variable updates
+
+- Light theme `--calcite-ui-border-2` is now `#d4d4d4` (`$ui-border-2-light`)
+- Light theme `--calcite-ui-border-3` is now `#dfdfdf` (`$ui-border-3-light`)
+- Dark theme `--calcite-ui-border-1` is now `#555555` (`$ui-border-1-dark`)
+- Dark theme `--calcite-ui-border-2` is now `#4a4a4a` (`$ui-border-2-dark`)
+- Dark theme `--calcite-ui-border-3` is now `#404040` (`$ui-border-3-dark`)
+
 ## 6.0.0 - 2021-01-28
 ### Breaking Changes
 

diff --git a/dist/colors.js b/dist/colors.js
diff --git a/dist/colors.js.map b/dist/colors.js.map
diff --git a/dist/colors.modern.js b/dist/colors.modern.js
diff --git a/dist/colors.modern.js.map b/dist/colors.modern.js.map
diff --git a/dist/colors.module.js b/dist/colors.module.js
diff --git a/dist/colors.module.js.map b/dist/colors.module.js.map
diff --git a/dist/colors.scss b/dist/colors.scss
@@ -488,8 +488,8 @@ $ui-text-3-light: #6a6a6a;
 $ui-text-inverse-light: #FFFFFF;
 $ui-text-link-light: #00619b;
 $ui-border-1-light: #cacaca;
-$ui-border-2-light: #dfdfdf;
-$ui-border-3-light: #eaeaea;
+$ui-border-2-light: #d4d4d4;
+$ui-border-3-light: #dfdfdf;
 $ui-border-input-light: #949494;
 $ui-info-light: #00619b;
 $ui-success-light: #35ac46;
@@ -534,9 +534,9 @@ $ui-text-2-dark: #bfbfbf;
 $ui-text-3-dark: #9f9f9f;
 $ui-text-inverse-dark: #151515;
 $ui-text-link-dark: #00A0FF;
-$ui-border-1-dark: #4a4a4a;
-$ui-border-2-dark: #404040;
-$ui-border-3-dark: #353535;
+$ui-border-1-dark: #555555;
+$ui-border-2-dark: #4a4a4a;
+$ui-border-3-dark: #404040;
 $ui-border-input-dark: #757575;
 $ui-info-dark: #00A0FF;
 $ui-success-dark: #36DA43;

diff --git a/dist/colors.umd.js b/dist/colors.umd.js
diff --git a/dist/colors.umd.js.map b/dist/colors.umd.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/colors.js b/src/colors.js
@@ -807,8 +807,8 @@ export const themes = [
             "text-inverse": "#FFFFFF",
             "text-link": "#00619b",
             "border-1": "#cacaca",
-            "border-2": "#dfdfdf",
-            "border-3": "#eaeaea",
+            "border-2": "#d4d4d4",
+            "border-3": "#dfdfdf",
             "border-input": "#949494",
             info: "#00619b",
             success: "#35ac46",
@@ -833,9 +833,9 @@ export const themes = [
             "text-3": "#9f9f9f",
             "text-inverse": "#151515",
             "text-link": "#00A0FF",
-            "border-1": "#4a4a4a",
-            "border-2": "#404040",
-            "border-3": "#353535",
+            "border-1": "#555555",
+            "border-2": "#4a4a4a",
+            "border-3": "#404040",
             "border-input": "#757575",
             info: "#00A0FF",
             success: "#36DA43",

diff --git a/src/colors.ts b/src/colors.ts
@@ -846,8 +846,8 @@ export const themes: Theme[] = [
       "text-inverse": "#FFFFFF",
       "text-link": "#00619b",
       "border-1": "#cacaca",
-      "border-2": "#dfdfdf",
-      "border-3": "#eaeaea",
+      "border-2": "#d4d4d4",
+      "border-3": "#dfdfdf",
       "border-input": "#949494",
       info: "#00619b",
       success: "#35ac46",
@@ -872,9 +872,9 @@ export const themes: Theme[] = [
       "text-3": "#9f9f9f",
       "text-inverse": "#151515",
       "text-link": "#00A0FF",
-      "border-1": "#4a4a4a",
-      "border-2": "#404040",
-      "border-3": "#353535",
+      "border-1": "#555555",
+      "border-2": "#4a4a4a",
+      "border-3": "#404040",
       "border-input": "#757575",
       info: "#00A0FF",
       success: "#36DA43",