Skip to content

Sith
Sith
Commit 3ae0c3f3 authored by Soldat's avatar Soldat 🤦🏻
Browse files
Options

Merge branch 'il-faut-sauver-le-css' into 'master' 

Changed the design of the Sith.

See merge request !162
parents a88430d4 cce33d13
Pipeline #1543 passed with stage
    in 7 minutes and 27 seconds
    Expand all Show whitespace changes
    Inline Side-by-side
    Showing with 142 additions and 81 deletions
    core/static/core/style.scss
    View file @ 3ae0c3f3
    This diff is collapsed.
    core/templates/core/base.jinja
    View file @ 3ae0c3f3
    ......@@ -53,7 +53,7 @@
    </div>
    {% else %}
    <div id="header_logo" style="background-image: url('{{
    static('core/img/logo.png') }}'); width: 92px; height: 50px;">
    static('core/img/logo.png') }}'); width: 92px; height: 52px;">
    <a href="{{ url('core:index') }}"></a>
    </div>
    <div id="header_bar">
    ......@@ -62,11 +62,11 @@
    <li>
    <a href="{{ url('counter:activity', counter_id=bar.id) }}" style="padding: 0px">
    {% if bar.is_inactive(): %}
    <i class="fa fa-question" style="color: orange"></i>
    <i class="fa fa-question" style="color: #f39c12"></i>
    {% elif bar.is_open(): %}
    <i class="fa fa-check" style="color: green"></i>
    <i class="fa fa-check" style="color: #2ecc71"></i>
    {% else %}
    <i class="fa fa-times" style="color: red"></i>
    <i class="fa fa-times" style="color: #eb2f06"></i>
    {% endif %}
    {{ bar }}
    </a>
    ......@@ -181,7 +181,6 @@
    >{{ t.name }}</a>
    {%- endfor %}
    </div>
    <hr>
    </div>
    {% endif %}
    ......
    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