styling fixes, login, removed donate temp

diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css
index bf2b71a7090d54fc1bf0e9fa20b7bfc062c63474..c2a3e5dea15bef8669eebfe3b526f6a8c585dd4a 100755 (executable)
--- a/public/assets/css/screen.css
+++ b/public/assets/css/screen.css
@@ -314,7 +314,8 @@ body {
     margin-bottom: 0; }
 
 .content {
-  background-color: #fff; }
+  background-color: #fff;
+  padding: 1em 3%; }
 
 /* 2.`navigation
 ============================================== */
@@ -569,3 +570,43 @@ body {
 
 .centered-rt-parent {
   margin: 0 auto; }
+
+
+
+
+#messages {
+       text-align:  center;
+       background: #adf;
+       color: black;
+       font-weight: bold;
+       padding: 0.5em 0;
+}
+
+div.school {
+
+       cursor: pointer; cursor: hand;
+       margin: 1%; 
+       padding: 2%;
+       border: solid 1px #888;
+       -moz-border-radius: 0.20em;
+       -webkit-border-radius: 0.20em;
+       -webkit-box-shadow: 0 0.2em 0.3em rgba(0, 0, 0, .1);
+       -moz-box-shadow: 0 0.2em 0.3em rgba(0, 0, 0, .1);
+       /*
+       */
+}
+
+div.school div.name {
+       font-weight: bold;
+       font-size: 120%;
+       margin: 0 0;
+}
+
+div.school div.desc {
+       font-size: 90%;
+       color: #888;
+       font-style: italic;
+       margin: 0 0;
+}
+
+

diff --git a/public/index.html b/public/index.html
index 9a5d77883fd7d18cb8934ea0ed371454de14e550..60cdacb3292e5794436b629c99b3ab099a4bb487 100755 (executable)
--- a/public/index.html
+++ b/public/index.html
@@ -6,8 +6,6 @@
                <link rel="stylesheet" href="assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="assets/js/modernizr.custom.js"></script>
                <script type="text/javascript" src="assets/js/load.js"></script>
-               <script type="text/javascript" src="http://use.typekit.com/cbx6gxx.js"></script>
-               <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
                <script type='text/javascript' src='/javascripts/jquery.min.js'></script>
                <script type='text/javascript' src='/javascripts/es5-shim.min.js'></script>
@@ -26,11 +24,10 @@
                                                </a>
                                        </div>
                                        <div class="grid-9">
-<div id="login_status" style="display:none;">Currently logged in as <span class="username"></span></div>
                                                <nav id="user-nav" class="small">
                                                        <ul>
-                                                               <li>Hi, <span class="username"></span></li>
-                                                               <li><a href="#">Logout</a></li>
+                                                               <li><span class="username"></span></li>
+                                                               <li><a id=login_link href="/login"></a></li>
                                                        </ul>
                                                </nav>
                                                <nav id="main-nav" class="small">
@@ -41,8 +38,7 @@
                                                                <li><a href="/press"><em class="icon"></em>Press</a></li>
                                                                <li id=register_link><a href="/register"><em class="icon"></em>Register</a></li>
                                                                <li id=profile_link><a href="/profile"><em class="icon"></em>Profile</a></li>
-                                                               <li id=login_link><a href="/login"><em class="icon"></em>Profile</a></li>
-                                                               <li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li>
+                                                               <!-- li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li -->
                                                        </ul>
                                                </nav>
                                        </div>
@@ -54,83 +50,22 @@
                <div class="content">
 
 
