Skip to content

Commit

Permalink
ui tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
aadhityasw committed May 26, 2020
1 parent bb76641 commit af09a99
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 25 deletions.
8 changes: 7 additions & 1 deletion static/css/Home_Page/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ button{
height: 40px;
color: rgb(255, 255, 255);
font-size: 20px;
margin-top: 80px;
margin-top: 40px;
background-color: rgb(255, 38, 0);
display: inline;
}
Expand Down Expand Up @@ -112,4 +112,10 @@ button {
height: fit-content;
width: fit-content;
padding: 10px;
}

.buttongroup {
margin-left: 22em;
margin-top: -8em;
padding-bottom: 8em;
}
6 changes: 5 additions & 1 deletion static/css/TransitPass/apply.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body{
background: linear-gradient(to bottom right, rgb(1, 255, 255), rgb(168, 7, 231));
margin-left: auto;
margin: auto;
text-align: center;
}
form{
Expand Down Expand Up @@ -57,4 +57,8 @@ img{
border-radius: 80px;
float: left;
border: 2px solid rgb(194, 74, 218);
}
h1 {
margin: auto;
padding-top: 2em;
}
3 changes: 0 additions & 3 deletions static/home.css

This file was deleted.

35 changes: 18 additions & 17 deletions templates/HomePage/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,26 @@
<div class="front">
<div class="logo">
<img src="{% static 'img/logo.jpg' %}" alt="">

<button style="margin-right: 30px;"><a href="/transit-pass/apply">Apply</a></button>

<button style="margin-right: 60px;"><a href="/transit-pass/check-application-status">Check Application Status</a></button>
<button style="margin-right: 60px;"><a href="/transit-pass/check-pass-validity">Verify Transit Pass Status</a></button>

{% if user.is_authenticated %}
<button style="margin-right: 60px;"><a href="/logout">Log Out</a></button>
{% else %}
<button style="margin-right: 60px;"><a href="/login">Log in</a></button>
{% endif %}
<div class="buttongroup">
<button style="margin-right: 30px;"><a href="/transit-pass/apply">Apply</a></button>
<button style="margin-right: 60px;"><a href="/transit-pass/check-application-status">Check Application Status</a></button>
<button style="margin-right: 60px;"><a href="/transit-pass/check-pass-validity">Verify Transit Pass Status</a></button>

{% if user.is_authenticated %}
{% if user.is_superuser %}
<button style="margin-right: 60px;"><a href="/admin">My Account</a></button>
{% else %}
<button style="margin-right: 60px;"><a href="/transit-pass/view-application-list">My Account</a></button>
{% endif %}
{% endif %}
{% if user.is_authenticated %}
<button style="margin-right: 60px;"><a href="/logout">Log Out</a></button>
{% else %}
<button style="margin-right: 60px;"><a href="/login">Log in</a></button>
{% endif %}

{% if user.is_authenticated %}
{% if user.is_superuser %}
<button style="margin-right: 60px;"><a href="/admin">My Account</a></button>
{% else %}
<button style="margin-right: 60px;"><a href="/transit-pass/view-application-list">My Account</a></button>
{% endif %}
{% endif %}
</div>
</div>

<div class="content">
Expand Down
8 changes: 5 additions & 3 deletions templates/TransitPass/apply.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<link rel="stylesheet" href="{% static 'css/TransitPass/apply.css' %}">
</head>
<body>
<img src="{% static 'img/logo.jpg' %}">
<h1 style="text-align: center;">Application form</h1>
<a href="/"><img src="{% static 'img/logo.jpg' %}"></a>
<h1 >Application form</h1>
<br>
<br>
<br>
Expand All @@ -14,6 +14,7 @@ <h1 style="text-align: center;">Application form</h1>
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="fom">
<br><br>
<h4>Full Name:-</h4>
<input type="text" name="full_name" required placeholder="Full Name" id="name">
<br>
Expand Down Expand Up @@ -115,9 +116,10 @@ <h4>Vehicle Registration Number</h4>

<input required type="text" name="vehicle_no">
<br>
<br>
<br><br>

<button type="submit">Submit</button>
<br><br>
</div>
</form>
<button style="margin-left: 90px;"><a href="/">Back</a></button>
Expand Down

0 comments on commit af09a99

Please sign in to comment.