Hotfix/redesign

.gitignore

@@ -1,9 +1,8 @@
+_site
+.sass-cache
+.jekyll-metadata
 .jekyll-cache/
 _site
 vendor/
 .bundle/
-.DS_Store
-.DS_Store/
-.bundle/
 .sass_cache/
-vendor/

404.html

@@ -0,0 +1,15 @@
+---
+layout: page
+title: Page not found
+image:
+permalink: /404.html
+---
+<div class="container">
+  <div class="row">
+    <div class="col col-12" style="text-align: center">
+      <h2>404</h2>
+      <p>The requested page could not be found.</p>
+      <p><a href="{{site.baseurl}}/">Back to the home page</a></p>
+    </div>
+  </div>
+</div>

Gemfile

@@ -1,8 +1,5 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# gem "rails"
-gem "jekyll"
+source 'https://rubygems.org'
+gem 'bundler'
+gem 'jekyll'
+gem 'jekyll-sitemap'
+gem 'wdm', '>= 0.1.0'

Gemfile.lock

@@ -4,64 +4,69 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.12.2)
+    eventmachine (1.2.7-x64-mingw32)
+    ffi (1.11.1)
+    ffi (1.11.1-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.2)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (4.0.0)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.9.5, < 2)
-      jekyll-sass-converter (~> 2.0)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
-      kramdown-parser-gfm (~> 1.0)
+      kramdown (~> 1.14)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-sitemap (1.3.1)
+      jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
+    kramdown (1.17.0)
     liquid (4.0.3)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mercenary (0.3.6)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.1)
+    rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.17.0)
+    rouge (3.3.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.5)
-    sassc (2.2.1)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    wdm (0.1.1)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
+  bundler
   jekyll
+  jekyll-sitemap
+  wdm (>= 0.1.0)
 
 BUNDLED WITH
    2.1.4

README.md

@@ -17,3 +17,4 @@ bundle install
 ```bash
 bundle exec jekyll serve
 ```
+>>>>>>> c85bdb916171fa2687de58814168632ebbea42fe

_config.yml

@@ -1,8 +1,28 @@
-baseurl: "/"
-url: "hack.productions"
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "https://hack.productions" # the base hostname & protocol for your site, e.g. http://example.com
 
-title: Hack Productions
-description: Live Event Production, with style.
+# Build settings
+markdown: kramdown
+permalink: pretty
+plugins:
+  - jekyll-sitemap
 
+# Pages Path
+defaults:
+  - scope:
+      path: '_pages'
+    values:
+      permalink: /:basename:output_ext
+
+include:
+  - _pages
+
 sass:
-  sass_dir: _sass
+  sass_dir: assets/scss
+  style: compressed
+
+# Exclude from processing.
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - vendor

_data/plugins.yml

@@ -0,0 +1,13 @@
+################ CSS Plugins #####################
+css:
+  - "/assets/plugins/bootstrap/bootstrap.min.css"
+  - "/assets/plugins/themify-icons/themify-icons.css"
+  - "/assets/plugins/slick/slick.css"
+
+
+################ JS Plugins ######################
+js:
+  - "/assets/plugins/jQuery/jquery.min.js"
+  - "/assets/plugins/bootstrap/bootstrap.min.js"
+  - "/assets/plugins/shuffle/shuffle.min.js"
+  - "/assets/plugins/slick/slick.min.js"