Skip to content

Commit

Permalink
Merge branch 'Anushkabh:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@anagha-chaudhari
anagha-chaudhari authored Jul 4, 2024
2 parents 434e758 + 822555c commit 8646025
Show file tree
Hide file tree
Showing 18 changed files with 897 additions and 801 deletions.
17 changes: 12 additions & 5 deletions assets/css/faq.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ h1 {
position: absolute;
background-color: #f9f9f9;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
z-index: 6;
width: 200px;
padding: 10px;
border-radius: 5px;
Expand Down Expand Up @@ -592,18 +592,22 @@ h1 {




/* Mobile Responsiveness */
/* For landscape phones, 576px and up */
@media (max-width: 576px) {
.navbar-nav {
flex-direction: column;
align-items: flex-start;
margin-top: 5px;
}
.navbar .container{
padding: 0px 20px;
}

.nav-item {
margin-left: 0;
width: 100%;
margin-top: 10px;
}

.nav-link {
Expand All @@ -621,11 +625,15 @@ h1 {
.navbar-nav {
flex-direction: column;
align-items: flex-start;
margin-top: 5px;
}

.navbar .container{
padding: 0px 20px !important;
}
.nav-item {
margin-left: 0;
width: 100%;
margin-top: 10px;
}

.nav-link {
Expand Down Expand Up @@ -670,5 +678,4 @@ h1 {
padding: 0.5rem 1rem;
width: auto;
}
}

}
21 changes: 17 additions & 4 deletions assets/css/stylesheet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ i {
font-style: italic;
}
.banner {
position: relative;
display: block;
width:100%;
}
Expand All @@ -44,7 +45,7 @@ i {
.jumbotron-bg::before {
content: '';
position: absolute;
top: 70px;
top: 0px;
left: 0;
width: 100%;
height: 100%;
Expand Down Expand Up @@ -351,7 +352,7 @@ h1 {
position: absolute;
background-color: #f9f9f9;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
z-index: 6;
width: 200px;
padding: 10px;
border-radius: 5px;
Expand Down Expand Up @@ -575,19 +576,27 @@ h1 {




.fa-question-circle{
font-size: 22px !important;
margin-right: 7px !important;
}

/* Mobile Responsiveness */
/* For landscape phones, 576px and up */
@media (max-width: 576px) {
.navbar-nav {
flex-direction: column;
align-items: flex-start;
margin-top: 5px !important;
}
.navbar .container{
padding: 0px 20px !important;
}

.nav-item {
margin-left: 0;
width: 100%;
margin-top: 10px !important;
}

.nav-link {
Expand All @@ -605,11 +614,15 @@ h1 {
.navbar-nav {
flex-direction: column;
align-items: flex-start;
margin-top: 5px;
}

.navbar .container{
padding: 0px 20px;
}
.nav-item {
margin-left: 0;
width: 100%;
margin-top: 10px;
}

.nav-link {
Expand Down
41 changes: 25 additions & 16 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
<link href='https://unpkg.com/[email protected]/css/boxicons.min.css' rel='stylesheet'>

<!-- Favicon -->
<link rel="shortcut icon" href="assets/img/logo/krishiconnect-high-resolution-logo_black.png" type="image/x-icon">
<!--<link rel="shortcut icon" href="assets/img/logo/krishiconnect-high-resolution-logo_black.png" type="image/x-icon">-->
<link rel="shortcut icon" href="assets/img/logo/log.png" type="image/x-icon">

<!-- BoxIcons v2.1.2 -->
<link href="https://unpkg.com/[email protected]/css/boxicons.min.css" rel="stylesheet">
Expand Down Expand Up @@ -237,7 +238,8 @@
position: relative;
z-index: 100;
}



@media (max-width: 1200px) and (min-width:995px) {
.card-title {
font-size: 1.25rem;
Expand Down Expand Up @@ -275,7 +277,17 @@
margin: 10px;
box-sizing: border-box;
}

.navbar .container{
background-color: rgba(var(--bs-dark-rgb), var(--bs-bg-opacity)) !important;
}
@media (max-width:768px) {
.navbar .container{
padding: 0px 20px;
}
}
.nav-item{
margin-top: 5px;
}
#products .card img {
width: 100%;
height: 200px;
Expand Down Expand Up @@ -303,7 +315,7 @@
position: absolute;
background-color: #f9f9f9;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
z-index: 6;
width: 200px;
font-size: 14px;
padding: 10px;
Expand Down Expand Up @@ -491,7 +503,7 @@ <h3>FRESH !</h3>
</div>
<div class="page-header">
<!--=============== Navbar ===============-->
<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark" id="page-navigation">
<nav class="navbar navbar-expand-md navbar-dark bg-dark" id="page-navigation">
<div class="container">
<!-- Navbar Brand -->

Expand All @@ -513,15 +525,13 @@ <h3>FRESH !</h3>
<!-- Navbar Menu -->
<ul class="navbar-nav">
<li class="nav-item" style="border: 2px solid white" id="nav-link1">
<a href="src/login.html" class="nav-link"><i class="ri-user-3-fill"></i> Are You A
Seller?</a>
<a href="./src/login.html" class="nav-link"><i class="ri-user-3-fill"></i> Are You A Seller?</a>
</li>
<li class="nav-item" id="nav-link2">
<a href="src/shop.html" class="nav-link"><i class="ri-shopping-bag-fill"></i> Shop</a>
<a href="./src/shop.html" class="nav-link"><i class="ri-shopping-bag-fill"></i> Shop</a>
</li>
<li class="nav-item" id="nav-link3">
<a href="src/transaction.html" class="nav-link"><i class="ri-bank-card-fill"></i>
Transactions</a>
<a href="./src/transaction.html" class="nav-link"><i class="ri-bank-card-fill"></i> Transactions</a>
</li>
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" id="wishlistDropdown" role="button"
Expand All @@ -535,18 +545,17 @@ <h3>FRESH !</h3>
</div>
</li>
<li class="nav-item" id="nav-link5">

<a href="src/cart.html" class="nav-link"><i class="ri-shopping-cart-2-fill"></i> My Cart</a>
<a href="./src/cart.html" class="nav-link"><i class="ri-shopping-cart-2-fill"></i> My Cart</a>
</li>
<li class="nav-item">
<a href="src/faq.html" class="nav-link"><i class="fa fa-question-circle"
style="font-size:24px"></i>FAQ</a>
<a href="./src/faq.html" class="nav-link"><i class="fa fa-question-circle" style="margin-right: 7px; font-size: 22px;"></i>FAQ</a>
</li>
<li class="nav-item">
<a href="src/contact.html" class="nav-link"><i class="ri-user-fill"></i>Contact</a>
<a href="./src/contact.html" class="nav-link"><i class="ri-user-fill"></i>Contact</a>
</li>
<li class="nav-item">
<a href="src/rateus.html" class="nav-link"><i class="ri-user-star-fill"></i>Rate Us</a>
<a href="./src/rateus.html" class="nav-link"><i class="ri-user-star-fill"></i>Rate Us</a>
</li>
</ul>
<input type="checkbox" id="toggle">
Expand Down
Loading

0 comments on commit 8646025

Please sign in to comment.