Skip to content

Commit

Permalink
Checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@garioncox
garioncox committed Mar 19, 2024
1 parent fc79fa3 commit 2ea9797
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 141 deletions.
16 changes: 16 additions & 0 deletions KakeysBakery/Components/Layout/MainFooter.razor
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<footer class="footer mt-auto py-4 d-flex justify-content-center layout" data-bs-theme="dark">
<div class="container d-flex align-items-center justify-content-center">
<div class="col-md-4 d-flex align-items-center">
<a href="/" class="mb-3 me-2 mb-md-0 text-body-secondary text-decoration-none lh-1">
<svg class="bi" width="30" height="24"><use xlink:href="#bootstrap"></use></svg>
</a>
<span class="d-flex align-items-center justify-content-center mb-3 mb-md-0 text-body-secondary">© 2024 Company, Inc</span>
</div>

<ul class="nav col-md-4 justify-content-end list-unstyled d-flex pe-5">
<li class="ms-3"><a class="text-body-secondary" href="#"><i class="bi bi-facebook" /></a></li>
<li class="ms-3"><a class="text-body-secondary" href="#"><i class="bi bi-instagram" /></a></li>
<li class="ms-3"><a class="text-body-secondary" href="#"><i class="bi bi-twitter" /></a></li>
</ul>
</div>
</footer>
19 changes: 19 additions & 0 deletions KakeysBakery/Components/Layout/MainFooter.razor.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.bi {
display: inline-block;
position: relative;
width: 1.25rem;
height: 1.25rem;
margin-right: 0.75rem;
top: -1px;
background-size: cover;
}

.i {
font-family: Trebuchet MS;
font-size: 1.6rem;
color: #dee2e6;
}

.footer {
background-color: #4E362E
}
6 changes: 3 additions & 3 deletions KakeysBakery/Components/Layout/MainLayout.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<div class="page">
<main>
<MyNavMenu />
<NavMenu />

<article class="content px-4 mt-5 vh-100" style="background-color: #F5E5D8;">
<article class="content px-4 mt-5 min-vh-100" style="background-color: #F5E5D8;">
@Body
</article>

<MyFooter />
<MainFooter />
</main>
</div>

Expand Down
15 changes: 0 additions & 15 deletions KakeysBakery/Components/Layout/MyFooter.razor
View file

This file was deleted.

99 changes: 0 additions & 99 deletions KakeysBakery/Components/Layout/MyFooter.razor.css
View file

This file was deleted.

29 changes: 11 additions & 18 deletions ...sBakery/Components/Layout/MyNavMenu.razor → KakeysBakery/Components/Layout/NavMenu.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,42 @@
<span class="navbar-toggler-icon"></span>
</button>

<div class="d-xl-none position-absolute top-0 start-50 translate-middle-x d-flex justify-content-center">
<div class="d-xl-none position-absolute top-0 start-50 translate-middle-x d-flex justify-content-center" style="z-index:1">
<img style="width:16rem" src="images/BlackLogo.png" />
</div>

<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:0">
<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>

<NavLink class="nav-link mx-1" href="#" style="z-index:1" Match="NavLinkMatch.All">
<NavLink class="nav-link mx-1" href="#" style="z-index:2" Match="NavLinkMatch.All">
<span class="nav-item" href="#">Home</span>
</NavLink>
<NavLink class="nav-link mx-1" href="Order" style="z-index:1" Match="NavLinkMatch.All">
<NavLink class="nav-link mx-1" href="Order" style="z-index:2" Match="NavLinkMatch.All">
<span class="nav-item" href="#">Order</span>
</NavLink>
<NavLink class="nav-link mx-1" href="Customize" style="z-index:1" Match="NavLinkMatch.All">
<NavLink class="nav-link mx-1" href="Customize" style="z-index:2" Match="NavLinkMatch.All">
<span class="nav-item" href="#">Customize</span>
</NavLink>
<NavLink class="nav-link mx-1" href="AboutUs" style="z-index:1" Match="NavLinkMatch.All">
<NavLink class="nav-link mx-1" href="AboutUs" style="z-index:2" Match="NavLinkMatch.All">
<span class="nav-item" href="#">About Us</span>
</NavLink>
<NavLink class="nav-link mx-1" href="ContactUs" style="z-index:1" Match="NavLinkMatch.All">
<NavLink class="nav-link mx-1" href="ContactUs" style="z-index:2" Match="NavLinkMatch.All">
<span class="nav-item" href="#">Contact Us</span>
</NavLink>
</div>

