resolving conflicts after merge and moved logout btn to left

outbounder · Dec 16, 2012 · 437e09a · 437e09a
2 parents b709251 + c5ac6c6
commit 437e09a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/public/images/theQuestLogo.png b/public/images/theQuestLogo.png
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -12,10 +12,17 @@ a {
   color: #00B7FF;
 }
 
+.pull-right {
+  float: right;
+}
+.credits {
+  margin-right: 50px;
+}
 .name {
   position: absolute;
   top: 36px;
   left: 3px;
+  color: #00B7FF;
 }
 
 .gameHUD {

diff --git a/views/game.jade b/views/game.jade
@@ -4,21 +4,22 @@ block content
   .gameHUD
     .gameTitle 
       h1 TheQuest
-      a(href="javascript: void(0)").soundToggle Toggle sound off
+      .soundToggleBtn
+        a(href="javascript: void(0)").soundToggle Toggle sound off
+      .logoutBtn
+        a(href="/users/logout") logout
     .wrapper
       .menu
-        a(href="/users/logout") logout
         .timeLeft.menuItem
         .victories.menuItem
           span.victoriesCount 0
       .gameWorld
         .winLabel.endLabel You win
         .looseLabel.endLabel You loose :|
-
-
-
-
-
+    .credits.pull-right
+      h5 Hosted by 
+        a(href='http://camplight.net/', title='Camplight') Camplight
   script.
     user = !{JSON.stringify(user)}
-  script(src="/game-index.js")
+  script(src="/game-index.js")
+
diff --git a/views/index.jade b/views/index.jade
@@ -3,7 +3,7 @@ extends layout
 block content
   .container
     .hero-unit
-      h1= title
+      img(id="logo", src="/images/theQuestLogo.png")
       p
         | Meet the new very addictive, _open source_ 
         | , realtime MMO game. The goal is simple - steal the treasure. Have fun NOW with your friends or other players all over the world.