5 files changed, 45 insertions, 32 deletions

diff --git a/www/static/logo.png b/www/static/img/logo.png
index cb99923..cb99923 100644
--- a/www/static/logo.png
+++ b/www/static/img/logo.png
diff --git a/www/static/logo.svg b/www/static/img/logo.svg
index 86a5c1e..86a5c1e 100644
--- a/www/static/logo.svg
+++ b/www/static/img/logo.svg
diff --git a/www/static/login.css b/www/static/login.css
index ff9e665..0ed0dea 100644
--- a/www/static/login.css
+++ b/www/static/login.css
@@ -1,4 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Alegreya+Sans+SC:300);
 /*********************************************************
 				Login-Form
 **********************************************************/
@@ -7,24 +6,54 @@ div.login-area{
 	width: 400px;
 	position: relative;
 	top: 50%;
-	/*transform: translateY(-50%);
-	-ms-transform: translateY(-50%);
-	-webkit-transform: translateY(-50%);*/
 	margin-top: -100px;
-	
 	margin-left: auto;
 	margin-right: auto;
-	vertical-align: middle;
 	border: 1px solid #1F3D4C;
 	padding: 10px;
+
+}
+
+#login-top-bar{
+	display: block;
+	width: 395px;
+	height:32px;
+	padding:0;
+	margin:0;
+	border: none;
+	position: static;
+	
 }
 
 h1.login-area{
 	font-size: 32px;
 	font-weight: normal;
-	display:inline;
+	line-height: 32px;
+	padding:0;
+	float: left;
+	display: inline-block;
+}
+
+#login-error{
+	font-size: 13pt;
+	background: red;
+	text-align:right;
+	float:right;
+	display: inline-block;
+	line-height: 26px;
+	border: 3px solid #1F3D4C;
+}
+
+#logout-message{
+	font-size: 13pt;
+	text-align:right;
+	float:right;
+	display: inline-block;
+	line-height: 26px;
+	border: 3px solid #1F3D4C;
 }
 
+
 form.login-form{
 	
 }
@@ -44,6 +73,7 @@ input.login-input[type=text], input.login-input[type=password]{
 input.login-input:focus{
 	background: #D6E0E5
 }
+
 #button-input{
 	height: 40px;
 	width: 120px;
@@ -54,23 +84,7 @@ input.login-input:focus{
 	font-size: 25px;
 	margin-top: 15px;
 }
-#recover-password-link{
 
-}
-
-#login-error{
-	font-size: 13pt;
-	background: red;
-	text-align:right;
-	float:right;
-	line-height: 32px;
-	border: 3px solid #1F3D4C;
-}
+#recover-password-link{
 
-#logout-message{
-	font-size: 13pt;
-	text-align:right;
-	float:right;
-	line-height: 32px;
-	border: 3px solid #1F3D4C;
 }
diff --git a/www/static/register.css b/www/static/register.css
index de6903b..ffd425b 100644
--- a/www/static/register.css
+++ b/www/static/register.css
@@ -1,4 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Alegreya+Sans+SC:300);
 /*********************************************************
 				Register-Form
 **********************************************************/
diff --git a/www/static/style.css b/www/static/style.css
index 7d5159c..8b07d09 100644
--- a/www/static/style.css
+++ b/www/static/style.css
@@ -1,5 +1,8 @@
-@import url(https://fonts.googleapis.com/css?family=Alegreya+Sans+SC:300);
-
+@font-face
+{
+	font-family: 'Alegreya Sans SC';
+	src: url("alegreya_sans_sc.woff");
+}
 /***************************************************************
 					General Page Styling
 ****************************************************************/
@@ -10,9 +13,6 @@
 html, body{
 	height: 100%;
 	font-family: 'Alegreya Sans SC', sans-serif;
-	-webkit-font-smoothing: antialiased;
-	-ms-font-smoothing: antialiased;
-	font-smoothing: antialiased;
 }
 
 
@@ -33,7 +33,7 @@ a.logo{
 	width: 70px;
 	margin-top: 5px;
 	margin-left: 5px;
-	background-image: url(static/logo.svg);
+	background-image: url(img/logo.svg);
 	background-repeat:no-repeat;
 	background-size:66px 66px;
 	background-color:#3083D6;
@@ -47,7 +47,7 @@ a.logo{
 a.logo:hover{
 	display: block;
 	background:#2669AB;
-	background-image: url(static/logo.svg);
+	background-image: url(img/logo.svg);
 	background-repeat:no-repeat;
 	background-size:66px 66px;
 	background-position: center;