[TASK] Split input border and general border colors

benjaminkott · Jun 20, 2023 · 39ed5cd · 39ed5cd
1 parent 8dc41ea
commit 39ed5cd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 35 deletions.
diff --git a/Configuration/TypoScript/Bootstrap5/constants.typoscript b/Configuration/TypoScript/Bootstrap5/constants.typoscript
@@ -14,29 +14,6 @@ plugin.bootstrap_package {
     settings {
         scss {
 
-            # cat=bootstrap 5.x: styling/bp5_001/001; type=string; label=$white:
-            white = #ffffff
-            # cat=bootstrap 5.x: styling/bp5_001/002; type=string; label=$gray-100:
-            gray-100 = #f8f8f8
-            # cat=bootstrap 5.x: styling/bp5_001/003; type=string; label=$gray-200:
-            gray-200 = #e9e9e9
-            # cat=bootstrap 5.x: styling/bp5_001/004; type=string; label=$gray-300:
-            gray-300 = #dedede
-            # cat=bootstrap 5.x: styling/bp5_001/005; type=string; label=$gray-400:
-            gray-400 = #cecece
-            # cat=bootstrap 5.x: styling/bp5_001/006; type=string; label=$gray-500:
-            gray-500 = #ababab
-            # cat=bootstrap 5.x: styling/bp5_001/007; type=string; label=$gray-600:
-            gray-600 = #6c6c6c
-            # cat=bootstrap 5.x: styling/bp5_001/008; type=string; label=$gray-700:
-            gray-700 = #494949
-            # cat=bootstrap 5.x: styling/bp5_001/009; type=string; label=$gray-800:
-            gray-800 = #313131
-            # cat=bootstrap 5.x: styling/bp5_001/010; type=string; label=$gray-900:
-            gray-900 = #212121
-            # cat=bootstrap 5.x: styling/bp5_001/011; type=string; label=$black:
-            black = #000000
-
             # cat=bootstrap 5.x: styling/bp5_002/001; type=string; label=$primary:
             primary = #577760
             # cat=bootstrap 5.x: styling/bp5_002/002; type=string; label=$secondary:

diff --git a/Resources/Public/Css/bootstrap5-rte.css b/Resources/Public/Css/bootstrap5-rte.css
@@ -111,7 +111,7 @@
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
-  --bs-border-color: #6c6c6c;
+  --bs-border-color: #cecece;
   --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
   --bs-border-radius: 0.375rem;
   --bs-border-radius-sm: 0.25rem;
@@ -2158,7 +2158,7 @@ progress {
   color: var(--bs-body-color);
   background-color: var(--bs-body-bg);
   background-clip: padding-box;
-  border: var(--bs-border-width) solid var(--bs-border-color);
+  border: var(--bs-border-width) solid #959595;
   appearance: none;
   border-radius: var(--bs-border-radius);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
@@ -2345,7 +2345,7 @@ textarea.form-control-lg {
   background-repeat: no-repeat;
   background-position: right 0.75rem center;
   background-size: 16px 12px;
-  border: var(--bs-border-width) solid var(--bs-border-color);
+  border: var(--bs-border-width) solid #959595;
   border-radius: var(--bs-border-radius);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
   transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -2821,7 +2821,7 @@ textarea.form-control-lg {
   text-align: center;
   white-space: nowrap;
   background-color: var(--bs-tertiary-bg);
-  border: var(--bs-border-width) solid var(--bs-border-color);
+  border: var(--bs-border-width) solid #959595;
   border-radius: var(--bs-border-radius);
 }
 

diff --git a/Resources/Public/Css/bootstrap5-rte.min.css b/Resources/Public/Css/bootstrap5-rte.min.css
diff --git a/Resources/Public/Css/bootstrap5-theme.css b/Resources/Public/Css/bootstrap5-theme.css
@@ -111,7 +111,7 @@
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
-  --bs-border-color: #6c6c6c;
+  --bs-border-color: #cecece;
   --bs-border-color-translucent: rgba(0, 0, 0, 0.175);
   --bs-border-radius: 0.375rem;
   --bs-border-radius-sm: 0.25rem;
@@ -2158,7 +2158,7 @@ progress {
   color: var(--bs-body-color);
   background-color: var(--bs-body-bg);
   background-clip: padding-box;
-  border: var(--bs-border-width) solid var(--bs-border-color);
+  border: var(--bs-border-width) solid #959595;
   appearance: none;
   border-radius: var(--bs-border-radius);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
@@ -2345,7 +2345,7 @@ textarea.form-control-lg {
   background-repeat: no-repeat;
   background-position: right 0.75rem center;
   background-size: 16px 12px;
-  border: var(--bs-border-width) solid var(--bs-border-color);
+  border: var(--bs-border-width) solid #959595;
   border-radius: var(--bs-border-radius);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
   transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -2821,7 +2821,7 @@ textarea.form-control-lg {
   text-align: center;
   white-space: nowrap;
   background-color: var(--bs-tertiary-bg);
-  border: var(--bs-border-width) solid var(--bs-border-color);
+  border: var(--bs-border-width) solid #959595;
   border-radius: var(--bs-border-radius);
 }
 

diff --git a/Resources/Public/Css/bootstrap5-theme.min.css b/Resources/Public/Css/bootstrap5-theme.min.css
diff --git a/Resources/Public/Scss/bootstrap5/_variables.scss b/Resources/Public/Scss/bootstrap5/_variables.scss
@@ -137,6 +137,7 @@ $accordion-body-padding-x:          $accordion-padding-x !default;
 $carousel-control-opacity:          .8 !default;
 
 //
-// Components
+// Input
 //
-$border-color:                      $gray-600 !default;
+$border-color:                      $gray-400 !default;
+$input-border-color:                #959595 !default;