nikolaswise · WhitneyGomes · Apr 11, 2017 · Apr 11, 2017
diff --git a/404.html b/404.html
@@ -0,0 +1,10 @@
+---
+layout: default
+title: "404: Page not found"
+permalink: 404.html
+---
+
+<div class="page">
+  <h1 class="page-title">404: Page not found</h1>
+  <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.baseurl }}">Head back home</a> to try finding it again.</p>
+</div>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,4 @@
+# jekyll-reveal change log
+
+## v1.0.0
+* Initial release
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,10 @@
+# Released under MIT License
+
+Original work Copyright (c) 2014 Mark Otto.
+Modified work Copyright (c) 2015 Nate Goldman.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # J608 - Web Design & Interactivity
 > 4/23, 4/30, 5/7, 6/4 — 10h00-15h00
 
@@ -9,9 +10,19 @@ [email protected]
 ```
 
 ## Overview
+=======
+# jekyll-reveal
 
-This workshop will introduce the professional practice, language, and methodology of design for the web. The goal of the workshop to provide a solid basis for a journalist working with a web design team.
+A [Jekyll](http://jekyllrb.com) template for quickly writing slides in markdown. Based on [mdo](https://github.com/mdo)'s [Lanyon](http://lanyon.getpoole.com) theme and [hakimel](https://github.com/hakimel)'s [reveal.js](http://lab.hakim.se/reveal-js) HTML presentation framework.
 
+This is a *very* preliminary experimental release. Please pardon the mess.
+
+## Usage
+>>>>>>> nikolaswise/gh-pages
+
+Clone it
+
+<<<<<<< HEAD
 In the course of this workshop, we will be introducing and discussing both the technical structures of web design as well as the independent disciplines within the field. You will be learning the basics of creating web sites, starting from HTML, CSS, and JavaScript. Alongside the basics, you will produce a project that combines your journalistic process with one of the disciplines of web design. The final day of class will be a discussion of these projects, demonstrating a firm grasp of how to communicate in a web-driven design discussion.
 
 Graduate students will be expected to engage in a more rigorous final project, and will produce more work in assignments as described in the [schedule](#schedule)
@@ -32,7 +43,7 @@ Office hours can be scheduled on an individual bases as needed.
 
 ### Grading
 
-All projects must be finished during the term. Finall grades will be based on overall participation and engagement with the material. Not finishing any one of the projects will result in an F. An A+ will be contingent on demonstrating exemplary growth in the duration of the course.
+All projects must be finished during the term. Final grades will be based on overall participation and engagement with the material. Not finishing any one of the projects will result in an F. An A+ will be contingent on demonstrating exemplary growth in the duration of the course.
 
 ### Attendance
 
@@ -48,7 +59,7 @@ Under certain circumstances (computer caught on fire / chopped off fingers), ext
 
 ### Canceled Classes
 
-If I need to cancel a class (chopped off fingers / computer caught on fire) I will notify the class via e-mail, canvas, and twitter.
+If I need to cancel a class (chopped off fingers / computer caught on fire) I will notify the class via e-mail, Canvas, and Twitter.
 
 ### Universality, Inclusion, and Conduct
 
@@ -59,11 +70,34 @@ I am committed to teaching a class where all are welcome and included, with Univ
 - Sign up for an [account on Github](https://github.com/join?source=header-home).
 - [Fork](https://help.github.com/articles/fork-a-repo/) this [repository](https://github.com/nikolaswise/web-design-workshop).
 - Fixing typos in this syllabus via a [Pull Request](https://help.github.com/articles/using-pull-requests/) will be seen as an excellent start.
+=======
+```
+git clone [email protected]:ngoldman/jekyll-reveal.git slides
+```
+
+Create a slide
+
+```
+cd slides
+touch _slides/prism-bloopers.md
+$EDITOR _slides/prism-bloopers.md
+```
+
+```md
+---
+title: Prism Bloopers
+---
+
+# Surveillance Lols!
 
-#### Suggested Reading
+---
+>>>>>>> nikolaswise/gh-pages
 
