Skip to content

GitLab

Commit cfbd6103 authored by Skia's avatar Skia
Browse files

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

This reverts merge request !25
parent 98d47727
Pipeline #408 passed with stage
in 4 minutes and 30 seconds
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ cfbd6103
......@@ -7,5 +7,5 @@ db.sqlite3
env/
doc/html
data/
/static/
static/
sith/settings_custom.py
core/static/core/style.css
View file @ cfbd6103
/*--------------------------------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;
......
core/templates/core/base.jinja
View file @ cfbd6103
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment