Skip to content

Commit

Permalink
Merge pull request #22 from techhub-community/FE-TEAM
Browse files Browse the repository at this point in the history 
Fe team
  • Loading branch information
@arup1221
arup1221 authored Jun 24, 2023
2 parents 82e1f58 + 81f2357 commit d981dd7
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 124 deletions.
16 changes: 15 additions & 1 deletion static/assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,18 @@ h6,
left: -100%;
}
}

.navbar2 .getstarted{
background: #eb5d1e;
color: #fff;
padding: 10px 25px;
margin-left: 30px;
border-radius: 50px;
}
.navbar2 .getstarted:hover,
.navbar2 .getstarted:focus:hover{
color: #fff;
background: #ee7843;
}
/**
* Mobile Navigation
*/
Expand All @@ -255,6 +266,7 @@ h6,
color: #fff;
}


@media (max-width: 991px) {
.mobile-nav-toggle {
display: block;
Expand Down Expand Up @@ -347,6 +359,8 @@ h6,
display: block;
}



/*--------------------------------------------------------------
# Hero Section
--------------------------------------------------------------*/
Expand Down
Binary file modified static/assets/img/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/assets/img/portfolio/sumit.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 33 additions & 8 deletions templates/account/create_team.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Favicons -->
<link href="{% static 'assets/img/favicon.png' %}" rel="icon">
<link href="{% static 'assets/img/apple-touch-icon.png' %}" rel="apple-touch-icon">
<link href="{% static 'assets/img/favicon.png' %}" rel="apple-touch-icon">

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Raleway:300,300i,400,400i,600,600i,700,700i" rel="stylesheet">
Expand Down Expand Up @@ -45,7 +45,7 @@
background-color: #FA761B;
}
</style>
<body style="background: rgb(255,226,206);background: linear-gradient(90deg, rgba(255,226,206,1) 0%, rgba(250,118,27,1) 50%, rgba(255,252,241,1) 100%);">
<body style="background: #FEF8F4;">
<!-- ======= Header ======= -->
<header id="header" class="fixed-top d-flex align-items-center">
<div class="container d-flex align-items-center justify-content-between">
Expand All @@ -56,16 +56,41 @@
<a href="{% url 'index' %}"><img src="{% static 'assets/img/logo3.png' %}" alt="" class="img-fluid" height="1000px" width="180px"></a>
</div>

<nav id="navbar" class="navbar">
<ul>
<li><a class="getstarted scrollto" href="{% url 'user:register' %}">Register</a></li>
</ul>
<i class="bi bi-list mobile-nav-toggle"></i>
<nav id="navbar" class="navbar2">
<a class="getstarted scrollto" href="{% url 'user:register' %}">Register</a>
<!-- <i class="bi bi-list mobile-nav-toggle"></i> -->
</nav><!-- .navbar -->

</div>
</header><!-- End Header -->
<div class="d-lg-flex" style="background: rgb(255,226,206);background: linear-gradient(90deg, rgba(255,226,206,1) 0%, rgba(250,118,27,1) 50%, rgba(255,252,241,1) 100%);">

<!-- HERO -->
<div class="mask" >
<div class="p-5 text-center bg-image " style="
background-image: url({% static 'assets/img/2.jpg' %});
height: 350px;
background-size: cover;
">
<div class="overlay" style="position: absolute;top: 0;left: 0;
width: 100%;
height: 350px;
background-color: rgba(0, 0, 0, 0.5);"></div>
<div class="mask" >
<div class="d-flex justify-content-start align-items-center h-100">
<div class="text-white">
<div class="row">
<h1 class="text-center text-lg-right col-lg-6 offset-lg-8 col-md-8 offset-md-2 col-10 offset-1" style="margin-top: 16vh;"><b>Team</b></h1>

</div>
<div class="row">
<h2 class="text-center text-lg-right col-lg-6 offset-lg-8 col-md-8 offset-md-2 col-10 offset-1" style=""><a href="{% url 'index' %}" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Home</a>/<a href="" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Team</a></h2>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="d-lg-flex" style="background: #FEF8F4;">
<div class="container mt-5">
<div class="row align-items-center justify-content-center">
<div class="col-md-9 py-5">
Expand Down
14 changes: 6 additions & 8 deletions templates/account/login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Favicons -->
<link href="{% static 'assets/img/favicon.png' %}" rel="icon">
<link href="{% static 'assets/img/apple-touch-icon.png' %}" rel="apple-touch-icon">
<link href="{% static 'assets/img/favicon.png' %}" rel="apple-touch-icon">

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Raleway:300,300i,400,400i,600,600i,700,700i" rel="stylesheet">
Expand Down Expand Up @@ -56,11 +56,9 @@
<a href="{% url 'index' %}"><img src="{% static 'assets/img/logo3.png' %}" alt="" class="img-fluid" height="1000px" width="180px"></a>
</div>

