Merge pull request #10 from mjashanks/master

REVAMP WEBSITE
aletheia-foundation · Oct 5, 2017 · a967734 · a967734
2 parents 1c50815 + 8f4930c
commit a967734
Show file tree

Hide file tree

Showing 24 changed files with 248 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .sass-cache/
 _site
+.jekyll-metadata/
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,7 +51,7 @@ DEPENDENCIES
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.3.5p376
 
 BUNDLED WITH
-   1.14.6
+   1.15.4
diff --git a/_config.yml b/_config.yml
@@ -31,3 +31,14 @@ gems:
 exclude:
   - Gemfile
   - Gemfile.lock
+
+sass:
+  sass_dir: _sass
+  style: :compressed
+
+defaults:
+  -
+    scope:
+      path: "" # an empty string here means all files in the project
+    values:
+      layout: "default"
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -0,0 +1,9 @@
+<footer>
+    <div id="footer-container">
+        <a href="https://www.facebook.com/aletheiaf/"><i class="fa fa-facebook-official" aria-hidden="true"></i></a>
+        <a href="https://twitter.com/aletheia_f"><i class="fa fa-twitter" aria-hidden="true"></i></a>
+        <a href="https://aletheiafoundation.slack.com"><i class="fa fa-slack" aria-hidden="true"></i></a>
+        <a href="https://github.com/aletheia-foundation"><i class="fa fa-github" aria-hidden="true"></i></a>
+        <a href="mailto:[email protected]"><i class="fa fa-envelope-o" aria-hidden="true"></i>
+    </div>
+</footer>
diff --git a/_includes/head.html b/_includes/head.html
@@ -0,0 +1,13 @@
+<head>
+    <meta charset="utf-8">            
+    <title>Aletheia</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" href="/favicon.ico"/>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans|Playfair+Display+SC" rel="stylesheet">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+    {% if page.stylesheet  %}
+    <link rel="stylesheet" href="/css/{{ page.stylesheet }}.css" type="text/css">
+    {% elsif layout.stylesheet  %}
+    <link rel="stylesheet" href="/css/{{ layout.stylesheet }}.css" type="text/css">
+    {% endif %}
+</head>
diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,7 @@
+<header>
+    <a href="/">Home</a>
+    <a href="https://github.com/aletheia-foundation/aletheia-app">Download</a>
+    <a href="/about">About</a>
+    <a href="#">Blog</a>
+    <a href="https://github.com/aletheia-foundation/aletheia-admin">Get Involved</a>
+ </header>
diff --git a/_layouts/blogpost.html b/_layouts/blogpost.html
@@ -0,0 +1,26 @@
+---
+stylesheet: blogpost
+---
+
+<!DOCTYPE html>
+<html>
+
+    {% include head.html %}
+
+<body>
+
+    {% include header.html %}
+
+    <main>
+        <div id="post-container">
+
+            {{ content }}
+
+        </div>
+    </main>
+
+    {% include footer.html %}
+
+</body>
+</html>
+
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -0,0 +1,5 @@
+---
+stylesheet: none
+---
+
+{{ content }}
diff --git a/_posts/2017-03-06-welcome-to-jekyll.markdown b/_posts/2017-03-06-welcome-to-jekyll.markdown
diff --git a/_posts/2017-06-04-aletheia-at-the-mozilla-global-sprint-2017.markdown b/_posts/2017-06-04-aletheia-at-the-mozilla-global-sprint-2017.markdown
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: blogpost
 title:  "Aletheia at the Mozilla Global Sprint 2017"
 date:   2017-06-04 19:23:11 +1000
 categories: Aletheia

