Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

final styling #25

Merged
merged 1 commit into from
Apr 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions HAM/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

from django.contrib import admin
from django.urls import path, include
from django.conf.urls.static import static

urlpatterns = [
path('admin/', admin.site.urls),
Expand Down
21 changes: 13 additions & 8 deletions main_app/static/styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ body{
}

table {
padding-left:2em;
padding-left:5em;
}

.employee-title {
Expand Down Expand Up @@ -112,10 +112,11 @@ table {

img {
float:left;
padding-left:3em;
padding-left:2em;
/* padding-bottom:3em; */
}


.loggedin img {
margin:0;
}
Expand Down Expand Up @@ -177,13 +178,15 @@ a {
background-color:white;
justify-content: center;
border-radius:10px;
width:45vw;
width:60vw;
height:60vh;
overflow:auto;
}





.box {
font-family:Open sans;
padding:40px;
Expand Down Expand Up @@ -548,17 +551,16 @@ html, body {

* {
font-family: "Libre Baskerville";
box-sizing: border-box;

}

.top-nav {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background-color:var(--pale-purple);
/* background: linear-gradient(to bottom, var(--dark-purple),white); */
/* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
/* background-color:var(--pale-purple); */
background-color:white;
color: #FFF;
height: 50px;
padding: 1em;
Expand Down Expand Up @@ -630,6 +632,7 @@ html, body {
.menu-button-container {
display: flex;
}

.menu {
position: absolute;
top: 0;
Expand All @@ -640,19 +643,22 @@ html, body {
justify-content: center;
align-items: center;
}

#menu-toggle ~ .menu li {
height: 0;
margin: 0;
padding: 0;
border: 0;
transition: height 400ms cubic-bezier(0.23, 1, 0.32, 1);
}

#menu-toggle:checked ~ .menu li {
border: 1px solid #333;
height: 2.5em;
padding: 0.5em;
transition: height 400ms cubic-bezier(0.23, 1, 0.32, 1);
}

.menu > li {
display: flex;
justify-content: center;
Expand All @@ -665,4 +671,3 @@ html, body {
.menu > li:not(:last-child) {
border-bottom: 1px solid #444;
}
}
22 changes: 11 additions & 11 deletions main_app/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,28 +53,29 @@
<section class="top-nav">
<div class="logo">
<a href="https://ham-system.herokuapp.com/">
<img alt="ham" src="{% static "images/logo.png" %}"
width=10" height="10">
<img alt="ham" src="../static/images/logo.png"
width=50" height="50">
</a>

</div>

<input id="menu-toggle" type="checkbox" />
<label class='menu-button-container' for="menu-toggle">
<div class='menu-button'></div>
</label>
<ul class="menu">

<li><a href="/">Home</a></li>

<li><a href="/employees">All Employees</a></li>
<li> <a href="/devices">All Devices</a> </li>
<li><a href="/inventory">Inventory</a></li>
<li> <a href="/devices">All Devices</a> </li>
<li><a href="/inventory">Inventory</a></li>
<li><a href="/">Welcome, {{user.username}}!</a></li>
<li><a href="/accounts/logout">Logout</a></li>
</ul>
</section>


<!-- LEFT SIDE NAV -->

<!--
<div class="nav-left">
<ul>
<li class="home-option"><a href="/">Home</a></li>
Expand All @@ -83,14 +84,13 @@
<li><a href="/inventory">Inventory</a></li>
</ul>
</div>
</nav>
</nav> -->

{% else %}
<div class="loggedin">

<ul><li>
<a class='ham-link' href="https://ham-system.herokuapp.com/"><img alt="ham" src="../static/favicon.ico"
width=50" height="50"></a></li>
<ul>

<div class="welcome">
<ul>
<li><span><a href="{% url 'login' %}">Login</a></span></li>
Expand Down
1 change: 1 addition & 0 deletions main_app/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.urls import path
from . import views
from django.conf.urls.static import static

urlpatterns = [
path('', views.Home.as_view(), name='home'),
Expand Down
2 changes: 1 addition & 1 deletion staticfiles/staticfiles.json

Large diffs are not rendered by default.

Loading