about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--uploader/static/css/layout-large.css4
-rw-r--r--uploader/static/css/theme.css6
-rw-r--r--uploader/templates/base.html2
3 files changed, 7 insertions, 5 deletions
diff --git a/uploader/static/css/layout-large.css b/uploader/static/css/layout-large.css
index 8abd2dd..4471791 100644
--- a/uploader/static/css/layout-large.css
+++ b/uploader/static/css/layout-large.css
@@ -6,6 +6,8 @@
     }
 
     #header {
+        margin: -0.7em; /* Fill entire length of screen */
+
         /* Place it in the parent element */
         grid-column-start: 1;
         grid-column-end: 3;
@@ -28,6 +30,8 @@
         /* Place it in the parent element */
         grid-column-start: 2;
         grid-column-end: 3;
+
+        padding-right: 1em;
     }
 
     #main {
diff --git a/uploader/static/css/theme.css b/uploader/static/css/theme.css
index cd3d103..8d5ac35 100644
--- a/uploader/static/css/theme.css
+++ b/uploader/static/css/theme.css
@@ -8,16 +8,14 @@ body {
 #header {
     background-color: #336699;
     color: #FFFFFF;
-    border-radius: 3px;
     min-height: 30px;
+    border-bottom: solid black 1px;
 }
 
 #header #header-nav .nav li a {
     /* Content styling */
     color: #FFFFFF;
-    background: #4477AA;
-    border: solid 5px #336699;
-    border-radius: 5px;
+    vertical-align: top;
     font-size: 0.7em;
     text-align: center;
     padding: 1px 7px;
diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index 719a646..0f088b1 100644
--- a/uploader/templates/base.html
+++ b/uploader/templates/base.html
@@ -36,7 +36,7 @@
             <a href="{{url_for('oauth2.logout')}}"
                title="Log out of the system">
               <span class="glyphicon glyphicon-user"></span>
-              {{user_email()}} Sign Out</a>
+              Sign Out ({{user_email()}})</a>
             {%else%}
             <a href="{{authserver_authorise_uri()}}"
                title="Log in to the system">Sign In</a>