Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Merge branch 'feature-css-styles'
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel.werder committed Oct 10, 2019
2 parents b617a89 + 086abc7 commit 566a4f1
Show file tree
Hide file tree
Showing 9 changed files with 249 additions and 156 deletions.
42 changes: 27 additions & 15 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 70 additions & 15 deletions cronjob/static/cronjob/godmode.css
Original file line number Diff line number Diff line change
@@ -1,33 +1,88 @@
html, body {
height: 100%;
margin: 0;
/*background-color: #2E516B;*/
font-family: 'Roboto Mono', monospace;
/*color: #B8C0CF;*/
/*color: #B8C0CF;
#2E516B
#233446
background-color: #2B415A;
*/
color: #233446;
}

body, form {
display: flex;
flex-direction: column;
color: #233446;

}

a {
display: flex;
text-decoration: none;
color: #233446;
text-align: center;
align: center;
}

nav {
font-size: 32px;
line-height: 2.5;
/*display: flex;*/
flex-direction: row;
color: #233446;
}

footer {
font-size: 20px;
.round_corner_box {
align-content: center;
display: flex;
max-width: 100pt;
border-radius: 12px;
background-color: #B8C0CF;
color: #233446;
}

nav,
footer {
line-height: 2.5;
/*background-color: #2B415A;*/
.basic_layout {
flex: 1;
display: flex;
flex-direction: row;
}
align-items: center;
justify-content: center;
color: #233446;
}

.box {
margin: 0;
padding-right: 30pt;
padding-left: 30pt;
display: inherit;
width: 100%;
justify-content: space-between;
color: #233446;
}

.box_link {
text-decoration: none;
color: #B8C0CF;
}

.inner_layout {
display: table-row;
align-items: center;
color: #233446;
}

.button {
border-radius: 15px;
border: 1px;
font-family: 'Roboto Mono', monospace; /* Is needed for Submit button...*/
font-size: 15px;
resize: none;
color: #233446;
}

.exit {
color: #B8C0CF;
font-size: 20px;
text-decoration: none;
margin-top: 10pt;
margin-right: 20pt;
align-self: flex-end;
}



21 changes: 6 additions & 15 deletions cronjob/templates/cronjob/cronhome.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
{% include 'partials/upperbody.html' %}

<header>
<section>
{% include 'partials/header.html' %}

<section class="basic_layout">
<div class="center_layout">
<h1>This is the cron job website.</h1>
<p>You have to login to register your cron jobs.</p>
</section>
</header>

<section>
{% if user.is_authenticated %}
<a href="{% url 'cronjob:userLogout' %}">Logout</a>
{% else %}
<a href="{% url 'cronjob:userLogin' %}">Login</a>
{% endif %}
<a href="{% url 'cronjob:register' %}">Register</a>
</section>

<section>
<a href="{% url 'cronjob:createCronJob' %}">Create new Cron Job</a>
<a class="box_link" href="{% url 'cronjob:createCronJob' %}">Create new Cron Job</a>
</div>
</section>

{% include 'partials/lowerbody.html' %}
Loading

0 comments on commit 566a4f1

Please sign in to comment.