Commit 0b1263d5 authored by felix.herrmann's avatar felix.herrmann
Browse files

refactor(templates): refactored base.html, menus and footer to start ui refactoring

refactors dd_django bootstrap3 based templates to bootstrap4,
follows the design mockups created by Qbstudio
parent e3747bd4
......@@ -4,9 +4,13 @@ from django.conf.urls.static import static
from django.contrib import admin
from django.views.generic import TemplateView
from django.views import defaults as default_views
from django.contrib.auth import views as auth_views
from ddusers.views import dashboard_page
import dddatasets
from wagtail.admin import urls as wagtailadmin_urls
from wagtail.documents import urls as wagtaildocs_urls
from wagtail.core import urls as wagtail_urls
urlpatterns = [
# remove next 4 lines and template files!
......@@ -20,18 +24,51 @@ urlpatterns = [
),
path(settings.ADMIN_URL, admin.site.urls),
# User management
path("users/", include("discuss_data.ddusers.urls", namespace="ddusers")),
path("", dashboard_page, name="ddusers.dashboard_page"),
path(
"users/",
include(("ddusers.urls", 'ddusers'), namespace="ddusers")
),
# next line to be removed
# path("accounts/", include("allauth.urls")),
# Your stuff: custom urls includes go here
path(
"dataset/",
include("discuss_data.dddatasets.urls", namespace="dddatasets"),
),
path("shib/", include("shibboleth.urls", namespace="shibboleth")),
"core/",
include(("core.urls", "core"), namespace="core")
),
path(
"dataset/",
include(("dddatasets.urls", "dddatasets"), namespace="dddatasets")
),
path(
'login/',
auth_views.LoginView.as_view(template_name='auth/login.html', ),
name='login'
),
path(
'logout/',
auth_views.LogoutView.as_view(template_name='auth/logout.html', ),
name='logout'
),
path(
'shib/',
include('shibboleth.urls', namespace='shibboleth')
),
path(
'dhrep/',
include('dhrep.urls',
namespace='dhrep')
),
path('', dashboard_page, name='ddusers.dashboard_page'),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# wagtail URL def
urlpatterns += [
path('cms/', include(wagtailadmin_urls)),
path('documents/', include(wagtaildocs_urls)),
path('documentation/', include(wagtail_urls)),
]
if settings.DEBUG:
# This allows the error pages to be debugged during development, just visit
# these url in browser to see how these error pages look like.
......
......@@ -8550,6 +8550,151 @@ a.text-shadow:hover, a.text-shadow:focus {
html {
scroll-behavior: smooth; }
body {
font-size: 14px;
font-size: .875rem;
background-color: #fff;
min-height: 100vh;
position: relative;
margin: 0; }
/*
* Sidebar
*/
.sidebar {
position: fixed;
top: 0;
bottom: 30vh;
left: 0;
z-index: 100;
/* Behind the navbar */
padding: 80px 0 0;
/* Height of navbar */
/*box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);*/
background-color: #fff !important;
/* background-color: red; */ }
.sidebar-sticky {
position: relative !important;
top: 0;
height: calc(100vh - 80px);
padding-top: 8px;
padding-top: .5rem;
overflow-x: hidden;
overflow-y: auto;
/* Scrollable contents if viewport is shorter than content. */
bottom: 50px; }
@supports ((position: -webkit-sticky) or (position: sticky)) {
.sidebar-sticky {
position: -webkit-sticky;
position: sticky; } }
.sidebar .nav-link {
font-weight: 500;
color: #333; }
.sidebar .nav-link .feather {
margin-right: 4px;
color: #999; }
.sidebar .nav-link.active {
color: #007bff; }
.sidebar .nav-link:hover .feather,
.sidebar .nav-link.active .feather {
color: inherit; }
.sidebar-heading {
font-size: 12px;
font-size: .75rem;
text-transform: uppercase; }
/*
* Content
*/
[role="main"] {
padding-top: 80px;
/* Space for fixed navbar */ }
#content {
padding-top: 80px;
background-color: #f8f9fa;
min-height: calc(80vh - 82px); }
/*
* footer
*/
#footer {
padding-top: 16px;
padding-top: 1rem;
background-color: #fff;
bottom: 5;
z-index: 90;
position: absolute;
right: 0;
left: 0; }
/*
* Navbar
*/
#navbar-top {
background-color: #fff; }
.navbar-brand {
padding-top: 12px;
padding-top: .75rem;
padding-bottom: 12px;
padding-bottom: .75rem;
font-size: 16px;
font-size: 1rem;
background-color: #fff;
-webkit-box-shadow: inset -1px 0 0 #fff;
box-shadow: inset -1px 0 0 #fff; }
.navbar .form-control {
padding: 12px 16px;
padding: .75rem 1rem;
border-width: 1;
border-radius: 1;
border-color: #e5e5e5;
background-color: #fff; }
/*
* forms
*/
.form-control-light {
color: #999;
background-color: white;
border-color: red; }
.form-control-dark {
color: #fff;
background-color: rgba(255, 255, 255, 0.1);
border-color: rgba(255, 255, 255, 0.1); }
.form-control-dark:focus {
border-color: transparent;
-webkit-box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.25);
box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.25); }
/*
* Utilities
*/
a:-webkit-any-link {
color: #343b86 !important; }
a:-moz-any-link {
color: #343b86 !important; }
a:any-link {
color: #343b86 !important; }
.bg-darkblue {
background-color: #343b86 !important; }
.no-padding {
padding-left: 0 !important;
padding-right: 0 !important; }
.btn {
min-width: 128px;
min-width: 8rem;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<svg width="37" height="31" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M37 2.818v2.818H0V2.818h6.167c0-.77.303-1.432.91-1.988C7.682.277 8.406 0 9.25 0h9.25c.844 0 1.567.277 2.175.83.605.556.908 1.218.908 1.988H37zM0 8.455h37V31H0V8.455z" fill="#272D73"/></svg>
\ No newline at end of file
<svg width="38" height="38" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M33.72 24.284c1.016.018 2.567.018 3.343.703l.646.685c.37-.463.443-1.333-.11-1.888-1.903-1.925-8.882-.815-11.356-.555-.277.018-.61-.278-.813-.426-.904-.574-2.4-1.926-3.102-2.74l-1.44-1.814c-1.09-1.5-2.013-3.295-2.714-5.073-.222-.537-.166-.463-.037-1.036a18.6 18.6 0 00.203-1.093c.277-1.5.462-3.165.388-4.739-.314-.055-.24.111-.314.37l-.979 3.185c-.037.092-.055.166-.092.259a.343.343 0 00-.037.13l-.074.11c-.166-.351-.35-1.314-.443-1.758-.388-1.796-.646-4.091-.536-5.924.074-1.24.517-3.221 1.533-1.5.277.445.499.926.72 1.444l.572 1.592a4.397 4.397 0 00.056-1.962c-.203-.963-.462-1.074-.702-1.462-.147-.075-.203-.186-.369-.297-.13-.092-.258-.148-.406-.24-.831-.26-.979-.352-1.884-.13l-.332.167-.222.166c-.055.056 0 .019-.092.056-.055.11-.166.166-.35.5-.351.63-.407 1.37-.425 2.092-.093 3.091.738 7.164 1.68 10.07.092.278-.019.39-.11.648-.389.963-.85 1.963-1.257 2.907-.941 2.203-3.286 6.794-4.468 8.923-.794 1.425-1.514 2.943-2.326 4.35a24.279 24.279 0 01-1.348 2.036c-.351.482-1.865 2.37-2.29 2.74-.295.24-.535.556-.83.815-.167.148-.26.277-.444.425-.148.13-.277.26-.443.39-.185.147-.702.703-.997.5-.572-.593 2.271-4.259 2.954-4.925l2.345-2.425c-.978.333-2.179 1.074-2.917 1.592-1.163.833-3.767 3.499-3.896 5.035-.13 1.592 2.345 2.48 4.284 1.204.184-.112.517-.37.627-.5 1.034-1.111 1.57-1.87 2.438-3.148 1.07-1.592 2.03-3.165 3.01-4.831.147-.26.369-.296.646-.426 4.025-1.98 9.564-3.221 14.125-3.758.37-.037.48.111.775.278.259.148.462.259.72.407 1.348.722 3.195 1.537 4.69 1.98 2.105.612 6.112 1.39 6.315-1.406l-.221.185c-.998.777-3.638.167-4.653-.13-.831-.24-3.675-1.166-4.284-1.573a63.18 63.18 0 015.244-.185zm-13.33 0c-2.438.555-5.337 1.333-7.608 2.332-.406.185-.978.5-1.33.611.075-.204.26-.5.389-.703.775-1.296 3.508-6.461 4.025-7.627.221-.5.424-.963.646-1.481.203-.5.37-1.037.59-1.537.186.26.444.889.61 1.185.683 1.296 1.33 2.092 2.216 3.147.277.333.59.648.868.944l1.883 1.666c.296.24.757.519 1.016.76l-3.305.703z" fill="#EF3A58"/></svg>
\ No newline at end of file
<svg width="41" height="41" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M27.333 7.455h10.25c.935 0 1.738.366 2.41 1.1.671.732 1.007 1.608 1.007 2.627V26.09H23.917v-3.727h-6.834v3.727H0V11.18c0-1.018.336-1.894 1.008-2.627.672-.733 1.475-1.1 2.409-1.1h10.25V3.728c0-1.019.336-1.894 1.008-2.627.671-.733 1.474-1.1 2.408-1.1h6.834c.935 0 1.738.367 2.41 1.1.67.733 1.006 1.608 1.006 2.627v3.728zM41 29.818v7.455c0 1.018-.336 1.894-1.007 2.627-.672.733-1.475 1.1-2.41 1.1H3.417c-.934 0-1.737-.367-2.41-1.1C.337 39.167 0 38.291 0 37.273v-7.455h41zM17.082 7.455h6.833V3.727h-6.833v3.728z" fill="#272D73"/></svg>
\ No newline at end of file
<svg width="26" height="26" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><path d="M20.411 13c0 .466-.178.932-.533 1.287l-11.18 11.18a1.82 1.82 0 01-2.575-2.575L16.016 13 6.124 3.108A1.82 1.82 0 018.699.533l11.18 11.18c.354.355.532.821.532 1.287z" fill="#fff"/></g><defs><clipPath id="clip0"><path fill="#fff" transform="rotate(-90 13 13)" d="M0 0h26v26H0z"/></clipPath></defs></svg>
\ No newline at end of file
<svg width="26" height="26" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><path d="M5.589 13c0-.466.178-.932.533-1.287L17.302.533a1.82 1.82 0 112.575 2.575L9.983 13l9.892 9.892a1.82 1.82 0 01-2.575 2.575L6.12 14.287A1.815 1.815 0 015.59 13z" fill="#fff"/></g><defs><clipPath id="clip0"><path fill="#fff" transform="rotate(90 13 13)" d="M0 0h26v26H0z"/></clipPath></defs></svg>
\ No newline at end of file
<svg width="26" height="26" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><path d="M20.411 13c0 .466-.178.931-.533 1.287l-11.18 11.18a1.82 1.82 0 11-2.575-2.576L16.016 13 6.124 3.108A1.82 1.82 0 018.699.533l11.18 11.18c.354.355.532.82.532 1.287z" fill="#272D73"/></g><defs><clipPath id="clip0"><path fill="#fff" transform="rotate(-90 13 13)" d="M0 0h26v26H0z"/></clipPath></defs></svg>
\ No newline at end of file
<svg width="26" height="26" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><path d="M5.589 13c0-.466.178-.931.533-1.287L17.302.533a1.82 1.82 0 112.575 2.576L9.983 13l9.892 9.892a1.82 1.82 0 01-2.575 2.575L6.12 14.287A1.816 1.816 0 015.59 13z" fill="#272D73"/></g><defs><clipPath id="clip0"><path fill="#fff" transform="rotate(90 13 13)" d="M0 0h26v26H0z"/></clipPath></defs></svg>
\ No newline at end of file
<svg width="7" height="10" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.76 0c.232 0 .464.084.64.253l4.337 4.143c.35.334.35.874 0 1.208L2.4 9.747a.938.938 0 01-1.277.004.826.826 0 01-.005-1.212L4.823 5 1.118 1.461A.826.826 0 011.123.249a.926.926 0 01.636-.25z" fill="#777"/></svg>
\ No newline at end of file
<svg width="7" height="10" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M5.24 10a.926.926 0 01-.64-.253L.262 5.604a.826.826 0 010-1.208L4.6.253A.939.939 0 015.877.25a.826.826 0 01.005 1.212L2.177 5l3.705 3.539a.826.826 0 01-.005 1.212.926.926 0 01-.636.249z" fill="#777"/></svg>
\ No newline at end of file
<svg width="12" height="11" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M2.115 3.986l2.052 2.065L9.887 0 12 2.115l-7.823 8.172L0 6.101l2.115-2.115z" fill="#343B86"/></svg>
\ No newline at end of file
<svg width="23" height="19" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M8.44 8.276c0 6.276-2.745 9.797-8.156 10.464-.012.002-.02.002-.032.002A.255.255 0 010 18.487v-3.189c0-.094.05-.18.13-.222 2.466-1.361 3.699-3.503 3.761-6.543H.252A.255.255 0 010 8.278V.255C0 .115.115 0 .252 0h7.936c.137 0 .252.114.252.255v8.021zm14.05 0c0 6.18-2.43 9.309-8.135 10.462-.017.002-.033.004-.049.004a.26.26 0 01-.161-.058.255.255 0 01-.091-.197v-3.189c0-.094.05-.18.13-.222 2.466-1.361 3.699-3.503 3.761-6.543h-3.639a.255.255 0 01-.252-.255V.255c0-.14.115-.255.252-.255h7.932c.141 0 .252.114.252.255v8.021z" fill="#343B86"/></svg>
\ No newline at end of file
<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 2.926v.926H1v-.926h1.917a.88.88 0 01.282-.653A.94.94 0 013.875 2H6.75a.94.94 0 01.676.273c.188.182.282.4.282.653H12.5zM1 4.778h11.5v7.41H1v-7.41z" fill="#fff"/></svg>
\ No newline at end of file
<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 2.926v.926H1v-.926h1.917a.88.88 0 01.282-.653A.94.94 0 013.875 2H6.75a.94.94 0 01.676.273c.188.182.282.4.282.653H12.5zM1 4.778h11.5v7.41H1v-7.41z" fill="#675995" opacity=".3"/></svg>
\ No newline at end of file
<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 1v10l-.91 1V2H4.274l-.91 1h6.819v10H2V2.75L3.59 1H12z" fill="#fff"/></svg>
\ No newline at end of file
<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 1v10l-.91 1V2H4.274l-.91 1h6.819v10H2V2.75L3.59 1H12z" fill="#675995" opacity=".3"/></svg>
\ No newline at end of file
<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M7 6h4v6.75a.244.244 0 01-.07.18.243.243 0 01-.18.07h-8.5a.244.244 0 01-.18-.07.245.245 0 01-.07-.18V1.25c0-.073.024-.133.07-.18A.244.244 0 012.25 1H7v5zm4-1H8V2l3 3z" fill="#fff"/></svg>
\ No newline at end of file
<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M7 6h4v6.75a.244.244 0 01-.07.18.243.243 0 01-.18.07h-8.5a.244.244 0 01-.18-.07.245.245 0 01-.07-.18V1.25c0-.073.024-.133.07-.18A.244.244 0 012.25 1H7v5zm4-1H8V2l3 3z" fill="#675995" opacity=".3"/></svg>
\ No newline at end of file
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