-The below articles from [_A List Apart_](http://alistapart.com/) are a small sampler on the language, scope, and approaches of contemporary web design and how it got there. They should give an overview, or at least a frame of reference, of the ground to be covered in the workshop without a large amount of technical jargon. Exploring _A List Apart_ further is highly encouraged.
+![](http://cdn3.vox-cdn.com/assets/4717906/VpmftGR__2_.gif)
 
+haha we have fun here
+
+<<<<<<< HEAD
 - [_Breaking Stuff_ by Laura Kalbag](http://alistapart.com/column/breaking-stuff)
 - [_Our Enclosed Space_ by Rachel Andrew](http://alistapart.com/column/our-enclosed-space)
 - [_Responsive Comping_ by Matt Griffin](http://alistapart.com/article/responsive-comping-obtaining-signoff-with-mockups)
@@ -78,13 +112,18 @@ The below articles from [_A List Apart_](http://alistapart.com/) are a small sam
 - Fixing typos in this syllabus via a [Pull Request](https://help.github.com/articles/using-pull-requests/) will be seen as an excellent start.
 
 ### 4/23 - What is Web Design?
+=======
+---
 
-- Introduction of Technical Aspects
-- Disciplines within Web Design
-- Introduction to GitHub
+## but seriously
+```
+>>>>>>> nikolaswise/gh-pages
 
-#### For Next Session
+**Important**: Edit [`_config.yml`](_config.yml) to reflect wherever you'll be pushing this to.
 
+Push to your new gh-pages repo
+
+<<<<<<< HEAD
 Read Paul Ford's excellent expose [What is Code?](http://www.bloomberg.com/graphics/2015-paul-ford-what-is-code/)
 
 Create a website using github pages using HTML, CSS, and JavaScript. This web site needs at least 3 pages. The content should be something that you think is interesting. An explanation of the project will live in the repo's `README.md` file, and be written in Markdown.
@@ -116,14 +155,28 @@ Create an [issue](https://guides.github.com/features/issues/) on this repository
 Provide 2 examples of each. Much more depth in analysis and critique is expected.
 
 ### 5/7 - Deep Dive into Design
+=======
+```
+git add origin [email protected]:NationalSecurityAgency/slides.git
+git push origin gh-pages
+```
 
-- Discussion of sites located by students
-- Generate ideas for individual projects.
+Visit your new slides
+>>>>>>> nikolaswise/gh-pages
 
+```
+https://nationalsecurityagency.github.io/slides/prism-bloopers/
+```
+
+<<<<<<< HEAD
 #### For Next Session
+=======
+## License
+>>>>>>> nikolaswise/gh-pages
 
-Complete your project laid out in todays workshop. Be prepared to present and have a discussion about your project.
+[MIT](LICENSE.md)
 
+<<<<<<< HEAD
 ##### Grad Students
 
 Will write ~1k words on how their project relates to the discussions about design critique and sub-disciplines, provided references and examples from the web.
@@ -134,3 +187,8 @@ Will write ~1k words on how their project relates to the discussions about desig
 - Final discussion about the relationship between Journalism and Web Design.
 
 
+=======
+## Credit
+
+Thanks to [mdo](https://github.com/mdo) & [hakimel](https://github.com/hakimel) for all of their work creating great tools for internet people.
+>>>>>>> nikolaswise/gh-pages
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1,50 @@
+# Dependencies
+markdown:             redcarpet
+highlighter:          pygments
+
+# Permalinks
+#
+# Use of `relative_permalinks` ensures post links from the index work properly.
+permalink:            pretty
+relative_permalinks:  true
+
+# Setup
+title:                J608
+tagline:              'Web Design Workshop - Introductory Pixel Pushing'
+description:          "An introduction to the principles and practice of designing things for the Internet."
+url:                  /web-design-workshop
+baseurl:              '/web-design-workshop'
+paginate:             5
+
+# About/contact
+author:
+  name:               'Nikolas Wise'
+  url:                https://github.com/nikolaswise
+
+# Custom vars
+version:              1.0.0
+
+github:
+  repo:               https://github.com/nikolaswise/web-design-workshop
+
+# Extra
+safe:                 true # replicate gh-pages env
+timezone:             America/Los_Angeles
+encoding:             utf-8
+
+# fix for weird travis-ci build error
+# http://www.markcampbell.me/jekyll/heroku/2013/05/18/how-to-set-up-jekyll-on-heroku.html
+exclude:              ['vendor']
+
+collections:
+  slides:
+    permalink: /:path/
+    output: true
+
+defaults:
+  -
+    scope:
+      path: ''
+      type: 'slides'
+    values:
+      layout: 'slides'
diff --git a/_includes/head.html b/_includes/head.html
@@ -0,0 +1,25 @@
+<link href="http://gmpg.org/xfn/11" rel="profile">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+<!-- Enable responsiveness on mobile devices-->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
+
+<title>
+  {% if page.title == "Home" %}
+    {{ site.title }} &middot; {{ site.tagline }}
+  {% else %}
+    {{ page.title }} &middot; {{ site.title }}
+  {% endif %}
+</title>
+
+<!-- CSS -->
+<link rel="stylesheet" href="{{ site.baseurl }}/public/css/style.css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
+
+<!-- Icons -->
+<!-- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/public/apple-touch-icon-precomposed.png">
+<link rel="shortcut icon" href="{{ site.baseurl }}/public/favicon.ico"> -->
+
+<!-- RSS -->
+<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
@@ -0,0 +1,38 @@
+<!-- Target for toggling the sidebar `.sidebar-checkbox` is for regular
+     styles, `#sidebar-checkbox` for behavior. -->
+<input type="checkbox" class="sidebar-checkbox" id="sidebar-checkbox">
+
+<!-- Toggleable sidebar -->
+<div class="sidebar" id="sidebar">
+  <div class="sidebar-item">
+    <p>{{ site.description }}</p>
+  </div>
+
+  <nav class="sidebar-nav">
+    <a class="sidebar-nav-item{% if page.url == site.baseurl %} active{% endif %}" href="{{ site.baseurl }}/">Home</a>
+
+    {% comment %}
+      The code below dynamically generates a sidebar nav of pages with
+      `layout: page` in the front-matter. See readme for usage.
+    {% endcomment %}
+
+    {% assign pages_list = site.pages | sort:"url" %}
+    {% for node in pages_list %}
+      {% if node.title != null %}
+        {% if node.layout == "page" %}
+          <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ node.url }}">{{ node.title }}</a>
+        {% endif %}
+      {% endif %}
+    {% endfor %}
+
+    <a class="sidebar-nav-item" href="{{ site.github.repo }}/archive/v{{ site.version }}.zip">Download</a>
+    <a class="sidebar-nav-item" href="{{ site.github.repo }}">GitHub project</a>
+    <span class="sidebar-nav-item">Currently v{{ site.version }}</span>
+  </nav>
+
+  <div class="sidebar-item">
+    <p>
+      &copy; {{ site.time | date: '%Y' }}. All rights reserved.
+    </p>
+  </div>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="en-us">
+
+  <head>
+    {% include head.html %}
+  </head>
+
+  <body>
+
+    {% include sidebar.html %}
+
+    <!-- Wrap is the content to shift when toggling the sidebar. We wrap the
+         content to avoid any CSS collisions with our real content. -->
+    <div class="wrap">
+      <div class="masthead">
+        <div class="container">
+          <h3 class="masthead-title">
+            <a href="{{ site.baseurl }}/" title="Home">{{ site.title }}</a>
+            <small>{{ site.tagline }}</small>
+          </h3>
+        </div>
+      </div>
+
+      <div class="container content">
+        {{ content }}
+      </div>
+    </div>
+
+    <label for="sidebar-checkbox" class="sidebar-toggle"></label>
+
+    <script>
+      (function(document) {
+        var toggle = document.querySelector('.sidebar-toggle');
+        var sidebar = document.querySelector('#sidebar');
+        var checkbox = document.querySelector('#sidebar-checkbox');
+
+        document.addEventListener('click', function(e) {
+          var target = e.target;
+
+          if(!checkbox.checked ||
+             sidebar.contains(target) ||
+             (target === checkbox || target === toggle)) return;
+
+          checkbox.checked = false;
+        }, false);
+      })(document);
+    </script>
+  </body>
+</html>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -0,0 +1,8 @@
+---
+layout: default
+---
+
+<div class="page">
+  <h1 class="page-title">{{ page.title }}</h1>
+  {{ content }}
+</div>
diff --git a/_layouts/slides.html b/_layouts/slides.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
+
+  <head>
+    {% include head.html %}
+    <link rel="stylesheet" href="{{ site.baseurl }}/public/css/slides.css">
+  </head>
+
+  <body>
+
+    {% include sidebar.html %}
+
+    <div class="wrap reveal"><div class="slides">
+    <section data-markdown data-separator="^\n---\n$">
+        <script type="text/template">
+          {{ content }}
+        </script>
+    </section>
+    </div></div>
+
+    <label for="sidebar-checkbox" class="sidebar-toggle"></label>
+
+    <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+    <script src="{{ site.baseurl }}/public/js/md.min.js"></script>
+    <script src="{{ site.baseurl }}/public/js/head.min.js"></script>
+    <script src="{{ site.baseurl }}/public/js/reveal.min.js"></script>
+    <script src="{{ site.baseurl }}/public/js/shame.js"></script>
+  </body>
+</html>