Merge branch 'redesign' of git://github.com/lucaboieru/planetarytechn…

…ology.github.io into lucaboieru-redesign
planetarytechnology · May 3, 2017 · 7363d88 · 7363d88
2 parents 053c100 + ac25658
commit 7363d88
Show file tree

Hide file tree

Showing 40 changed files with 1,281 additions and 644 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@ _site
 .sass-cache
 .jekyll-metadata
 *.swp
+.DS_Store
 
 node_modules
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,28 @@
+source "https://rubygems.org"
+ruby RUBY_VERSION
+
+# Hello! This is where you manage which Jekyll version is used to run.
+# 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 exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "3.4.3"
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "minima", "~> 2.0"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+   gem "jekyll-feed", "~> 0.6"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,57 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    colorator (1.1.0)
+    ffi (1.9.18)
+    forwardable-extended (2.6.0)
+    jekyll (3.4.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-feed (0.9.2)
+      jekyll (~> 3.3)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.13.2)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    minima (2.1.1)
+      jekyll (~> 3.3)
+    pathutil (0.14.0)
+      forwardable-extended (~> 2.6)
+    public_suffix (2.0.5)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (= 3.4.3)
+  jekyll-feed (~> 0.6)
+  minima (~> 2.0)
+  tzinfo-data
+
+RUBY VERSION
+   ruby 2.3.1p112
+
+BUNDLED WITH
+   1.14.6
diff --git a/_config.yml b/_config.yml
@@ -1,8 +1,52 @@
-name: "Planetary Technology"
-highlighter: "rouge"
-future: true
-repo: "planetarytechnology"
-background: "/img/background.jpg"
+# Welcome to Jekyll!
+#
+# This config file is meant for settings that affect your whole blog, values
+# which you are expected to set up once and rarely edit after that. If you find
+# yourself editing this file very often, consider using Jekyll's data files
+# feature for the data you need to update frequently.
+#
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
+
+# Site settings
+# These are used to personalize your new site. If you look in the HTML files,
+# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
+# You can create any custom variable you would like, and they will be accessible
+# in the templates via {{ site.myvariable }}.
+title: Planetary Technology
+email: [email protected]
+description: > # this means to ignore newlines until "baseurl:"
+  Write an awesome description for your new site here. You can edit this
+  line in _config.yml. It will appear in your document head meta (for
+  Google search results) and in your feed.xml site description.
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "" # the base hostname & protocol for your site, e.g. http://example.com
+twitter_username: planetarytechnology
+github_username: planetarytechnology
+github_url: https://github.com/planetarytechnology/planetarytechnology.github.io
+
+# Build settings
+markdown: kramdown
+gems:
+  - jekyll-feed
+  - jekyll-sass-converter
+exclude:
+  - Gemfile
+  - Gemfile.lock
+sass:
+  sass_dir: _sass
+  style: compressed
+navigation:
+  - text: Standard
+    url: /standard
+  - text: Docs
+    url: /docs
+  - text: Blog
+    url: /blog
+  - text: Roadmap
+    url: /roadmap
+  - text: Team
+    url: /team
 collections:
   space:
     output: true

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,5 +1,3 @@
-<div class="footer">
-	<div class="powered-by">
-		<a href="http://jekyllrb.com/">Powerd by jekyll</a>
-	</div>
-</div>
+<footer class="footer">
+  <a class="powered-by" href="http://jekyllrb.com/" target="_black">Powerd by jekyll</a>
+</footer>
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,23 +1,27 @@
-<div class="nav-main">
-	<div class="brand">
-		<a href="/">Planetary Technology</a>
-	</div>
-	<div>
-		<a href="/standard.html">Standard</a>
-	</div>
-	<div>
-		<a href="/docs.html">Documentations</a>
-	</div>
-	<div>
-		<a href="/blog.html">Blog</a>
-	</div>
-	<div>
-		<a href="/roadmap.html">Roadmap</a>
-	</div>
-	<div>
-		<a href="/team.html">Team</a>
-	</div>
-	<a href="https://github.com/planetarytechnology">
+{% assign url = page.url | remove:'.html' %}
+<header class="nav-main">
+  <div class="brand">
+    <a href="/">
+      <img class="main-logo" src="/img/logo.png" alt="Planetary Technology">
+    </a>
+  </div>
+  <div class="nav-main-links hidden-xs">
+    {% for link in site.navigation %}
+      <a href="{{link.url}}" title="{{link.title}}" {% if url == link.url %}class="active"{% endif %} >{{link.text}}</a>
+    {% endfor %}
+  </div>
+  <div class="burger-icon visible-xs" onClick="$(body).toggleClass('modal-open');">
+    <span></span>
+    <span></span>
+    <span></span>
+  </div>
+  <div class="nav-main-mobile">
+    {% for link in site.navigation %}
+      <a href="{{link.url}}" title="{{link.title}}" {% if url == link.url %}class="active"{% endif %} >{{link.text}}</a>
+    {% endfor %}
+  </div>
+  <div class="clearfix"></div>
+  <a href="https://github.com/planetarytechnology">
 		<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png">
