Merge pull request #2 from NyckJohnson/master

pretty
hackerdojo · Dec 5, 2011 · c23e4c9 · c23e4c9
2 parents 960a233 + d19f40b
commit c23e4c9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/main.html b/main.html
@@ -66,7 +66,7 @@ <h3>The More You Know</h3>
       </a>
       <a id="bugs" title="bug tracking" href="http://track.hackerdojo.com/">
         <img src="/static/img/bug.png" />
-        <span>Bug Tracking</span>
+        <span>Facilities<br />Issues</span>
       </a>
       <a id="signs" title="signs" href="http://signs.hackerdojo.com/">
         <img src="/static/img/signs.jpg" />
@@ -77,7 +77,7 @@ <h3>The More You Know</h3>
     <br />
 
     <div class="chunk">
-      <h3>Data</h3>
+      <h3>Misc</h3>
       <a id="transactions" title="transactions" href="http://finances.hackerdojo.com/">
         <img src="/static/img/transactions.png" />
         <span>Transactions</span>
@@ -86,14 +86,6 @@ <h3>Data</h3>
         <img src="/static/img/log.jpg" />
         <span>Log</span>
       </a>
-      <a id="signinStats" title="signin stats" href="http://hackerdojo-signin.appspot.com/stats">
-        <img src="/static/img/FILLER.png" />
-        <span>Sign-in Stats</span>
-      </a>
-    </div>
-
-    <div class="chunk">
-      <h3>Misc</h3>
       <a id="kiosk" title="kiosk" href="http://hackerdojo-kiosk.appspot.com/">
         <img src="/static/img/kiosk.png" />
         <span>Kiosk</span>
@@ -102,9 +94,14 @@ <h3>Misc</h3>
         <img src="/static/img/signin.png" />
         <span>Sign In</span>
       </a>
+<!--      
+      <a id="signinStats" title="signin stats" href="http://hackerdojo-signin.appspot.com/stats">
+        <img src="/static/img/FILLER.png" />
+        <span>Sign-in Stats</span>
+      </a>
+ -->
     </div>
-
-
+
   </div>
 </body>
 </html>
diff --git a/static/style.css b/static/style.css
@@ -26,11 +26,16 @@ body {
     padding-top: 4px;
     text-align: right;
 }
+h3{
+    margin-left: 20px;
+    margin-bottom: 0;
+    padding-bottom: 0;
+}
 
 
 .chunk{
-  border-bottom: 1px solid #CCCCCC;
   overflow: hidden;
+  padding: 20px;
 }
 
 .chunk a{
@@ -40,8 +45,8 @@ body {
     text-decoration: none;
 }
 .chunk img{
-    width: 100px;
-    height: 100px;
+    width: 70px;
+    height: 70px;
     margin: 20px;
 }
 .chunk span{