CSS changes

SnowSE · Mar 19, 2024 · a0d942e · a0d942e
1 parent e5afb56
commit a0d942e
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 19 deletions.
diff --git a/KakeysBakery/Components/Layout/NavMenu.razor b/KakeysBakery/Components/Layout/NavMenu.razor
@@ -12,8 +12,8 @@
 
         <div class="collapse navbar-collapse py-3" id="navbarSupportedContent">
             <div class="navbar-nav ms-auto me-auto mb-2 mb-lg-0 position-relative">
-                <span class="d-none d-lg-block position-absolute top-100 start-0 translate-middle p-5 my-5" style="z-index:1">
-                    <img class="mt-5 pt-5" style="width:60%; height:auto;" src="images/BlackLogo.png" />
+                <span class="d-none d-lg-block position-absolute translate-middle p-5 my-5" style="z-index:1">
+                    <img class="" style="width:40%; left:40px" src="images/BlackLogo.png" />
                 </span>
 
                 <NavLink class="nav-link mx-1" href="#" style="z-index:2" Match="NavLinkMatch.All">

diff --git a/KakeysBakery/Components/Pages/Admin.razor b/KakeysBakery/Components/Pages/Admin.razor
@@ -2,10 +2,7 @@
 @inject ICustomerService customer
 @inject IProductService product
 @inject IPurchaseService purchase
-
-<h3>Admin</h3>
-
-
+<h1>ALL ORDERS</h1>
 <div class="align-content-center bg-light">
     <table class="table table-striped">
         <thead>
@@ -20,19 +17,19 @@
 
                 <td>Mark</td>
                 <td>Otto</td>
-                <td></td>
+                <td>testEmail@something.com</td>
             </tr>
             <tr>
 
                 <td>Jacob</td>
                 <td>Thornton</td>
-                <td></td>
+                <td>testEmail@something.com</td>
             </tr>
             <tr>
 
                 <td>Larry</td>
                 <td>the Bird</td>
-                <td></td>
+                <td>testEmail@something.com</td>
             </tr>
         </tbody>
     </table>

diff --git a/KakeysBakery/Components/Pages/Admin.razor.css b/KakeysBakery/Components/Pages/Admin.razor.css
@@ -0,0 +1,21 @@
+@font-face {
+    font-family: testFont;
+    src: url(Fonts/cartFont2.otf) format('opentype');
+}
+
+@font-face {
+    font-family: testFont2;
+    src: url(Fonts/cartFont3.otf) format('opentype');
+}
+
+
+h1 {
+    margin: auto;
+    width: 100%;
+    text-align: center;
+    padding: 30px;
+}
+
+td {
+
+}
diff --git a/KakeysBakery/Components/Pages/Cart.razor b/KakeysBakery/Components/Pages/Cart.razor
@@ -50,7 +50,7 @@
 
                 }
                 <tr id="">
-                    <td colspan="4" style="text-align: right;" class="itemDescription">TOTAL: $10.00</td>
+                    <td colspan="4" style="text-align: right;" class="itemDescription" id="displayTotal">TOTAL: $10.00</td>
                 </tr>
             </tbody>
         </table>

diff --git a/KakeysBakery/Components/Pages/Cart.razor.css b/KakeysBakery/Components/Pages/Cart.razor.css
@@ -8,10 +8,6 @@
     src: url(Fonts/cartFont3.otf) format('opentype');
 }
 
-body {
-    background-color: green;
-}
-
 .itemName {
     font-family: testFont2;
 }
@@ -51,3 +47,8 @@ body {
     font-family: testFont2;
 }
 
+#displayTotal {
+    font-size: 200%;
+    font: bold;
+}
+
diff --git a/KakeysBakery/Components/Pages/Order.razor b/KakeysBakery/Components/Pages/Order.razor
@@ -7,7 +7,7 @@
 
 @rendermode InteractiveServer
 
-<h3>Order</h3>
+<h3 class="pageTitle">Order</h3>
 
 
 <Modal @ref="modal" Title="Modal title">
@@ -31,17 +31,17 @@
     </FooterTemplate>
 </Modal>
 
-<div class="mt-5 bg-light border vh-100">
+<div class="mt-5 border vh-100 totalPage">
     <div class="d-flex flex-wrap justify-content-between p-5 mt-5">
         @if (basegoodtypes != null)
         {
             @foreach (Basegoodtype basegoodtype in basegoodtypes)
             {
 
                 <div class="p-3 d-flex flex-column position-relative" style="width: 30rem;">
+                    <h3 class="typelabel">@basegoodtype.Basegood</h3>
                     <img class="imgbutton img-fluid img-thumbnail rounded-5 shadow" src="images/SweetnessCupcakes.png">
                     <button @onclick="async () => {await BaseGoodClicked(basegoodtype.Id); await OnShowModalClick();}" class="btn cartbutton"><i class="bi bi-cart-plus h1 px-3 cart" /></button>
-                    <p>@basegoodtype.Basegood</p>
                 </div>
 
             }

diff --git a/KakeysBakery/Components/Pages/Order.razor.css b/KakeysBakery/Components/Pages/Order.razor.css
@@ -1,19 +1,55 @@
-.imgbutton {
+@font-face {
+    font-family: testFont;
+    src: url(Fonts/cartFont2.otf) format('opentype');
+}
+
+@font-face {
+    font-family: testFont2;
+    src: url(Fonts/cartFont3.otf) format('opentype');
+}
+
+
+.imgbutton {
     /*height: auto;*/
     object-fit: cover;
     aspect-ratio: 1/1;
 }
 
 .cartbutton {
     position: absolute;
-    top: 73%;
+    top: 80%;
     left: 70%;
     background-color: #E8A87C;
     border-color: #4E362E;
     border-style: solid;
     border-width: 3px;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+}
+
+    .cartbutton:hover {
+        border-color: white;
+    }
+
+.typelabel{
+    position: absolute;
+    top: 10%;
+    text-align: right;
+    width: 85%;
+    font-family: testFont;
+    font-size: 225%;
 }
 
 .cart {
     color: #4E362E;
+}
+
+.pageTitle {
+    width: 100%;
+    text-align: center;
+    font-family: testFont2;
+    font-size: 300%;
+}
+
+.totalPage {
+    background-color: #EBDCCE;
 }