Skip to content
Snippets Groups Projects
Commit affc6ee6 authored by unknown's avatar unknown
Browse files

fix styling

parent 0db1607f
Branches
No related merge requests found
.sidebar { .sidebar {
position: fixed; position: -webkit-sticky;
top: 0; position: sticky;
bottom: 0; top: 40px;
left: 0; z-index: 1000;
z-index: 100; /* Behind the navbar */ height: calc(100vh - 40px);
padding: 48px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1);
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
} }
.sidebar-sticky { .col-sb {
position: relative; @media (min-width: 1200px) {
top: 0; -ms-flex: 0 1 280px;
height: calc(100vh - 48px); flex: 0 1 280px;
padding-top: .5rem;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
}
@supports ((position: -webkit-sticky) or (position: sticky)) {
.sidebar-sticky {
position: -webkit-sticky;
position: sticky;
} }
} }
#footer { #footer {
color: #777; color: #777;
overflow: hidden; overflow: hidden;
} }
\ No newline at end of file
...@@ -137,11 +137,7 @@ body { ...@@ -137,11 +137,7 @@ body {
color: #333; color: #333;
} }
/* make div expand to contain float children */
.float-container {
overflow: auto;
display: inline-block;
}
/* MESSAGES & ERRORS */ /* MESSAGES & ERRORS */
ul.messagelist { ul.messagelist {
......
...@@ -48,16 +48,13 @@ ...@@ -48,16 +48,13 @@
<!-- Alerts --> <!-- Alerts -->
<div class="container-fluid "> <div class="container-fluid ">
{% include "watermark.html" %} <div class="row flex-xl-nowrap">
<div class="row">
<!-- sidebar --> <!-- sidebar -->
<nav class="col-md-1 d-none d-md-block bg-light navbar-light sidebar"> <nav class="col-md-3 col-xl-2 col-sb bg-light navbar-light sidebar">
<div class="sidebar-sticky">
{% block sidebar %}{% endblock %} {% block sidebar %}{% endblock %}
</div>
</nav> </nav>
<!-- Content --> <!-- Content -->
<div class="col-md-11 ml-sm-auto col-lg-11 px4"> <div class="col ml-sm-auto px4">
<main class="px4 bg-white" role="main"> <main class="px4 bg-white" role="main">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</main> </main>
......
{% load static %}
{% load sass_tags %}
<link rel="stylesheet" type="text/css" href="{% sass_src 'base_navbar.scss' %}" />
<!-- Container -->
{% block navbar %}
<nav class="navbar navbar-expand grey-900 navbar-dark flex-column flex-md-row p-0 shadow">
<a class="navbar-brand col-sm col-md-3 col-xl-2 mr-0 col-sb" title="UCCPortal homepage">
<span class="nav-item float-right logo"></span>
<div class="font-weight-bold text-light float-right font-italic" text-light>UCCPORTAL</div>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse " id="navbarSupportedContent">
{% with url_name=request.resolver_match.url_name %}
<div class="navbar-nav mr-auto">
{% if not request.user.is_authenticated or request.user.is_staff %}
{% endif %}
{% if request.member %}
<a class="nav-item nav-link {{membership}}" href="{% url "memberdb:home" %}">Membership </a>
<a class="nav-item nav-link disabled">Account</a>
{% endif %}
{% if request.user.is_staff %}
<a class="nav-item nav-link {% block adminactive %}{% endblock %}" href="{% url "admin:index" %}">
Admin
</a>
<a class="nav-item nav-link {% if url_name == 'register' %}active{% endif %}"
href="{% url "memberdb:register" %}">Add Member</a>
{% endif %}
</div>
<div class="navbar-nav">
{% if request.user.is_authenticated and request.member %}
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<i class="icon md-18 md-light" data-feather="user"></i>
Welcome, {{ request.user.username }}
<!--<div class="navbar-nav userinfo{ if request.user.is_authenticated %}{ if request.member %} groups{ endif %}">
{ if request.member %}
{ for g in request.member.groups %}<span class="group { g }}">{ g }}</span>{ endfor %}
{ endif %}
</div>-->
</a>
<div class="dropdown-menu dropdown-menu-right text-dark" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item disabled"> Dark theme: off</a>
<div class="dropdown-divider m-0"></div>
<a class="dropdown-item" href="{% url "memberdb:logout" %}">Logout</a>
</div>
</div>
{%else%}
<a class="btn btn-dark btn-sm my-1 border-light" href='{% url "memberdb:register" %}'>Signup</a>
<a class="nav-item nav-link" href="{% url "memberdb:login" %}">Login</a>
{%endif%}
</div>
{% endwith %}
</div>
</nav>
{% endblock %}
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