-                       <!--
-                       ***********************************************************
-                               <div class="grid-12">
-                                       <div class="padded-loose">
-                                               <h1 class="large-huge spaced centered">Welcome to FinalsClub! <span class="small">Collaborate. Learn. Share.</span></h1>
-                                       </div>
-                               </div>
-                               <div class="grid-10 grid-centered">
-                                       <div class="padded-loose">
-                                               <p class="no-top-margin">
-                                                       Thank you for visiting FinalsClub.org, a 501(c)(3) non-profit open education
-                                                       project dedicated to helping college students share knowledge freely online.  While you learn better, faster, and smarter by using FinalsClub with your classmates,
-                                                       we also encourage you to share your scholarship to benefit curious minds everywhere.
-                                               </p>
-                                               <p>
-                                                       Getting started is easy.  Just register with your school email address and confirm
-                                                       your account.  Then find your courses or add a new ones.  You can also browse our
-                                                       Library to learn something new.  Thank you for helping us improve access to education,
-                                                       one lecture at a time.
-                                               </p>
-                                       </div>
-                               </div>
-                               <div class="grid-12">
-                                       <div class="button-set vertical half-width centered-rt-parent half-width-buttons">
-                                               <button class="green">Sign Up</button>
-                                               <button class="blue">Learn Something</button>
-                                       </div>
-                               </div>
-                       </div>
-                       <div class="container-12 spacer">
-                         <hr class="stripes spacer" />
-
-                               <div class="grid-6">
-                                       <h3 class="heading">Check out our Screencasts</h3>
-                                       <div class="video-wrapper">
-                                               <iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>              </div>
-                                       </div>
-                               <div class="grid-6">
-                                       <h3 class="heading">We currently support the following schools</h3>
-                                       <div class="schools">
-                                               <ul>
-                                                       <li><em class="sprite-school brown">Brown Logo</em></li>
-                                                       <li><em class="sprite-school columbia">Columbia Logo</em></li>
-                                                       <li><em class="sprite-school cornell">Cornell Logo</em></li>
-                                                       <li><em class="sprite-school dartmouth">Dartmouth Logo</em></li>
-                                                       <li><em class="sprite-school shield">School Logo</em></li>
-                                                       <li><em class="sprite-school mit">MIT Logo</em></li>
-                                                       <li><em class="sprite-school lock_haven">Lock Haven Logo</em></li>
-                                                       <li><em class="sprite-school cal">Cal Tech Logo</em></li>
-                                                       <li><em class="sprite-school texas">University of Texas Logo</em></li>
-                                                       <li><em class="sprite-school yale">Yale Logo</em></li>
-                                                       <li><em class="sprite-school penn">Penn Logo</em></li>
-                                                       <li><em class="sprite-school harvard">Harvad Logo</em></li>
-                                               </ul>
-                                       </div>
-                               </div>
-                       </div>
-                       ***********************************************************
-                       -->
-
                        <style>
                                /* The is here is because it's related less to "styling" and more to UI "behavior" */
                                .page { display: none; }
                        </style>
 
-      <noscript>
-        This site requires JavaScript to properly function. Please enable JavaScript or use a modern browser such as <a href="http://google.com/chrome">Google Chrome</a> or <a href="http://firefox.com">Firefox</a>.
-      </noscript>
+                       <noscript>
+                               This site requires JavaScript to properly function.
+                               Please enable JavaScript or use a modern browser such as
+                               <a href="http://google.com/chrome">Google Chrome</a>
+                               or
+                               <a href="http://firefox.com">Firefox</a>.
+                       </noscript>
 
 
                        <div class=page id=pg_home>
 
-
-
-
-
-
                                <div class="grid-12">
                                        <div class="padded-loose">
                                                <h1 class="large-huge spaced centered">Welcome to FinalsClub! <span class="small">Collaborate. Learn. Share.</span></h1>

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index 6607b07d99220e3b4dfa71d6830e8f73610b64ca..0795f37dc081bca33109c0d5fef2d34c0ceb3083 100644 (file)
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -46,7 +46,7 @@ var router = {
 
 function render(pageId, response) {
   if (user.name) {
-    $('.username').text(user.name);
+    $('.username').text("Hi, "+user.name+"!");
     $("#login_status").show();
     $('#login_link').text('Logout').attr('href', '/logout');
     $('#register_link').hide();