klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-29 20:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging

Browse Source
This commit is contained in:
Pierre Brunet 2016-09-20 13:19:44 +02:00
parent 4ee858c130
commit b11c5bbd1d
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,15 +19,17 @@ header {
display: block; display: block;
position: absolute; position: absolute;
top : 0px; top : 0px;
right : 8%; right : 2%;
background-color:#DDD; background-color:#DDD;
margin: 0 10px; margin: 0 10px;
padding: 0 10px; padding: 0 10px;
border-radius: 0 0 10px 10px;
} }
header ul { header ul {
display: inline-block; display: inline-block;
list-style-type: none; list-style-type: none;
margin: 0px; margin: 0px;
padding-right: 3px;
vertical-align: middle; vertical-align: middle;
} }
header a { header a {
@ -51,10 +53,17 @@ header form {
} }
#language_chooser { #language_chooser {
position: absolute; position: absolute;
text-align: center;
left: 5px; left: 5px;
top: 5px; top: 5px;
} }
#language_chooser input {
margin: 2px;
width: 3em;
height: 2em;
}
/*---------------------------------NAV---------------------------------*/ /*---------------------------------NAV---------------------------------*/
nav { nav {
display: block; display: block;
@ -73,7 +82,7 @@ nav a {
padding: 20px; padding: 20px;
} }
nav a:hover { nav a:hover {
background: purple; background: #535353;
color: white; color: white;
} }
@ -147,7 +156,8 @@ table {
} }
td { td {
padding: 4px; padding: 4px;
border: solid 1px black; margin: 5px;
border: solid 1px darkgrey;
border-collapse: collapse; border-collapse: collapse;
vertical-align: top; vertical-align: top;
overflow: hidden; overflow: hidden;
@ -163,10 +173,8 @@ tbody>tr:nth-child(even) {
background: lightgrey; background: lightgrey;
} }
tbody>tr:hover { tbody>tr:hover {
background: yellow; background: darkgrey;
} width: 100%;
tbody>tr.highlight {
background: orange;
} }
.tool-bar { .tool-bar {
overflow: auto; overflow: auto;

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

@ -19,7 +19,7 @@
alt="{% trans %}Logo{% endtrans %}" /></a></div> alt="{% trans %}Logo{% endtrans %}" /></a></div>
<header> <header>
{% if not user.is_authenticated() %} {% if not user.is_authenticated() %}
<a href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a> | <a href="{{ url('core:login') }}">{% trans %}Login{% endtrans %}</a>
<a href="{{ url('core:register') }}">{% trans %}Register{% endtrans %}</a> <a href="{{ url('core:register') }}">{% trans %}Register{% endtrans %}</a>
{% else %} {% else %}
<ul> <ul>
@ -36,8 +36,8 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<a href="{{ url('core:user_profile', user_id=user.id) }}">{{ user.get_display_name() }}</a> | <a href="{{ url('core:user_profile', user_id=user.id) }}">{{ user.get_display_name() }}</a>
<a href="{{ url('core:user_tools') }}">{% trans %}Tools{% endtrans %}</a> | <a href="{{ url('core:user_tools') }}">{% trans %}Tools{% endtrans %}</a>
<a href="{{ url('core:logout') }}">{% trans %}Logout{% endtrans %}</a> <a href="{{ url('core:logout') }}">{% trans %}Logout{% endtrans %}</a>
<form action="{{ url('core:search') }}" method="GET"> <form action="{{ url('core:search') }}" method="GET">
<input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query" id="search" /> <input type="text" placeholder="{% trans %}Search{% endtrans %}" name="query" id="search" />