streamlines for release

theuggla · Nov 16, 2016 · 2ed84f1 · 2ed84f1
1 parent 23612c4
commit 2ed84f1
Show file tree

Hide file tree

Showing 33 changed files with 471 additions and 250 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 
 ## Installation
 
+### As a gem
+
 Add this line to your Jekyll site's Gemfile:
 
 ```ruby
@@ -21,6 +23,12 @@ Or install it yourself as:
 
     $ gem install lysande
 
+### From GitHub
+
+Make sure you have Jekyll installed. Fork this repository, pull it down on your computer,
+and start changing away in the files you want changed. It comes with all you need for a
+fully working site.
+
 ## Usage
 
 The theme comes with four layouts: default, post, projects and blog. It includes a header, footer and a global
@@ -29,7 +37,8 @@ navigation menu.
 It is intended to be used with a _projects folder, where markdown documents representing your projects can be stored.
 Without the _projects folder, it is possible to use it as a blog with _posts only.
 
-For sharing in line with Open Graph, include an image named 'share.png' in your /assets directory.
+For sharing in line with Open Graph, include the name for your image (including .png)
+in your config file under image, and place it in your /assets directory.
 
 ### _config.yml
 The theme supports usernames to various social media sites. If you add in any of these usernames in your config file, an icon
@@ -119,18 +128,18 @@ for them are included as _projects and _blog. The _responsive makes the site res
 
 Full list of _sass as follows:
 
-@include '_base.scss'  --- basic styling
-@include '_menu.scss' --- global menu
-@include '_projects.scss' --- page that displays projects
-@include '_blog.scss' --- main blog page with links to blog posts
-@include '_responsive.scss' --- makes site responsive
+1. @include '_base.scss'  --- basic styling
+2. @include '_menu.scss' --- global menu
+3. @include '_projects.scss' --- page that displays projects
+4. @include '_blog.scss' --- main blog page with links to blog posts
+5. @include '_responsive.scss' --- makes site responsive
 
 Full list of _layouts as follows:
 
-default   --- includes head, globalnav, footer, header
-post      --- based on default, includes post title and disqus support
-blog      --- based on default, includes all posts in _posts, a local nav list to all the posts and disqus comment count
-projects  --- based on default, includes all projects in _projects and a local nav list of categories if more
+1. default   --- includes head, globalnav, footer, header
+2. post      --- based on default, includes post title and disqus support
+3. blog      --- based on default, includes all posts in _posts, a local nav list to all the posts and disqus comment count
+4. projects  --- based on default, includes all projects in _projects and a local nav list of categories if more
 categories than three and/or a small screen display
 
 

diff --git a/_config.yml b/_config.yml
@@ -0,0 +1,59 @@
+# Welcome to Lysande!
+#
+# 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 these 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
+# '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: your name - portfolio
+email: example@gmail.com
+description: > This is a splendid website about me.
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "" # the base hostname & protocol for your site
+author: Arthur Dent
+image: defaultprofile.png
+rss: true
+
+#usernames
+disqus_shortname:
+twitter_username:
+github_username:
+tumblr_username:
+instagram_username:
+facebook_username:
+youtube_username:
+pinterest_username:
+
+# Build settings
+markdown: kramdown
+theme: lysande
+
+# Change the categories of projects to match yours!
+# Collections
+collections:
+  projects:
+    categories: [code, design, publish]
+
+# Defaults
+defaults:
+  -
+     scope:
+        path: ""
+     values:
+        layout: "default"
+  -
+     scope:
+        path: ""
+        type: "posts"
+     values:
+        layout: "post"
+
+
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,5 +1,5 @@
 <footer class="footer">
     <div class="wrapper">
-        <a href="https://github.com/theuggla/lysande-jekyll-theme"><img src="{{ "/assets/theme_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="Theme: lysande" /></a>
+        <a href="https://github.com/theuggla/lysande-jekyll-theme"><img src="{{ "/assets/icons/theme_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="Theme: lysande" /></a>
     </div>
 </footer>
diff --git a/_includes/globalnav.html b/_includes/globalnav.html
@@ -9,4 +9,4 @@
         {% endif %}
         {% endfor %}
     </ul>
-</nav>
+</nav>
diff --git a/_includes/head.html b/_includes/head.html
@@ -7,7 +7,7 @@
     <meta property="og:title" content="{{site.title}}" />
     <meta property="og:type" content="website" />
     <meta property="og:url" content="{{site.url}}{{site.baseurl}}" />
-    <meta property="og:image" content="{{ "/assets/share.png" | prepend: site.baseurl | prepend: site.url }}" />
+    <meta property="og:image" content="{{ "/assets/{{site.image}}" | prepend: site.baseurl | prepend: site.url }}" />
     <meta property="og:description" content="{{site.description}}" />
     <meta property="og:determiner" content="the" />
     <meta property="og:locale" content="en_GB" />

diff --git a/_includes/header.html b/_includes/header.html
@@ -3,49 +3,51 @@
         <h1><a href="{{"/index.html" | prepend: site.baseurl | prepend: site.url }}">{{site.author | downcase}}</a></h1>
         <aside class="links">
             <ul>
-                {% if site.github_username %}
+            {% if site.github_username %}
                 <li>
-                    <a href="https://github.com/{{site.github_username}}"><img src="{{ "/assets/github_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="github"/></a>
+                    <a href="https://github.com/{{site.github_username}}"><img src="{{ "/assets/icons/github_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="github"/></a>
                 </li>
-                {% endif %}
-                {% if site.tumblr_username %}
+            {% endif %}
+            {% if site.tumblr_username %}
                 <li>
-                    <a href="https://{{site.tumblr_username}}.tumblr.com/"><img src="{{ "/assets/tumblr_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="tumblr"/></a>
+                    <a href="https://{{site.tumblr_username}}.tumblr.com/"><img src="{{ "/assets/icons/tumblr_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="tumblr"/></a>
                 </li>
-                {% endif %}
-                {% if site.facebook_username %}
+            {% endif %}
+            {% if site.facebook_username %}
                 <li>
-                    <a href="https://facebook.com/{{site.facebook_username}}"><img src="{{ "/assets/facebook_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="facebook"/></a>
+                    <a href="https://facebook.com/{{site.facebook_username}}"><img src="{{ "/assets/icons/facebook_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="facebook"/></a>
                 </li>
-                {% endif %}
-                {% if site.pinterest_username %}
+            {% endif %}
+            {% if site.pinterest_username %}
                 <li>
-                    <a href="https://pinterest.com/{{site.pinterest_username}}"><img src="{{ "/assets/pinterest_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="pinterest"/></a>
+                    <a href="https://pinterest.com/{{site.pinterest_username}}"><img src="{{ "/assets/icons/pinterest_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="pinterest"/></a>
                 </li>
-                {% endif %}
-                {% if site.youtube_username %}
+            {% endif %}
+            {% if site.youtube_username %}
                 <li>
-                    <a href="https://youtube.com/{{site.youtube_username}}"><img src="{{ "/assets/youtube_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="youtube"/></a>
+                    <a href="https://youtube.com/{{site.youtube_username}}"><img src="{{ "/assets/icons/youtube_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="youtube"/></a>
                 </li>
-                {% endif %}
-                {% if site.instagram_username %}
+            {% endif %}
+            {% if site.instagram_username %}
                 <li>
-                    <a href="https://instagram.com/{{site.instagram_username}}"><img src="{{ "/assets/instagram_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="instagram"/></a>
+                    <a href="https://instagram.com/{{site.instagram_username}}"><img src="{{ "/assets/icons/instagram_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="instagram"/></a>
                 </li>
-                {% endif %}
-                {% if site.twitter_username %}
+            {% endif %}
+            {% if site.twitter_username %}
                 <li>
-                    <a href="https://twitter.com/{{site.twitter_username}}"><img src="{{ "/assets/twitter_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="twitter"/></a>
+                   <a href="https://twitter.com/{{site.twitter_username}}"><img src="{{ "/assets/icons/twitter_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="twitter"/></a>
                 </li>
-                {% endif %}
-                {% if site.email %}
+            {% endif %}
+            {% if site.email %}
                 <li>
-                    <a href="mailto:{{site.email}}"><img src="{{ "/assets/email_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="email" title="{{site.email}}" /></a>
+                    <a href="mailto:{{site.email}}"><img src="{{ "/assets/icons/email_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="email" title="{{site.email}}" /></a>
                 </li>
-                {% endif %}
-                {% if site.rss %}
-                <a href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}"><img src="{{ "/assets/rss_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="rss feed"/>
-                {% endif %}
+            {% endif %}
+            {% if site.rss %}
+                <li>
+                    <a href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}"><img src="{{ "/assets/icons/rss_icon.png" | prepend: site.baseurl | prepend: site.url }}" alt="rss feed"/></a>
+                </li>
+            {% endif %}
             </ul>
         </aside>
     </div>

diff --git a/_layouts/blog.html b/_layouts/blog.html
@@ -41,4 +41,3 @@ <h3 id="{{post.title | slugify}}">{{ post.title }}</h3>
     }());
 </script>
 {% endif %}
-
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -11,18 +11,17 @@ <h2>{% if page.title %}{{page.title}}{% endif %}</h2>
 
     {% if page.comments %}
     <div id="disqus_thread">
-        <script type="text/javascript">
-            var disqus_shortname = "{{site.disqus_shortname}}";
+    <script type="text/javascript">
+        var disqus_shortname = "{{site.disqus_shortname}}";
 
-            (function() {
-                var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-                dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-            })();
-        </script>
-        <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-        <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-        {% endif %}
-    </div>
+        (function() {
+            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
+    </script>
+    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+    {% endif %}
 </div>
-
+    </div>
diff --git a/_layouts/projects.html b/_layouts/projects.html
@@ -2,21 +2,23 @@
 layout: default
 ---
 
-{% for collection in site.collections | where: "collection.label","projects" %}
+{% assign count = site.collections.projects.categories.size %}
 
-{% if collection.categories.size == 1 %}
+{% if count == 1 %}
 {% assign projects = "one" %}
-{% elsif collection.categories.size == 2 %}
+{% elsif count == 2 %}
 {% assign projects = "two" %}
-{% elsif collection.categories.size == 3 %}
+{% elsif count == 3 %}
 {% assign projects = "three" %}
 {% else %}
 {% assign projects = "many" %}
 {% endif %}
 
+
+
 <nav class="{{projects}}">
     <ul>
-        {% for category in collection.categories %}
+        {% for category in site.collections.projects.categories %}
         <li>
             <a href="#{{category}}">{{category}}</a>
         </li>
@@ -27,20 +29,20 @@
 {{content}}
 
 <div class="projects-content">
-    {% for category in collection.categories %}
+    {% for category in site.collections.projects.categories %}
     <section class="{{projects}}">
         <h2 id="{{category}}">{{category}}</h2>
         <ul>
             {% for project in site.projects %}
             {% if project.category contains category %}
             <li>
                 <h3>{{ project.title | escape }}</h3>
-                {{project.content}}
+                <p>[{{project.tags}}]</p>
+                <p>{{project.content}}</p>
             </li>
             {% endif %}
             {% endfor %}
         </ul>
     </section>
     {% endfor %}
-    {% endfor %}
 </div>
diff --git a/_posts/2016-11-16-if-hermione-wrote-java.markdown b/_posts/2016-11-16-if-hermione-wrote-java.markdown
@@ -0,0 +1,19 @@
+---
+url: /if-hermione-wrote-java
+title: "if hermione wrote java"
+layout: post
+comments: true
+---
+one of the most intriguing things about programming is the communicative aspect. to
+invent a language to speak to the computer, that is clear enough that humans can understand
+it when reading it years and years later, while also making a program that works in a way that it
+will be understood by a third person who's using it.
+
+coding is like literature. coding is like inventing an reading and writing and
+interacting and logic at the same time. to invent a language to speak to the computer, while
+speaking. to write a history about something happening while making it happen. basically it's magic.
+
+when I was little I wanted to invent stuff. then I wanted to be a chimney sweeper.
+then I wanted to be a writer. then I wanted to be a matematician. then I wanted to be hermione granger,
+and finally I thought that what is most important in life is communication and people understanding each other.
+to do programming is being all of those things at once. except the chimney sweeper.
diff --git a/_sass/_blog.scss b/_sass/_blog.scss
@@ -2,7 +2,7 @@
     overflow: auto;
 
     .localnav {
-        width: 15%;
+        width: 20%;
         float: right;
         margin-top: $base-sizing;
 
@@ -76,7 +76,6 @@
         }
 
         img {
-            max-width: 50%;
             display: block;
             margin: $center;
             padding: $base-spacing 0;
@@ -92,13 +91,6 @@
     h2 {
         font-family: simplificasimplifica, serif;
     }
-
-    img {
-        max-width: 50%;
-        display: block;
-        margin: $center;
-        padding: $base-spacing 0;
-    }
 }
 
 .post-content {