ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1294 from emanuelschuetze/fix-1158

Browse Source 
Fixed #1158 (Clean up assignment.css)
This commit is contained in:
Oskar Hahn 2014-05-19 14:57:17 +02:00
commit 53e0a1086d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/assignment/static/css/assignment.css
View File

@ -14,10 +14,10 @@
} }
/* Election result table */ /* Election result table */
td.elected { #election-result-table td.elected {
background-color: #BED4DE !important; background-color: #BED4DE !important;
} }
td.elected a.election_link { #election-result-table td.elected a.election_link {
background-image: url(../img/voting-yes.png); background-image: url(../img/voting-yes.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
@ -27,7 +27,7 @@ td.elected a.election_link {
margin-right: 5px; margin-right: 5px;
float: left; float: left;
} }
td a.election_link { #election-result-table td a.election_link {
background-image: url(../img/voting-yes-grey.png); background-image: url(../img/voting-yes-grey.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;

5
openslides/assignment/templates/assignment/assignment_detail.html
View File

@ -7,9 +7,6 @@
{% block title %}{% trans "Election" %} "{{ assignment }}" – {{ block.super }}{% endblock %} {% block title %}{% trans "Election" %} "{{ assignment }}" – {{ block.super }}{% endblock %}
{% block header %}
<link type="text/css" rel="stylesheet" media="all" href="{% static 'css/assignment.css' %}" />
{% endblock %}
{% block javascript %} {% block javascript %}
<script type="text/javascript" src="{% static 'js/assignment.js' %}"></script> <script type="text/javascript" src="{% static 'js/assignment.js' %}"></script>
@ -147,7 +144,7 @@
{% if assignment.status != "sea" or polls.exists %} {% if assignment.status != "sea" or polls.exists %}
<h4>{% trans "Election result" %}</h4> <h4>{% trans "Election result" %}</h4>
{% if polls.exists %} {% if polls.exists %}
<table class="table table-striped table-bordered"> <table id="election-result-table" class="table table-striped table-bordered">
<tr> <tr>
<th>{% trans "Candidates" %}</th> <th>{% trans "Candidates" %}</th>
{% for poll in polls %} {% for poll in polls %}