Merge pull request #42 from cosmetics-ref-elc/chrisBranch

Chris branch
cosmetics-ref-elc · Mar 18, 2023 · de658a5 · de658a5
2 parents c476c4c + ab0b758
commit de658a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/App.js b/src/App.js
@@ -26,4 +26,4 @@ const App = () => {
   );
 }
 
-export default App;
+export default App;
diff --git a/src/components/ProductPage.js b/src/components/ProductPage.js
@@ -84,6 +84,7 @@ const ProductPage = () => {
         {activeTab === "colorDescription" && (
           <div className="tabContent">
             <p>{activeShade.description}</p>
+            <p>Alt Names: {activeShade.color_alt_names}</p>
           </div>
         )}
 

diff --git a/src/styles/partials/_productPage.scss b/src/styles/partials/_productPage.scss
@@ -5,6 +5,7 @@
   display: flex;
   margin: 5% 10%;
   gap: 6%;
+  min-height: 65vh;
 
   @include mobile {
     @include flexDefault;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ const App = () => { @@
       );
     }
-    export default App;
+    export default App;