Merge branch 'main' of https://github.com/SnowSE/KakeysBakery

SnowSE · Mar 19, 2024 · e5afb56 · e5afb56
2 parents 2ea9797 + 0338235
commit e5afb56
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/KakeysBakery/Components/Pages/Cart.razor b/KakeysBakery/Components/Pages/Cart.razor
@@ -6,7 +6,7 @@
 
 <div class="align-content-center p-5" id="totalCart">
     <div class="text-center">
-        <h2> YOUR CART </h2>
+        <h2 id="pageTitle"> YOUR CART </h2>
     </div>
 
 
@@ -16,8 +16,8 @@
                 <tr>
                     <th scope="col"></th>
                     <th scope="col"></th>
-                    <th class="px-3" scope="col">Qty</th>
-                    <th class="px-3" scope="col">Price</th>
+                    <th class="px-3 itemDescription" scope="col">Qty</th>
+                    <th class="px-3 itemDescription" scope="col">Price</th>
                 </tr>
             <tr><td colspan="4"><hr /></td></tr>
             </thead>
@@ -27,7 +27,7 @@
                     <tr class="cartCard flex-row">
                         <td class="pe-4"><img src="images/cookie.jpg" /></td>
                         <td>
-                            <h1>Some Item Name</h1>
+                            <h1 class="itemName">Some Item Name</h1>
                             <p class="itemDescription">
                                 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
                                 Aliquam vel ex nec erat sollicitudin mattis id quis est.
@@ -43,14 +43,14 @@
                                 Maecenas varius vitae nisi id tempus.
                             </p>
                         </td>
-                        <td class="ps-4">1x</td>
-                        <td class="px-3">$5.00</td>
+                        <td class="ps-4 itemDescription">1x</td>
+                        <td class="px-3 itemDescription">$5.00</td>
                     </tr>
                     <tr><td colspan="4"><hr /></td></tr>
 
                 }
                 <tr id="">
-                    <td colspan="4" style="text-align: right;">TOTAL: $10.00</td>
+                    <td colspan="4" style="text-align: right;" class="itemDescription">TOTAL: $10.00</td>
                 </tr>
             </tbody>
         </table>

diff --git a/KakeysBakery/Components/Pages/Cart.razor.css b/KakeysBakery/Components/Pages/Cart.razor.css
@@ -1,13 +1,23 @@
-body {
+@font-face {
+    font-family: testFont;
+    src: url(Fonts/cartFont2.otf) format('opentype');
+}
+
+@font-face {
+    font-family: testFont2;
+    src: url(Fonts/cartFont3.otf) format('opentype');
+}
+
+body {
     background-color: green;
 }
 
 .itemName {
-    padding-left: 5%;
+    font-family: testFont2;
 }
 
 .itemDescription {
-
+    font-family: serif;
 }
 
 .itemImage {
@@ -31,10 +41,13 @@
 }
 
 #totalCart {
-    /*background-color: #EBDCCE;*/
 }
 
 #totalTable {
     padding-right: 100px;
 }
 
+#pageTitle {
+    font-family: testFont2;
+}
+
diff --git a/KakeysBakery/wwwroot/Fonts/cartFont.otf b/KakeysBakery/wwwroot/Fonts/cartFont.otf
diff --git a/KakeysBakery/wwwroot/Fonts/cartFont2.otf b/KakeysBakery/wwwroot/Fonts/cartFont2.otf
diff --git a/KakeysBakery/wwwroot/Fonts/cartFont3.otf b/KakeysBakery/wwwroot/Fonts/cartFont3.otf