From ea64ed9c51217fc09c090cda9b4c7cf0e0520ce8 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 24 Sep 2016 19:48:50 -0400 Subject: [PATCH] Modified login CSS, added version number --- hourglass/client/login/login.css | 38 +++++++++++++++++++------------ hourglass/client/login/login.html | 1 + 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css index 9be5bbb..5ffc206 100644 --- a/hourglass/client/login/login.css +++ b/hourglass/client/login/login.css @@ -12,14 +12,14 @@ height: 4px; background-color: #33ADFF; position: absolute; - top: 13vh; + top: 11vh; z-index: 51; } #loginHeader { font-weight: 600; width: 100%; - height: 13vh; + height: 11vh; background-color: #EBEBEB; box-shadow: 2px 2px 5px 3px #666; @@ -31,10 +31,10 @@ } #logo { - height: 10vh; - width: 10vh; + height: 8vh; + width: 8vh; padding: 1.5vh; - line-height: 13vh; + line-height: 11vh; float: left; @@ -45,8 +45,8 @@ #loginTitle { font-size: 5vh; color: #000 !important; - height: 13vh; - line-height: 13vh; + height: 11vh; + line-height: 11vh; padding: 0 0 0 1vw; -webkit-filter: none; @@ -55,15 +55,15 @@ #loginMain { width: 100%; - height: 80vh; + height: 84vh; background-color: #E5E5E5; background-image: url("banner100.jpg"); - background-size: 100vw 80vh; + background-size: 100vw 84vh; display: table-row; position: absolute; - top: 13vh; + top: 11vh; } #circle { @@ -146,25 +146,33 @@ p.text { #loginFooter { width: 100%; - height: 8vh; + height: 6vh; box-shadow: 2px 2px 5px 3px #666; background-color: #EBEBEB; position: absolute; bottom: 0; } -#github { - font-size: 3vh; +#github, #version { + font-size: 2.3vh; color: #000 !important; + + height: 6vh; margin: 0; - height: 8vh; - line-height: 8vh; padding: 0 0 0 1vw; + line-height: 6vh; + display: inline-block; + -webkit-filter: drop-shadow(2px 2px 5px #444); filter: drop-shadow(2px 2px 5px #444); } +#version { + float: right; + margin-right: 1%; +} + a { color: #0099CC; text-decoration: none; diff --git a/hourglass/client/login/login.html b/hourglass/client/login/login.html index 15d4eef..6a42bfa 100644 --- a/hourglass/client/login/login.html +++ b/hourglass/client/login/login.html @@ -16,6 +16,7 @@ {{> loginButtons}}