Beautifying stuff.

Author: nickmcdonnough

resources/public/css/jumbotron.css

@@ -3,6 +3,7 @@
 	background-size: 100% auto;
 	background-image: url(/img/artistic.jpg);
 	border-radius: 6px;
+        vertical-align: middle;
 }
 
 .jumbotron h1 {
@@ -11,10 +12,12 @@
 	font-size: 63px;
 	line-height: 75px;
         font-weight: 700;
+        text-shadow: 3px 3px 2px rgba(150, 150, 150, 1);
 }
-.jumbotron p {
+form.col-md-4 {
+        margin: 30px;
+}
+form.col-md-4 p {
 	color: #fff;
-	text-shadow: 2px 2px #100e19;
-	line-height: 1.5em;
-	/*-webkit-text-stroke: 1px black;*/
 }
+

resources/public/marketing.html

@@ -7,21 +7,16 @@ <h1>chatb&#216;x</h1>
 
   <div class="container">
     <div class="row">
-      <div class="col-md-4">
+      <div class="col-md-6">
         <h2>Communicate Effectively</h2>
-        <p>When customers land on your site they are presented with a simple window with which they can communicate with agents from your company.</p>
+        <p>When visitors land on your site they are presented with a simple window with which they can communicate with agents from your company.</p>
         <p><a class="btn btn-default" href="#" role="button">Learn More</a></p>
       </div>
-      <div class="col-md-4">
+      <div class="col-md-6">
         <h2>Bleeding Edge Tech</h2>
         <p>We built this service using Clojure - a modern LISP for tackling modern problems.</p>
         <p><a class="btn btn-default" href="#" role="button">See Our Tech</a></p>
      </div>
-      <div class="col-md-4">
-        <h2>Sign Up</h2>
-        <p>Click the button below to sign up and see what chatb0x is all about!</p>
-        <p><a class="btn btn-default" href="#" role="button">Sign Up</a></p>
-      </div>
     </div>
   </div> <!-- container -->
 </div> <!-- marketing -->

src/chatb0x/core.clj

@@ -96,7 +96,15 @@
 (html/deftemplate landing (io/resource "public/landing.html")
   [req]
   [:body :div.navbar] (html/substitute (navbar req))
-  [:body :#content] (html/substitute (marketing))
+  [:body :#content] (html/do->
+                      (html/substitute (non-app-content req))
+                      (html/append (marketing)))
+  [:body] (brepl-injection))
+
+(html/deftemplate other-landing (io/resource "public/landing.html")
+  [req]
+  [:body :div.navbar] (html/substitute (navbar req))
+  [:body :#content] (html/substitute (non-app-content req))
   [:body] (brepl-injection))
 
 ;;; Default page for erroneous logins 
@@ -161,8 +169,8 @@
 (defroutes unsecured-site
   (resources "/")
   (GET "/" req (landing req))
-  (GET "/about" req (landing req))
-  (GET "/contact" req (landing req))
+  (GET "/about" req (other-landing req))
+  (GET "/contact" req (other-landing req))
   (GET "/chatb0x" req (chatb0x req))
   (GET "/agent-chat" req (friend/authorize #{:chatb0x.user/agent} (agent-chat req)))
   (GET "/admin-dashboard" req (friend/authorize #{:chatb0x.user/admin} (admin-dashboard req)))