From 308af338c0846b52485e61cc7f3d09232fbb3bbe Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 1 Jun 2018 16:58:24 -0400
Subject: [PATCH] rename borderColor theme variables

---
 src/scss/list.scss      | 2 +-
 src/scss/modal.scss     | 4 ++--
 src/scss/variables.scss | 6 +++---
 src/scss/vault.scss     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/scss/list.scss b/src/scss/list.scss
index 4d4b6b6d735..ca768f7e80f 100644
--- a/src/scss/list.scss
+++ b/src/scss/list.scss
@@ -28,7 +28,7 @@
         border-bottom: 1px solid #000000;
 
         @include themify($themes) {
-            border-bottom-color: themed('borderColor');
+            border-bottom-color: themed('listItemBorderColor');
         }
     }
 
diff --git a/src/scss/modal.scss b/src/scss/modal.scss
index 867f4668b21..d7ae2fa80c1 100644
--- a/src/scss/modal.scss
+++ b/src/scss/modal.scss
@@ -203,7 +203,7 @@ $close-text-shadow: 0 1px 0 $white !default;
     //@include border-top-radius($border-radius-lg);
 
     @include themify($themes) {
-        border-bottom-color: themed('borderColorDark');
+        border-bottom-color: themed('borderColor');
     }
 
     .close {
@@ -249,7 +249,7 @@ $close-text-shadow: 0 1px 0 $white !default;
     border-top: $modal-footer-border-width solid $modal-footer-border-color;
 
     @include themify($themes) {
-        border-top-color: themed('borderColorDark');
+        border-top-color: themed('borderColor');
     }
 
     // Easily place margin between footer elements
diff --git a/src/scss/variables.scss b/src/scss/variables.scss
index c3b0aabf2a2..9d3f299e829 100644
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@@ -39,8 +39,7 @@ $button-color-danger: darken($brand-danger, 10%);
 $themes: (
     light: (
         textColor: $text-color,
-        borderColor: $border-color,
-        borderColorDark: $border-color-dark,
+        borderColor: $border-color-dark,
         backgroundColor: $background-color,
         backgroundColorAlt: $background-color-alt,
         backgroundColorAlt2: $background-color-alt2,
@@ -57,6 +56,7 @@ $themes: (
         headerInputPlaceholderColor: lighten($brand-primary, 35%),
         listItemBackgroundColor: $background-color,
         listItemBackgroundHoverColor: $list-item-hover,
+        listItemBorderColor: $border-color,
         groupingsActiveColor: darken($background-color-alt, 5%),
         disabledIconColor: $list-icon-color,
         headingColor: $gray-light,
@@ -86,7 +86,6 @@ $themes: (
     dark: (
         textColor: #ffffff,
         borderColor: #2f2f2f,
-        borderColorDark: #2f2f2f,
         backgroundColor: #363636,
         backgroundColorAlt: #3d3d3d,
         backgroundColorAlt2: #222222,
@@ -103,6 +102,7 @@ $themes: (
         headerInputPlaceholderColor: #707070,
         listItemBackgroundColor: #363636,
         listItemBackgroundHoverColor: #3c3c3c,
+        listItemBorderColor: #2f2f2f,
         groupingsActiveColor: #292929,
         disabledIconColor: #c7c7cd,
         headingColor: #a3a3a3,
diff --git a/src/scss/vault.scss b/src/scss/vault.scss
index 18e33d0d2ab..09bffe6f93b 100644
--- a/src/scss/vault.scss
+++ b/src/scss/vault.scss
@@ -21,7 +21,7 @@
 
         @include themify($themes) {
             background-color: themed('backgroundColorAlt');
-            border-right-color: themed('borderColorDark');
+            border-right-color: themed('borderColor');
         }
 
         .inner-content {
@@ -141,7 +141,7 @@
         
         @include themify($themes) {
             background-color: themed('backgroundColor');
-            border-right-color: themed('borderColorDark');
+            border-right-color: themed('borderColor');
         }
 
         .no-items {
@@ -302,7 +302,7 @@
 
         @include themify($themes) {
             background-color: themed('backgroundColorAlt');
-            border-top-color: themed('borderColorDark');
+            border-top-color: themed('borderColor');
         }
 
         button {