Skip to content

GitLab

concrexit
concrexit
Commit 7975f449 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files
Options

Fix top menu styles

parent 83a42bf7
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 79 deletions
website/documents/views.py
View file @ 7975f449
......@@ -3,11 +3,11 @@ from django.utils import timezone
from django.core.exceptions import PermissionDenied
from django.contrib.auth.decorators import login_required
from django.utils.text import slugify
from django.conf import settings
from documents.models import AssociationDocumentsYear, MiscellaneousDocument
from documents.models import GeneralMeeting, GeneralMeetingDocument
from utils.snippets import datetime_to_lectureyear
from sendfile import sendfile
import os
......
website/thaliawebsite/static/css/skin.less
View file @ 7975f449
......@@ -34,10 +34,80 @@ body {
#header {
background: @background-color;
#top-menu-container {
top: 10px;
right: 10px;
position: absolute;
z-index: 9999;
#language-selector, #account-menu {
display: inline-block;
vertical-align: top;
}
#language-selector {
margin-right: 10px;
}
.btn {
background: @inverted-color;
color: @background-color;
margin: 0;
&:hover {
background-color: @primary-color !important;
}
&:active, &:focus {
background-color: @inverted-color !important;
}
i {
margin-right: 5px;
}
&.dropdown-toggle {
.caret {
margin-top: 13px;
border-top-color: #FFFFFF;
}
}
}
.dropdown-menu {
background-color: @inverted-color;
border: 0;
box-shadow: none;
border-radius: 0;
min-width: 150px;
li {
padding: 0;
background: none;
}
a {
color: @background-color;
i {
margin-right: 5px;
}
&:hover {
background-image: none;
background-color: @primary-color !important;
}
}
}
}
}
#header-info {
background: @primary-color;
}
#logo {
padding: 55px 0 !important;
img {
......@@ -338,42 +408,3 @@ body {
.pagination a, .pagination-info {
color: @background-color;
}
// CONCRETE stuff
/* header account menu */
#thimbus-account-menu-container {
top: 10px;
right: 10px;
position: absolute;
}
#language-selector-menu,
#thimbus-account-menu {
a.btn {
background: @inverted-color;
color: @background-color;
&:hover {
background-color: @primary-color;
}
}
button.btn {
background-color: @inverted-color;
color: @background-color;
&:hover {
background-color: @primary-color;
}
}
.dropdown-menu {
background-color: @inverted-color;
a {
color: @background-color;
&:hover {
background-color: @primary-color;
}
}
}
}
website/thaliawebsite/templates/base.html
View file @ 7975f449
......@@ -48,6 +48,41 @@
<!-- #header -->
<div id="header" class="wrapper">
<div id="top-menu-container">
<div id="language-selector">
<form action="{% url 'set_language' %}" id="set_language_form" method="post">
{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
{% if LANGUAGE_CODE == 'nl' %}
<input type="hidden" name="language" value="en" />
<a class="btn btn-style1" id="language_submit_btn"><i class="fa fa-flag"></i>English</a>
{% else %}
<input type="hidden" name="language" value="nl" />
<a class="btn btn-style1" id="language_submit_btn"><i class="fa fa-flag"></i>Nederlands</a>
{% endif %}
</form>
</div>
{% if not user.is_authenticated %}
<div class="btn-group open" id="account-menu">
<a class="btn btn-default" href="{% url 'login' %}"><i class="fa fa-user"></i>{% trans "Login" %}</a>
</div>
{% else %}
<div class="btn-group" id="account-menu">
<a class="btn btn-default" href="/nyi"><i class="fa fa-user"></i> My Account</a>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<li><a href="/nyi">{% trans "Edit Profile" %}</a></li>
<li><a href="/nyi">{% trans "Profile Picture" %}</a></li>
<li class="divider"></li>
<li><a href="{% url 'logout' %}"><i class="fa fa-sign-out"></i>{% trans "Log Out" %}</a></li>
</ul>
</div>
{% endif %}
</div>
<!-- #logo-header -->
<div id="logo-header">
<!-- #logo -->
......@@ -141,45 +176,10 @@
<script type="text/javascript" src="{% static "plugins/magnific-popup/jquery.magnific-popup.min.js" %}"></script>
{% endblock %}
<div class="thimbus-ui" id="thimbus-account-menu-container">
<div class="btn-group open" id="language-selector-menu">
<form action="{% url 'set_language' %}" id="set_language_form" method="post">
{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
{% if LANGUAGE_CODE == 'nl' %}
<input type="hidden" name="language" value="en" />
<a class="btn btn-default" id="language_submit_btn"><i class="fa fa-flag"></i>English</a>
{% else %}
<input type="hidden" name="language" value="nl" />
<a class="btn btn-default" id="language_submit_btn"><i class="fa fa-flag"></i>Nederlands</a>
{% endif %}
</form>
</div>
{% if not user.is_authenticated %}
<div class="btn-group open" id="thimbus-account-menu">
<a class="btn btn-default" href="{% url 'login' %}"><i class="fa fa-user"></i>{% trans "Login" %}</a>
</div>
{% else %}
<div class="btn-group" id="thimbus-account-menu">
<a class="btn btn-default" href="/nyi"><i class="fa fa-user"></i> My Account</a>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right" role="menu">
<li><a href="/nyi">{% trans "Edit Profile" %}</a></li>
<li><a href="/nyi">{% trans "Profile Picture" %}</a></li>
<li class="divider"></li>
<li><a href="{% url 'logout' %}"><i class="fa fa-sign-out"></i>{% trans "Log Out" %}</a></li>
</ul>
</div>
{% endif %}
</div>
{% block js_footer %}
<script type="text/javascript" src="{% static "js/footer.js" %}"></script>
<script type="text/javascript" src="{% static "js/bootstrap-dropdown.js" %}"></script>
{% endblock %}
{% block js_footer %}
<script type="text/javascript" src="{% static "js/footer.js" %}"></script>
<script type="text/javascript" src="{% static "js/bootstrap-dropdown.js" %}"></script>
{% endblock %}
</body>
<!-- /body -->
......
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