Merge branch 'master' into canary

docs/Gemfile

@@ -4,11 +4,12 @@ source "https://rubygems.org"
 # When you want to use a different version, change it below, save the
 # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
 #
+#     bundle install --path .vendor/bundle
 #     bundle exec jekyll serve
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.0.0"
+gem "jekyll", "~> 3.8.7"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "jekyll-theme-slate", "~> 0.1.1"

docs/_config.yml

@@ -34,6 +34,7 @@ markdown: kramdown
 # to override the default setting.
 exclude:
     - summary.psd
+    - logos.psd
 
 # exclude:
 #   - Gemfile

docs/_layouts/rising.html

@@ -124,6 +124,26 @@
           font-size: 32px;
         }
 
+
+        #logo {
+            box-shadow: none;
+            border: none;
+            display: block;
+            margin-top: 1.5rem;
+        }
+
+        #slogan {
+            box-shadow: none;
+            border: none;
+        }
+
+        h1.logo-header,
+        h2.slogan-header {
+            display: none;
+        }
+
+
+
     </style>
 
 
@@ -138,7 +158,10 @@
         <header class="inner">
           <a id="forkme_banner" href="{{ site.github.repository_url }}">View on GitHub</a>
 
-          <h1 id="project_title">{{ site.title }}</h1>
+          <h1 class="logo-header" id="project_title">{{ site.title }}</h1>
+
+          <img src="assets/images/logo.png" id="logo" />
+
           <h2 id="project_tagline">{{ site.description }}</h2>
 
           {% if site.show_downloads %}

docs/index.md

@@ -2,9 +2,13 @@
 layout: rising
 ---
 
-## What is this?!
+<h2 class="slogan-header">Modded for Your Pleasure</h2>
+<img src="./assets/images/slogan.png" id="slogan" />
 
-**F-Chat Rising** is an extended version of the [original F-Chat 3.0 client](https://wiki.f-list.net/F-Chat_3.0). It offers new features, bug fixes, and usability improvements.
+**F-Chat Rising** is an extended version of the [original F-Chat 3.0 client](https://wiki.f-list.net/F-Chat_3.0) with new features, bug fixes, and usability improvements.
+
+You'll connect with the same F-List, same players, and same channels you're already used to.
+You'll just do it with style!
 
 Scroll down to see a [feature summary](#link-previews), or take a look at a more [detailed list of features](https://github.com/mrstallion/fchat-rising/blob/master/README.md#key-differences).