From a9002d1eb56a9d8ffaf0e02c292f2f640be1160d Mon Sep 17 00:00:00 2001
From: frekk <frekk@ucc.asn.au>
Date: Thu, 24 Jan 2019 21:13:32 +0800
Subject: [PATCH] fix admin navbar scrollbar displaying
---
gms/memberdb/static/admin_custom.css | 6 +++---
gms/memberdb/static/shared.css | 9 ++++++++-
gms/memberdb/templates/base.html | 4 +++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/gms/memberdb/static/admin_custom.css b/gms/memberdb/static/admin_custom.css
index 8f1ad2c..629d6c0 100644
--- a/gms/memberdb/static/admin_custom.css
+++ b/gms/memberdb/static/admin_custom.css
@@ -2,11 +2,11 @@
display: inline-block;
}
-.logo {
+.logo span {
transform: rotate(45deg);
}
-.logo:hover {
+.logo span:hover {
animation: spin 0.5s linear infinite;
}
@@ -40,4 +40,4 @@
p, a {
box-sizing: content-box;
-}
\ No newline at end of file
+}
diff --git a/gms/memberdb/static/shared.css b/gms/memberdb/static/shared.css
index 5868b79..e1a8938 100644
--- a/gms/memberdb/static/shared.css
+++ b/gms/memberdb/static/shared.css
@@ -19,6 +19,13 @@ body {
margin: 5px 30px 5px 20px;
height: 50px;
width: 50px;
+ overflow: hidden; /* hide the overflow when it is rotated on the admin site */
+}
+
+.logo span {
+ height: 100%;
+ width: 100%;
+ display: block;
background-image: url("ucc-logo-white.png");
background-repeat: no-repeat;
background-position: center;
@@ -153,4 +160,4 @@ input[type=button][disabled].default {
.help, p.help, form p.help, div.help, form div.help, div.help li {
font-size: 12px;
color: #999;
-}
\ No newline at end of file
+}
diff --git a/gms/memberdb/templates/base.html b/gms/memberdb/templates/base.html
index 5235fd7..51f23d3 100644
--- a/gms/memberdb/templates/base.html
+++ b/gms/memberdb/templates/base.html
@@ -23,7 +23,9 @@
{% block navbar %}
<nav>
{% block branding %}
- <a class="logo" title="UCC logo"></a>
+ <a class="logo" title="UCC logo">
+ <span></span>
+ </a>
{% endblock %}
{# fancy automatic navbar thing from https://stackoverflow.com/questions/39639264 #}
--
GitLab