more styling, fix to main.js login div

diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css
index eecf5a5e1491ef2fe13a6cb30fac066b6af9a6c2..ca4a2fbae7323bcc07537ad8c036059ac85c677f 100755 (executable)
--- 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 e8c607bf3d692369d9725dd088594adc9e909ea6..ff54505b9c0c68db23acf673c846618a9b19c6d8 100755 (executable)
--- 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 6c74ccab35957bc93a33e53b21a104ad4b2884f0..073c72e0808b44fd3b9a39d12bf91022ff763d2e 100644 (file)
--- 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));