added styling

abarnhard · Aug 21, 2014 · 727e3e8 · 727e3e8
1 parent 21f70de
commit 727e3e8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/app/helpers/link-builder.js b/app/helpers/link-builder.js
@@ -53,3 +53,7 @@ exports.allowLink = function(t){
   return s;
 };
 
+exports.displayFound = function(found){
+  var img = found ? 'open-chest.png' : 'closed-chest.png';
+  return '<img src="/img/'+img+'" height="50px" width="50px" />';
+};
diff --git a/app/static/css/style.css b/app/static/css/style.css
diff --git a/app/static/css/style.less b/app/static/css/style.less
@@ -1,12 +1,17 @@
-@base: #f938ab;
+@import url(http://fonts.googleapis.com/css?family=Trade+Winds);
 
 body{
   background-image: url(/img/piratebg.jpeg);
   background-size: cover;
 }
 
+h2 {
+  font-family: 'Trade Winds', cursive;
+}
+
 .navbar {
   margin-top: 15px;
+  font-family: 'Trade Winds', cursive;
 }
 
 .inserted {

diff --git a/app/static/img/closed-chest.png b/app/static/img/closed-chest.png
diff --git a/app/static/img/open-chest.png b/app/static/img/open-chest.png
diff --git a/app/views/home/index.jade b/app/views/home/index.jade
@@ -1,17 +1,12 @@
 extends ../shared/template
 block content
-  h2 Home
+  h2 Welcom Back Matey
   .panel.panel-default
     .panel-body
-      h4 Bootstrap Themes and Templates
-      ul
-        li: a(href='http://bootswatch.com/', target='_blank') http://bootswatch.com/
-        li: a(href='http://bootstrapzero.com/', target='_blank') http://bootstrapzero.com/
-        li: a(href='http://startbootstrap.com/', target='_blank') http://startbootstrap.com/
-        li: a(href='http://www.prepbootstrap.com/', target='_blank') http://www.prepbootstrap.com/
-        li: a(href='http://www.blacktie.co/', target='_blank') http://www.blacktie.co/
-        li: a(href='https://bootstrapmaster.com/', target='_blank') https://bootstrapmaster.com/
-        li: a(href='http://bootstrapstyler.com/', target='_blank') http://bootstrapstyler.com/
+      h4 Yarr!
+      p Jack Tar yawl cutlass rope's end fore pinnace careen cog haul wind crack Jennys tea cup. Haul wind gangplank measured fer yer chains warp topgallant loaded to the gunwalls yard Chain Shot crack Jennys tea cup provost. Lee squiffy lugsail wench barque quarterdeck Sail ho scourge of the seven seas hardtack draft.
+      p Chantey doubloon Blimey ballast hempen halter spyglass bucko list prow jury mast. Scuttle strike colors topmast pink brig ho schooner tack killick piracy. Gold Road draught stern pinnace gun schooner aft yo-ho-ho Spanish Main Sink me.
+      p Topgallant gaff haul wind holystone chandler rigging gally long clothes gibbet lugger. American Main salmagundi wherry shrouds rigging avast yawl grog ho lateen sail. Red ensign take a caulk boatswain brigantine hulk Jack Tar reef parrel transom main sheet.
 
 block scripts
   script(src='/js/user/home.js')

diff --git a/app/views/shared/nav.jade b/app/views/shared/nav.jade
@@ -10,6 +10,6 @@
 
     .collapse.navbar-collapse#bs-navbar-collapse
       ul.nav.navbar-nav.navbar-right
+        li: a(href='/treasures') Treasures
         li: a(href='/treasures/new') New Treasure
-        li: a(href='/treasures') View Treasures
 
diff --git a/app/views/treasures/index.jade b/app/views/treasures/index.jade
@@ -24,7 +24,7 @@ block content
                   td= linkBuilder.difficulty(treasure.difficulty)
                   td!= linkBuilder.tags(query, treasure.tags)
                   td= treasure.order
-                  td= treasure.isFound
+                  td!= linkBuilder.displayFound(treasure.isFound)
 
 block scripts
   script(src='/js/user/treasures.js')