diff --git a/_sass/common.sass b/_sass/common.sass
@@ -0,0 +1,20 @@
+
+html
+    width: 100%
+    min-height: 100%
+    margin: 0
+    padding: 0
+
+
+body 
+    width: 100%
+    height: 100%
+    /* https://pixabay.com/en/landscape-forest-trees-jungle-2584127/ */
+    background-image: url("/images/bg4.jpg")
+    background-size: 100% 100%
+    background-attachment: fixed 
+    margin: 0
+    padding: 0
+
+$aletheia_grey: rgba(130,130,131,1)
+$aletheia_darkgreen: rgba(26,170,90,1)
diff --git a/_sass/footer.sass b/_sass/footer.sass
@@ -0,0 +1,27 @@
+
+footer 
+    position: fixed
+    bottom: 0
+    left: 0
+    height: 30px
+    background: black
+    width: 100%
+
+
+#footer-container 
+    margin: auto
+    position: relative
+    top: 3px
+    width: 100%
+    text-align: center
+
+
+#footer-container i 
+    margin: 0 20px
+    color: $aletheia_grey
+    font-size: 24px
+    vertical-align: middle
+
+
+#footer-container i:hover 
+    color: whitesmoke
diff --git a/_sass/header.sass b/_sass/header.sass
@@ -0,0 +1,28 @@
+
+header 
+    position: fixed
+    top: 0
+    left: 0
+    height: 34px
+    background: black
+    width: 100%
+    text-align: right
+    font-family: 'Open Sans', sans-serif
+    z-index: 1
+
+
+header a 
+    color: $aletheia_grey
+    border-style: solid
+    border-width: 0 1px 0 0
+    text-decoration: none
+    font-size: 14pt
+    padding: 4px 30px
+    position: relative
+    top: 5px
+    font-weight: bold
+
+
+header a:hover 
+    color: whitesmoke
+    border-color: $aletheia_grey
diff --git a/about.md b/about.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: blogpost
 title: About
 permalink: /about/
 ---

diff --git a/css/blogpost.sass b/css/blogpost.sass
@@ -0,0 +1,29 @@
+---
+# Front matter comment to ensure Jekyll properly reads file.
+---
+
+@import "common"
+@import "header"
+@import "footer"
+
+main
+    min-height: calc(100% - 64px)
+    position: relative
+    top: 34px
+    width: 100%
+    color: #555f61
+    font-size: 13pt    
+
+#post-container
+    /*height minus header and footer*/ 
+    min-height: calc(100% - 64px) 
+    background: white
+    width: 900px
+    font-family: Calibri, sans-serif
+    padding: 20px
+    margin: auto
+
+h1, h2, h3, h4, h5
+    color: $aletheia_darkgreen
+
+
diff --git a/css/landing.sass b/css/landing.sass
@@ -0,0 +1,35 @@
+---
+# Front matter comment to ensure Jekyll properly reads file.
+---
+
+@import "common"
+@import "header"
+@import "footer"
+
+main 
+    position: fixed
+    top: 20%
+    left: 0
+    width: 100%
+
+#mid-section-container 
+    padding: 20px
+    background: rgba(255, 255, 255, 0.8)
+    width: 700px
+    margin: auto
+
+#logo-container 
+    margin-left: auto  
+    margin-right: auto
+
+#logo-container img 
+    width: 200px 
+    display: block
+    margin: auto
+
+#title 
+    font-size: 40px
+    color: $aletheia_darkgreen
+    text-align: center
+    margin-top: 35px
+    font-family: 'Calibri', sans-serif
diff --git a/favicon.ico b/favicon.ico
diff --git a/images/Aletheia_Logo.png b/images/Aletheia_Logo.png
diff --git a/images/Aletheia_Logo_200.png b/images/Aletheia_Logo_200.png
diff --git a/images/aletheia_square.png b/images/aletheia_square.png
diff --git a/images/aletheia_square_32.png b/images/aletheia_square_32.png
diff --git a/images/bg4.jpg b/images/bg4.jpg
diff --git a/index.html b/index.html
@@ -0,0 +1,33 @@
+---
+title: Aletheia
+stylesheet: landing
+layout: null
+---
+
+<!DOCTYPE html>
+<html>
+
+    {% include head.html %}
+
+<body>
+
+    {% include header.html %}
+
+    <main>
+        <div id="mid-section-container">
+
+            <div id="logo-container">
+                <img src="images/Aletheia_Logo_200.png"> 
+            </div>
+
+            <div id="title">
+                    A Decentralised, Open Access, <br/>Publishing Platform for Scientific Research
+            </div>
+
+        </div>
+    </main>
+
+    {% include footer.html %}
+
+</body>
+</html>
diff --git a/index.md b/index.md