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

Revert "Merge branch 'fond-gala' into 'master'" 

This reverts merge request !25
This commit is contained in:
Skia 2016-11-21 14:10:29 +01:00
parent 98d47727e0
commit cfbd610305
6 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,5 +7,5 @@ db.sqlite3
env/
doc/html
data/
/static/
static/
sith/settings_custom.py

BIN
core/static/core/img/gala.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 657 KiB

BIN
core/static/core/img/logo-white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.4 KiB

BIN
core/static/core/img/logoGala.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 183 KiB

13
core/static/core/style.css
View File

@ -1,23 +1,10 @@
/*--------------------------------GENERAL------------------------------*/
body{
/* commented for gala update
background-color:#EEE;
position: relative;
width: 100%;
*/
font-family: sans-serif;
}
/* to auto adapt background */
html {
background: url(/static/core/img/gala.jpg) no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
footer {
color: white;
}
a {
text-decoration: none;
color: #265C83;

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

@ -15,10 +15,8 @@
<body>
{% block header %}
{% if not popup %}
<div id="logo"><a href="{{ url('core:index') }}"><img src="{{ static('core/img/logo-white.png') }}"
alt="{% trans %}Logo{% endtrans %}" /></a>
<img src="{{ static('core/img/logoGala.png')}}" alt="Gala"/>
</div>
<div id="logo"><a href="{{ url('core:index') }}"><img src="{{ static('core/img/logo.png') }}"
alt="{% trans %}Logo{% endtrans %}" /></a></div>
<header>
{% if not user.is_authenticated() %}
<a href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>