Skip to content

canvi colors + background #417

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.

Sign up for GitHub

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

Open
polmf wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

canvi colors + background #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b247a68
canvi colors + background
polmf Jan 21, 2026
688c6c7
Merge branch 'develop' into canvi-fons
polmf Jan 22, 2026
930ca1e
canvi imatge
polmf Jan 25, 2026
ee3d263
Merge branch 'canvi-fons' of https://github.com/hackupc/myhackupc int…
polmf Jan 25, 2026
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
46 changes: 23 additions & 23 deletions app/static/css/custom-bootstrap.css
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions app/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

body {
background-image: url("../img/background.svg");
background-image: url("../img/background2026.svg");
background-size: contain;
background-repeat: repeat;
font-family: ProximaNovaRegular, 'Roboto', sans-serif;
Expand Down Expand Up @@ -72,7 +72,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 #0060BF;
border-top: 5px solid #5B5340;
}

.btn-primary {
Expand Down Expand Up @@ -111,7 +111,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 #0060BF;
border-bottom: 5px solid #5B5340;
}

.table {
Expand All @@ -122,7 +122,7 @@ div.panel {
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
border: 5px solid #0060BF;
border: 5px solid #5B5340;
z-index: 3;
}

Expand Down Expand Up @@ -261,7 +261,7 @@ img {
padding: 0.5em 1em;
text-align: center;
transition: bottom 1s;
background-color: #0060BF;
background-color: #5B5340;
z-index:1031; /*footer was set to 1030*/
box-shadow: 0px 15px 15px 15px black;
color: black;
Expand Down
8 changes: 4 additions & 4 deletions app/static/css/tabs.css
View file
Open in desktop
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: #0060BF;
background: #5B5340;
/*box-shadow: inset 0 -2px 2px rgba(0, 0, 0, 0.1);*/
margin: 0;
font-style: normal;
Expand All @@ -23,7 +23,7 @@
-moz-border-radius: 0;
border-radius: 0;
background: white;
color: #0060BF;
color: #5B5340;
border-bottom: 0;
}

Expand Down Expand Up @@ -77,11 +77,11 @@

.active_tab {
background-color: white;
color: #0060BF !important;
color: #5B5340 !important;
}

.active_tab > a {
background: none !important;
box-shadow: none !important;
color: #0060BF !important;
color: #5B5340 !important;
}
812 changes: 812 additions & 0 deletions app/static/img/background2026.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/static/lib/bars-square.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
}
.br-theme-bars-square .br-widget a.br-active,
.br-theme-bars-square .br-widget a.br-selected {
border: 2px solid #4278F5;
color: #4278F5;
border: 2px solid #5B5340;
color: #5B5340;
}
.br-theme-bars-square .br-widget .br-current-rating {
clear: both;
Expand Down
Binary file modified app/static/logo.png
View file
Open in desktop
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 app/static/logo2025.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions app/templates/base_email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>{{ subject }}</title>
<style type="text/css">
a {
color: #0060BF;
color: #5B5340;
text-decoration: none;
-webkit-transition: all .1s linear;
-moz-transition: all .1s linear;
Expand All @@ -17,7 +17,7 @@
}

a:hover, a:active, a:focus {
color: #0060BF;
color: #5B5340;
text-decoration: none;
}

Expand Down Expand Up @@ -103,13 +103,13 @@

.btn-primary table td:hover {
background-color: white !important;
color: #0060BF !important;
color: #5B5340 !important;
}

.btn-primary a:hover {
background-color: white !important;
border-color: #0060BF !important;
color: #0060BF !important;
border-color: #5B5340 !important;
color: #5B5340 !important;
}
}
</style>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/mails/include/email_button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
style="border-collapse:separate;mso-table-lspace:0pt;mso-table-rspace:0pt;width:100%;width:auto;">
<tbody>
<tr>
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#0060BF;color:white;border-radius:5px;text-align:center; margin: 0 auto;">
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#5B5340;color:white;border-radius:5px;text-align:center; margin: 0 auto;">
<a href="{{ url }}" target="_blank"
style="text-decoration:underline;border:solid 1px #0060BF;color:white;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#0060BF;color:#ffffff;">
style="text-decoration:underline;border:solid 1px #5B5340;color:white;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#5B5340;color:#ffffff;">
{{ text }}
</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions applications/templates/mails/include/cancel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
style="border-collapse:separate;mso-table-lspace:0pt;mso-table-rspace:0pt;width:100%;width:auto;">
<tbody>
<tr>
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#0060BF;color:white;border-radius:5px;text-align:center; margin: 0 auto;">
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#5B5340;color:white;border-radius:5px;text-align:center; margin: 0 auto;">
<a href="{{ cancel_url }}" target="_blank"
style="text-decoration:underline;border:solid 1px #0060BF;color:white;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#0060BF;color:white;">
style="text-decoration:underline;border:solid 1px #5B5340;color:white;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#5B5340;color:white;">
Cancel
</a>
</td>
Expand Down