-	</a>
-</div>
+  </a>
+</header>
diff --git a/_includes/includes.html b/_includes/includes.html
@@ -6,10 +6,14 @@
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<!-- Font -->
-<!--<link href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700,300,100' rel='stylesheet' type='text/css'>-->
-<link rel="stylesheet" href="{{page.context}}/css/styles.css">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
 
-<!-- TODO: Include hightlight js -->
-<!-- Navigation -->
-<!--<script src="{{page.context}}/js/custom.js"></script>-->
+<!-- Styles -->
+<link rel="stylesheet" href="{{page.context}}/css/main.css">
+
+<script
+  src="https://code.jquery.com/jquery-3.2.1.min.js"
+  integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
+  crossorigin="anonymous"></script>
+<script src="/js/general.js"></script>
diff --git a/_includes/nav_docs.html b/_includes/nav_docs.html
@@ -1,18 +1,18 @@
 <ul class="nav nav-list">
 {% for project in site.collections %}
 {% if project.label != "posts" %}
-	<li class="open">
-		<a href="/{{ project.label }}/index.html">{{ project.label }}</a>
-		<ul class="nav nav list">
-		{% for document in project.docs %}
-		{% if document.layout != "doc_index" %}
-			<li>
-				<a href="{{ document.url }}">{{ document.title }}</a>
-			</li>
-		{% endif  %}
-		{% endfor %}
-		</ul>
-	</li>
+  <li class="category">
+    <a href="/{{ project.label }}/index.html"><h4>{{ project.label }}</h4></a>
+    <ul class="nav nav-list">
+    {% for document in project.docs %}
+    {% if document.layout != "project_index" %}
+      <li>
+        <a href="{{ document.url }}">{{ document.title }}</a>
+      </li>
+    {% endif  %}
+    {% endfor %}
+    </ul>
+  </li>
 {% endif  %}
 {% endfor  %}
 </ul>
diff --git a/_includes/nav_posts.html b/_includes/nav_posts.html
@@ -1,9 +1,14 @@
 <ul class="nav nav-list">
-	{% for post in site.posts %}
-		{% if post.title %}
-			<li>
-				<a href="{{ post.url }}">{{ post.title }}</a>
-			</li>
-		{% endif %}
-	{% endfor %}
+  <li class="category">
+    <a href="/blog"><h4>Blog</h4></a>
+    <ul class="nav nav-list">
+    {% for post in site.posts %}
+    {% if post.title %}
+      <li>
+        <a href="{{ post.url }}">{{ post.title }}</a>
+      </li>
+    {% endif  %}
+    {% endfor %}
+    </ul>
+  </li>
 </ul>
diff --git a/_layouts/doc.html b/_layouts/doc.html
@@ -1,22 +1,39 @@
 <!doctype html>
-<html lang="en">
+<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
+<!--[if IE 7]>  <html class="no-js ie7 oldie" lang="en"> <![endif]-->
+<!--[if IE 8]>  <html class="no-js ie8 oldie" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
   <head>
     {% include includes.html %}
   </head>
-  <body>
+  <body class="docs">
     {% include header.html %}
-	<div class="content">
-		<div></div>
-		<div>
-			<div class="row">
-				<h1>{{page.title}}</h1>
-			</div>
-			<div class="row">
-				{{ content }}
-			</div>
-		</div>
-		<div></div>
-	</div>
+    <!-- Docs -->
+    <div class="main-container container">
+      <div class="side-container hidden-xs">
+        {% include nav_docs.html %}
+      </div>
+      <div class="content-container">
+        <div class="content-page">
+          <article>
+            <div>
+              <h1>{{page.title}}</h1>
+            </div>
+            {{ content }}
+          </article>
+        </div>
+      </div>
+    </div>
     {% include footer.html %}
+    <div class="sub-nav visible-xs">
+      <div class="nav-btn" onclick="$('body').toggleClass('navigation-open')">
+        NAVIGATE DOCUMENTATION
+        <span class="chevron">
+          <span></span>
+          <span></span>
+        </span>
+      </div>
+      {% include nav_docs.html %}
+    </div>
   </body>
 </html>