core, com: tool bar and agenda design updates

Signed-off-by: Skia <skia@libskia.so>
This commit is contained in:
Skia
2017-09-03 19:05:45 +02:00
parent e0067c3956
commit 6456d18fc4
5 changed files with 120 additions and 78 deletions

View File

@ -293,7 +293,7 @@ header {
/*--------------------------------CONTENT------------------------------*/
#quick_notif {
width: 90%;
width: 100%;
margin: 0px auto;
list-style-type: none;
background: $second-color;
@ -309,6 +309,94 @@ header {
overflow: auto;
}
.tool_bar {
overflow: auto;
padding: 4px;
.tools {
display: flex;
flex-wrap: wrap;
float: right;
background: $white-color;
border: 1px solid $black-color;
text-align: center;
a {
padding: 10px;
display: inline-block;
color: $black-color;
flex: 1;
flex-wrap: nowrap;
white-space: nowrap;
&.selected_tab {
background: $second-color;
color: $black-color;
}
&:hover {
background: $primary-color;
color: $white-color;
}
}
}
}
/*---------------------------------NEWS--------------------------------*/
#news {
section {
padding: 5px;
}
section.news_call, section.news_notice {
background: lightgrey;
margin: 2px;
}
section.news_event:nth-of-type(even) {
background: lightblue;
}
#agenda {
box-shadow: $black-color 2px 2px 2px;
display: block;
width: 20%;
float: right;
background: white;
font-size: 70%;
border: solid 1px $black-color;
#agenda_title {
margin: 0em;
padding: 0.5em;
font-weight: bold;
font-size: 150%;
text-align: center;
text-transform: uppercase;
border-bottom: solid 1px $black-color;
background: $second-color;
}
#agenda_content {
overflow: auto;
height: 20em;
.agenda_item {
padding: 0.5em;
margin-bottom: 0.5em;
&:nth-of-type(even) {
background: $secondary-neutral-light-color;
}
.agenda_time {
font-size: 90%;
color: grey;
}
.agenda_item_content {
p {
margin-top: 0.2em;
}
}
}
}
}
.news_weekly p {
margin: 0.2em;
}
.news_date {
font-size: small;
color: grey;
}
}
}
.helptext {
@ -455,24 +543,6 @@ u, .underline {
text-decoration: underline;
}
.tool-bar {
overflow: auto;
padding: 4px;
}
.tools {
float: right;
border: 1px solid $primary-neutral-light-color;
a {
padding: 10px;
display: inline-block;
}
}
.selected_tab {
background: $primary-neutral-light-color;
}
#basket {
width: 40%;
background: $primary-neutral-light-color;
@ -918,3 +988,7 @@ label {
background: $primary-color;
border-color: $primary-color;
}
.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-top,
.ui-corner-left {
border-radius: 0px;
}

View File

@ -142,7 +142,7 @@
{% block nav %}
{% if not popup %}
<nav>
<a href="https://ae.utbm.fr/">{% trans %}Main{% endtrans %}</a>
<a href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
<a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a>
<a href="{{ url('core:page', page_name="Index") }}">{% trans %}Wiki{% endtrans %}</a>
<a href="{{ url('sas:main') }}">{% trans %}SAS{% endtrans %}</a>
@ -163,16 +163,16 @@
<div id="content">
{% if list_of_tabs %}
<div class="tool-bar">
<div class="tool_bar">
<div>{{ tabs_title }}</div>
<div class="tools">
{% for t in list_of_tabs %}
{% for t in list_of_tabs -%}
<a href="{{ t.url }}"
{%- if current_tab == t.slug %}
class="selected_tab"
{%- endif -%}
>{{ t.name }}</a>
{% endfor %}
{%- endfor %}
</div>
<hr>
</div>

View File

@ -24,7 +24,7 @@
{% block content %}
{{ print_file_name(file) }}
<div class="tool-bar">
<div class="tool_bar">
<div class="tools">
<div>
{% set home = user.home %}

View File

@ -22,7 +22,7 @@
{% block content %}
{{ print_page_name(page) }}
<div class="tool-bar">
<div class="tool_bar">
<div class="tools">
{% if page %}
<a href="{{ url('core:page', page.get_full_name()) }}">{% trans %}View{% endtrans %}</a>