klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #489 from TheRolfFR/remove-pinktober 

Removing pinktober for AE
This commit is contained in:
Julien Constant 2022-11-14 21:04:58 +01:00 committed by GitHub
parent e0ad288cf4 e76e2b1537
commit 1630af4fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/static/core/style.scss
View File

@ -163,21 +163,24 @@ header {
display: flex;
box-shadow: $shadow-color 0px 0px 15px;
border-top: none;
//background-color: $primary-neutral-dark-color;
background-color: $primary-neutral-dark-color;
border-radius: 0px 0px 10px 10px;
// PINKTOBER
background-color: $pinktober;
border-bottom: 5px solid $pinktober-secondary;
margin-bottom: -5px;
border-radius: 0 0 5px 7px;
// background-color: $pinktober;
// border-bottom: 5px solid $pinktober-secondary;
// margin-bottom: -5px;
// border-radius: 0 0 5px 7px;
#header_logo {
background-color: $white-color;
padding: 0.2em;
border-bottom: 5px solid $shadow-color;
border-radius: 0px 0px 0px 5px;
margin-bottom: -5px;
border-radius: 0px 0px 0px 9px;
//PINKTOBER
// border-bottom: 5px solid $shadow-color;
// border-radius: 0px 0px 0px 5px;
// margin-bottom: -5px;
a {
display: flex;
@ -204,7 +207,9 @@ header {
width: 100%;
label {
display: inline;
color: $pinktober-primary-text;
// PINKTOBER
// color: $pinktober-primary-text;
}
}
a {
@ -225,7 +230,7 @@ header {
font-weight: bold;
color: $white-color;
&:hover {
color: $pinktober-primary-text;
color: $secondary-color;
text-decoration: underline;
}
}
@ -235,13 +240,15 @@ header {
list-style-type: none;
margin: 0.2em 0.2em;
/*
PINKTOBER
& .fa.fa-times {
color: $pinktober-bar-closed !important;
}
& .fa.fa-check {
color: $pinktober-bar-opened !important;
}
}*/
}
#header_search {

2
core/templates/core/base.jinja
View File

@ -41,7 +41,7 @@
</div>
<div id="header_logo">
<a href="{{ url('core:index') }}">
<img src="{{ static('core/img/ae-pinktober.png') }}" alt="AE logo">
<img src="{{ static('core/img/logo.png') }}" alt="AE logo">
</a>
</div>
{% if not user.is_authenticated %}