<nav id="navbar" class="navbar">
<ul>
<li><a class="getstarted scrollto" href="{% url 'user:register' %}">Register</a></li>
</ul>
<i class="bi bi-list mobile-nav-toggle"></i>
<nav id="navbar" class="navbar2">
<a class="getstarted scrollto" href="{% url 'user:register' %}">Register</a>
<!-- <i class="bi bi-list mobile-nav-toggle"></i> -->
</nav><!-- .navbar -->

</div>
Expand All @@ -80,10 +78,10 @@
<div class="d-flex justify-content-start align-items-center h-100">
<div class="text-white">
<div class="row">
<h1 class="col-lg-6 offset-lg-6 col-md-8 offset-md-5 col-10 offset-5" style="margin-top: 16vh;"><b>LogIn</b></h1>
<h1 class="text-center text-lg-right col-lg-6 offset-lg-8 col-md-8 offset-md-2 col-10 offset-1" style="margin-top: 16vh;"><b>LogIn</b></h1>
</div>
<div class="row">
<h2 class="col-md-8 offset-md-2 col-10 offset-1" style="margin-left: 15vh;"><a href="{% url 'index' %}" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Home</a>/<a href="" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">LogIn</a></h2>
<h2 class="text-center text-lg-right col-lg-6 offset-lg-8 col-md-8 offset-md-2 col-10 offset-1" style=""><a href="{% url 'index' %}" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Home</a>/<a href="" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">LogIn</a></h2>
</div>
</div>
</div>
Expand Down
17 changes: 6 additions & 11 deletions templates/account/register.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Favicons -->
<link href="{% static 'assets/img/favicon.png' %}" rel="icon">
<link href="{% static 'assets/img/apple-touch-icon.png' %}" rel="apple-touch-icon">
<link href="{% static 'assets/img/favicon.png' %}" rel="apple-touch-icon">

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Raleway:300,300i,400,400i,600,600i,700,700i" rel="stylesheet">
Expand Down Expand Up @@ -57,11 +57,9 @@
<a href="{% url 'index' %}"><img src="{% static 'assets/img/logo3.png' %}" alt="" class="img-fluid" height="1000px" width="180px"></a>
</div>

<nav id="navbar" class="navbar">
<ul>
<li><a class="getstarted scrollto" href="{% url 'user:login' %}">Login</a></li>
</ul>
<i class="bi bi-list mobile-nav-toggle"></i>
<nav id="navbar" class="navbar2">
<a class="getstarted scrollto" href="{% url 'user:login' %}">Login</a>
<!-- <i class="bi bi-list mobile-nav-toggle"></i> -->
</nav><!-- .navbar -->

</div>
Expand All @@ -80,14 +78,11 @@
<div class="d-flex justify-content-start align-items-center h-100">
<div class="text-white">
<div class="row">
<h1 class="col-lg-6 offset-lg-5 col-md-8 offset-md-5 col-10 offset-5" style="margin-top: 16vh;"><b>Register</b></h1>
<h1 class="text-center text-lg-right col-lg-6 offset-lg-8 col-md-8 offset-md-2 col-10 offset-1" style="margin-top: 16vh;"><b>Register</b></h1>
</div>
<div class="row">
<!-- <h2 class="col-md-8 offset-md-2 col-10 offset-1" style="margin-left: 15vh;"><a href="{% url 'index' %}" class="text-white">Home</a>/<a href="" class="text-white">Register</a></h2> -->
<h2 class="col-md-8 offset-md-2 col-10 offset-1" style="margin-left: 15vh;">
<a href="{% url 'index' %}" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Home</a>/
<a href="" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Register</a>
</h2>
<h2 class="text-center text-lg-right col-lg-6 offset-lg-8 col-md-8 offset-md-2 col-10 offset-1" style=""><a href="{% url 'index' %}" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Home</a>/<a href="" style="color: white;" onmouseover="this.style.color=''" onmouseout="this.style.color='white'">Register</a></h2>

</div>
</div>
Expand Down
Loading

0 comments on commit d981dd7

Please sign in to comment.