Skip to content

Commit

Permalink
Merge pull request #285 from hackupc/2024-styles
Browse files Browse the repository at this point in the history
Added 2024 colors and background
  • Loading branch information
EncryptEx authored Feb 9, 2024
2 parents cd9f375 + 4d7fddd commit b8335f6
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 363 deletions.
80 changes: 40 additions & 40 deletions app/static/css/custom-bootstrap.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions app/static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

body {

background: url("../img/background.svg") #f2ede6 center / 640px repeat;
background: url("../img/background.jpeg") #f2ede6 center center repeat fixed;
font-family: ProximaNovaRegular, 'Roboto', sans-serif;
font-size: 15px;
}
Expand Down Expand Up @@ -71,7 +71,7 @@ a:hover, a:active, a:focus {
/*-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);*/
/*box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);*/
border: 0;
border-top: 5px solid #e8e2d7;
border-top: 5px solid #E3C3FF;
}

.btn-primary {
Expand Down Expand Up @@ -110,7 +110,7 @@ nav.navbar {
/*-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);*/
/*box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);*/
border: 0;
border-bottom: 5px solid #e8e2d7;
border-bottom: 5px solid #E3C3FF;
}

.table {
Expand All @@ -121,7 +121,7 @@ div.panel {
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
border: 5px solid #e8e2d7;
border: 5px solid #E3C3FF;
z-index: 3;
}

Expand Down Expand Up @@ -260,7 +260,7 @@ img {
padding: 0.5em 1em;
text-align: center;
transition: bottom 1s;
background-color: #e8e2d7;
background-color: #E3C3FF;
z-index:1031; /*footer was set to 1030*/
box-shadow: 0px 15px 15px 15px black;
color: black;
Expand Down
2 changes: 1 addition & 1 deletion app/static/css/tabs.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background: #e8e2d7;
background: #E3C3FF;
/*box-shadow: inset 0 -2px 2px rgba(0, 0, 0, 0.1);*/
margin: 0;
font-style: normal;
Expand Down
Binary file added app/static/img/background.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
319 changes: 13 additions & 306 deletions app/static/img/background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions app/templates/403.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@

{% block body %}
<style>
.text-black {
color: black;
.text-white {
color: white;
}
.custom-a {
color: #E3C3FF;
font-weight: bold;
text-decoration: underline;
}
</style>
<div class="text-black">
<div class="text-white">
<h1 class="text-center margin-top">YOU SHALL NOT PASS!</h1>
<h2 class="text-center">403 Access Forbidden</h2>
<p class="text-center">Please <a href="{% url 'account_login' %}">log in</a> with a more <b>powerful</b> account to access this page</p>
<p class="text-center">Please <a class='custom-a' "{% url 'account_login' %}">log in</a> with a more <b>powerful</b> account to access this page</p>
</div>
{% endblock %}
6 changes: 3 additions & 3 deletions app/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

{% block body %}
<style>
.text-black {
color: black;
.text-white {
color: white;
}
</style>
<div class="text-black">
<div class="text-white">
<h1 class="text-center margin-top">¯\_(ツ)_/¯</h1>
<h2 class="text-center">404 Page not found</h2>
<p class="text-center">This specified file was not found on this website. Please check the URL for mistakes and
Expand Down
13 changes: 9 additions & 4 deletions app/templates/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,24 @@

{% block body %}
<style>
.text-black {
color: black;
.text-white {
color: white;
}
.custom-a {
color: #E3C3FF;
font-weight: bold;
text-decoration: underline;
}
</style>
<div class="text-black">
<div class="text-white">
<h1 class="text-center margin-top">500 Oops</h1>
<h2 class="text-center">Server Error </h2>
<p class="text-center">It seems like you found an error. Please reach us out
at {{ h_contact_email|urlize }} if the problem persists.</p>
{% if h_repo %}
<p class="text-center">
Or you can open an issue
<a target="_blank" href="{{ h_repo }}issues/new">here</a>.
<a class='custom-a' target="_blank" href="{{ h_repo }}issues/new">here</a>.
</p>
{% endif %}
</div>
Expand Down

0 comments on commit b8335f6

Please sign in to comment.