From: ec2-user <ec2-user@sleepless.com>
Date: Sun, 20 Nov 2011 04:27:23 +0000 (+0000)
Subject: more styling, fix to main.js login div
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff5d4830335996f5987272c05e4bf6884aa35c83;p=oweals%2Ffinalsclub.git

more styling, fix to main.js login div
---

diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css
index eecf5a5..ca4a2fb 100755
--- a/public/assets/css/screen.css
+++ b/public/assets/css/screen.css
@@ -645,10 +645,11 @@ div.conduct p.academic {
 	padding: 2em 0;
 }
 div.conduct img {
+	display: inline;
 	padding: 20px; 
 	border: solid 1px #888;
-	background: -webkit-gradient(linear, left top, left bottom, from(#fcfcff), to(#f4f4ff));
-	background: -moz-linear-gradient(top,  #fcfcff,  #f4f4ff);
+	background: -webkit-gradient(linear, left top, left bottom, from(#fdfdfd), to(#f8f8f8));
+	background: -moz-linear-gradient(top,  #fdfdfd,  #f8f8f8);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcff', endColorstr='#f4f4ff');
 	-webkit-border-radius: .2em; 
 	-moz-border-radius: .2em;
diff --git a/public/index.html b/public/index.html
index e8c607b..ff54505 100755
--- a/public/index.html
+++ b/public/index.html
@@ -28,7 +28,7 @@
 					<div class="grid-9">
 						<nav id="user-nav" class="small">
 							<ul>
-								<li>Hi, <span class="username">Guest</span></li>
+								<li><span class="username">Guest</span></li>
 								<li><a id=login_link href="/login">Login</a></li>
 							</ul>
 						</nav>
diff --git a/public/stylesheets/fc2.css b/public/stylesheets/fc2.css
index 6c74cca..073c72e 100644
--- a/public/stylesheets/fc2.css
+++ b/public/stylesheets/fc2.css
@@ -871,6 +871,7 @@ div.conduct p.academic {
 	padding: 2em 0;
 }
 div.conduct img {
+	display: inline;
 	padding: 20px; 
 	border: solid 1px #888;
 	background: -webkit-gradient(linear, left top, left bottom, from(#fcfcff), to(#f4f4ff));