<div class="navbar-nav mb-2 mb-lg-0" data-bs-theme="dark">
<div class="nav-item px-1 d-flex justify-content-center">
<a class="d-none d-lg-inline nav-link bi bi-cart-fill px-3 pb-5" href="#"></a>
<a class="d-lg-none nav-link" href="#">cart</a>
<a class="d-none d-lg-inline nav-link bi bi-cart-fill px-3 pb-5" href="cart"></a>
<a class="d-lg-none nav-link" href="cart">cart</a>
</div>

<NavLink class="nav-link mx-1" href="cart" style="z-index:1" Match="NavLinkMatch.All">
<span class="nav-item" href="#">Cart</span>
</NavLink>
<NavLink class="nav-link mx-1" href="login" style="z-index:1" Match="NavLinkMatch.All">
<span class="nav-item" href="#">Login</span>
</NavLink>

<div class="nav-item px-1 d-flex justify-content-center">
<a class="d-none d-lg-inline d-flex nav-link px-3 pb-5" href="#"><i class="bi bi-person-square "></i></a>
<a class="d-lg-none nav-link" href="#">login</a>
<a class="d-none d-lg-inline d-flex nav-link px-3 pb-5" href="login"><i class="bi bi-person-square "></i></a>
<a class="d-lg-none nav-link" href="login">login</a>
</div>
</div>

Expand Down
0 ...ery/Components/Layout/MyNavMenu.razor.css → ...akery/Components/Layout/NavMenu.razor.css
View file
File renamed without changes.
6 changes: 4 additions & 2 deletions KakeysBakery/Components/Pages/Home.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
<PageTitle>Home</PageTitle>


<div class="d-flex justify-content-center mt-3">
<div class="d-flex justify-content-center mt-3 position-relative">
<img src="images/SweetnessCupcakes.png" id="cupcake1" />
<p class="sweet">Sweetness in every bite</p>
@* <p class="sweet">Sweetness in every bite</p> *@
<p class="position-absolute testsweet h1">Sweetness in every bite</p>

</div>

<div class="d-flex justify-content-center d-flex flex-wrap my-5">
Expand Down
25 changes: 21 additions & 4 deletions KakeysBakery/Components/Pages/Home.razor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
.sweet {
position: absolute;
left: 55%;
top: 480px;
top: 60%;
color: brown;
background-color: white;
background-color: rgb(255, 255, 255, .5);
Expand All @@ -47,6 +47,20 @@
font-weight: 900;
}

.testsweet {
color: brown;
background-color: white;
background-color: rgb(255, 255, 255, .5);
padding: 30px 25px 40px 30px;
border-radius: 5px;
font-family: BakeryFont;
/*font-size: 4vw;*/
font-style: oblique;
font-weight: 900;
left: 65%;
top: 60%;
}

#description {
padding: 30px 25px 40px 60px;
float: right;
Expand All @@ -56,8 +70,10 @@
}

/*smallest screen*/

@media screen and (max-width: 1200px) {
.sweet {
.testsweet {
color: green;
left: 50%;
}

Expand All @@ -67,8 +83,9 @@
}

/*biggest screen*/
@media screen and (min-width: 1200px) {
.sweet {
@media screen and (min-width: 1463px) {
.testsweet {
color: blue;
left: 68%;
font-size: 2.5vw;
}
Expand Down

0 comments on commit 2ea9797

Please sign in to comment.