Merge pull request #142 from movableink/nicksteffens/sc-86341/color-a…

…djustments Nicksteffens/sc 86341/color adjustments
movableink · Aug 10, 2023 · 6683a3e · 6683a3e
2 parents 9ae1d42 + 8c2b328
commit 6683a3e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/addon/components/fluid-date-input.hbs b/addon/components/fluid-date-input.hbs
@@ -5,7 +5,7 @@
     (if
       @hasWarning
       "border-orange-400 focus:ring-orange-200"
-      "border-neutral-400 focus:border-blue-300 focus:ring-blue-200"
+      "border-neutral-300 focus:border-blue-300 focus:ring-blue-200"
     )
   )
   as |borderStyle|

diff --git a/addon/components/fluid-date-input/power-calendar-days.hbs b/addon/components/fluid-date-input/power-calendar-days.hbs
@@ -29,7 +29,7 @@
                 (if
                   day.isCurrentMonth
                   "border-white hover:border-blue-300"
-                  "border-white hover:border-neutral-400 text-neutral-500"
+                  "border-white hover:border-neutral-300 text-neutral-500"
                 )
               )
             )

diff --git a/addon/components/fluid-select.hbs b/addon/components/fluid-select.hbs
@@ -19,7 +19,7 @@
             defaultClass=(concat
               "fluid-select__wrapper"
               (if @dark " ember-basic-dropdown-content--dark")
-              " rounded border border-neutral-400"
+              " rounded border border-neutral-300"
             )
           )
           trigger=(component

diff --git a/addon/components/fluid-text-input.hbs b/addon/components/fluid-text-input.hbs
@@ -8,7 +8,7 @@
       (if
         @hasWarning
         "border-orange-400 focus-within:ring-orange-200"
-        "border-neutral-400 focus-within:border-blue-300 focus-within:ring-blue-200"
+        "border-neutral-300 focus-within:border-blue-300 focus-within:ring-blue-200"
       )
     )
   )

diff --git a/app/styles/fluid/components/radio-block.scss b/app/styles/fluid/components/radio-block.scss
@@ -12,7 +12,7 @@
 }
 
 .radio-block {
-  @apply mb-6 border-solid border-2 border-neutral-400 rounded p-2 bg-neutral-100;
+  @apply mb-6 border-solid border-2 border-neutral-300 rounded p-2 bg-neutral-100;
 
   overflow: hidden;
 

diff --git a/app/styles/fluid/functional-components/fluid-input.scss b/app/styles/fluid/functional-components/fluid-input.scss
@@ -1,5 +1,5 @@
 .fluid-input {
-  @apply border border-neutral-400 rounded-sm inline-block py-1 px-2 shadow-sm;
+  @apply border border-neutral-300 rounded-sm inline-block py-1 px-2 shadow-sm;
   font-size: 16px;
   color: theme('colors.neutral.700');
   font-family: 'Open Sans';

diff --git a/app/styles/fluid/functional-components/fluid-panel.scss b/app/styles/fluid/functional-components/fluid-panel.scss
@@ -1,5 +1,5 @@
 .fluid-panel {
-  @apply bg-neutral-50 border border-neutral-400 rounded p-4 mb-6 shadow-sm;
+  @apply bg-neutral-50 border border-neutral-300 rounded p-4 mb-6 shadow-sm;
 
   overflow: hidden;
 
@@ -15,7 +15,7 @@
   }
 
   &__header + &__body {
-    @apply border-t border-neutral-400;
+    @apply border-t border-neutral-300;
   }
 
   &--dark {

diff --git a/app/styles/fluid/semantic/layout.scss b/app/styles/fluid/semantic/layout.scss
@@ -1,6 +1,6 @@
 .fluid {
   .container {
-    @apply border-neutral-400;
+    @apply border-neutral-300;
     @apply border;
     @apply flex-col;
     @apply flex;
@@ -19,7 +19,7 @@
       @apply flex;
       @apply flex-shrink-0;
       @apply border-b;
-      @apply border-neutral-400;
+      @apply border-neutral-300;
       @apply py-0;
       @apply px-8;
       @apply leading-3xl;

diff --git a/tests/integration/components/expanding-list-test.js b/tests/integration/components/expanding-list-test.js
@@ -115,9 +115,9 @@ module('Integration | component | fluid-lab/expanding-list', function (hooks) {
           <FluidLab::ExpandingList as |list|>
             <list.Header>
               {{list.Toggle}}
-              <h5>
+              <h6>
                 Expanded w/toggle
-              </h5>
+              </h6>
             </list.Header>
             <list.Content>
               <section data-test-expanded-with-toggle-content>
@@ -141,9 +141,9 @@ module('Integration | component | fluid-lab/expanding-list', function (hooks) {
           <FluidLab::ExpandingList @expanded={{false}} as |list|>
             <list.Header>
               {{list.Toggle}}
-              <h5>
+              <h6>
                 Collapsed w/toggle
-              </h5>
+              </h6>
             </list.Header>
             <list.Content>
               <section data-test-collapsed-with-toggle-content>
@@ -166,9 +166,9 @@ module('Integration | component | fluid-lab/expanding-list', function (hooks) {
           </FluidLab::ExpandingList>
           <FluidLab::ExpandingList @disabled={{true}} as |list|>
             <list.Header>
-              <h5>
+              <h6>
                 Expanded w/o toggle
-              </h5>
+              </h6>
             </list.Header>
             <list.Content>
               <section data-test-expanded-without-toggle-content>
@@ -192,9 +192,9 @@ module('Integration | component | fluid-lab/expanding-list', function (hooks) {
           <FluidLab::ExpandingList @disabled={{true}} as |list|>
             <list.Header>
               {{list.Toggle}}
-              <h5>
+              <h6>
                 Disabled w/toggle
-              </h5>
+              </h6>
             </list.Header>
             <list.Content>
               <section data-test-disabled-with-toggle-content>