From 05cd09f12da313207fb2eb031982b3a15a4f843f Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 13 May 2015 18:44:04 +0200
Subject: Link in header on 'Botleagues'; About page

---
 gulpfile.js                  |  1 +
 src/about.jade               | 24 ++++++++++--------------
 src/css/general.less         |  4 ++++
 src/include/layout-main.jade |  4 ++--
 src/logout.jade              |  3 +--
 5 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 src/css/general.less

diff --git a/gulpfile.js b/gulpfile.js
index 868e3ff..96768e7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -119,6 +119,7 @@ gulp.task('styles', function() {
     
     var sources = [
         './src/css/forms.less',
+        './src/css/general.less',
         './src/css/profile.less',
         './src/css/bootswatch-' + bootswatch_theme + '.less'
     ];
diff --git a/src/about.jade b/src/about.jade
index 0ae837d..7781682 100644
--- a/src/about.jade
+++ b/src/about.jade
@@ -9,17 +9,13 @@ block header
 
 block content
   .row
-    .col-lg-6
-      h4 Subheading
-      p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
-      h4 Subheading
-      p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.
-      h4 Subheading
-      p Maecenas sed diam eget risus varius blandit sit amet non magna.
-    .col-lg-6
-      h4 Subheading
-      p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
-      h4 Subheading
-      p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.
-      h4 Subheading
-      p Maecenas sed diam eget risus varius blandit sit amet non magna.
\ No newline at end of file
+    .col-lg-12: :markdown
+      Botleagues is an open source software solution with three aspects:
+      
+      * A Game Controller that lets software bots play games against each other (handled by Java)
+      * A semi-RESTful API that allows users to register, create competitions and play against other bots (with Laravel 4.2 and Dingo API)
+      * A front-end to the API (entirely client-side code, using Bootstrap and jade)
+      
+      You may find more information on [GitHub](https://github.com/camilstaps/Botleagues).
+
+      If you wish to contact the developers, please consider adding an issue on GitHub. If that's not what you want: you can reach us at info [at] camilstaps [dot] nl.
\ No newline at end of file
diff --git a/src/css/general.less b/src/css/general.less
new file mode 100644
index 0000000..1218018
--- /dev/null
+++ b/src/css/general.less
@@ -0,0 +1,4 @@
+a.no-style {
+    color: inherit !important;
+    text-decoration: inherit !important;
+}
\ No newline at end of file
diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade
index abbb466..12c283e 100644
--- a/src/include/layout-main.jade
+++ b/src/include/layout-main.jade
@@ -9,7 +9,7 @@ html(lang="en")
       block menu
         -var selected = '/'; //default
 
-      -var menu = { 'Home': '/', 'About': '/about', 'Contact': '/contact' };
+      -var menu = { 'Home': '/', 'About': '/about' };
 
       .header.clearfix
         nav: ul.nav.nav-pills.pull-right#nav
@@ -19,7 +19,7 @@ html(lang="en")
             else
               li(role='presentation'): a(href=val,title=key)= key
           li.login-link(role='presentation'): a.btn-botleagues-login(href='#',title='Login') Login
-        h3 Botleagues
+        h3: a.no-style(href='/') Botleagues
 
       #messages
 
diff --git a/src/logout.jade b/src/logout.jade
index d19e44a..14c9aac 100644
--- a/src/logout.jade
+++ b/src/logout.jade
@@ -7,5 +7,4 @@ block content
   p Logging you out...
 
 block js
-  script(type='text/javascript')
-    |$(document).ready(function(){ Botleagues.logout(); });
\ No newline at end of file
+  script(type='text/javascript') $(document).ready(function(){ Botleagues.logout(); });
\ No newline at end of file
-- 
cgit v1.2.3