Skip to content

Commit

Permalink
first round of content
Browse files Browse the repository at this point in the history
  • Loading branch information
Ewan Klein committed Nov 23, 2014
1 parent c619bb9 commit 27c1001
Show file tree
Hide file tree
Showing 5 changed files with 159 additions and 8 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'github-pages'
126 changes: 126 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.1.8)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
blankslate (2.1.2.4)
celluloid (0.16.0)
timers (~> 4.0.0)
classifier-reborn (2.0.2)
fast-stemmer (~> 1.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
colorator (0.1)
execjs (2.2.2)
fast-stemmer (1.0.2)
ffi (1.9.6)
gemoji (2.1.0)
github-pages (29)
RedCloth (= 4.2.9)
github-pages-health-check (~> 0.1)
jekyll (= 2.4.0)
jekyll-coffeescript (= 1.0.0)
jekyll-mentions (= 0.1.3)
jekyll-redirect-from (= 0.6.2)
jekyll-sass-converter (= 1.2.0)
jekyll-sitemap (= 0.6.0)
jemoji (= 0.3.0)
kramdown (= 1.3.1)
liquid (= 2.6.1)
maruku (= 0.7.0)
mercenary (~> 0.3)
pygments.rb (= 0.6.0)
rdiscount (= 2.1.7)
redcarpet (= 3.1.2)
terminal-table (~> 1.4)
github-pages-health-check (0.2.1)
net-dns (~> 0.6)
public_suffix (~> 1.4)
hitimes (1.2.2)
html-pipeline (1.9.0)
activesupport (>= 2)
nokogiri (~> 1.4)
i18n (0.6.11)
jekyll (2.4.0)
classifier-reborn (~> 2.0)
colorator (~> 0.1)
jekyll-coffeescript (~> 1.0)
jekyll-gist (~> 1.0)
jekyll-paginate (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 2.6.1)
mercenary (~> 0.3.3)
pygments.rb (~> 0.6.0)
redcarpet (~> 3.1)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.0)
coffee-script (~> 2.2)
jekyll-gist (1.1.0)
jekyll-mentions (0.1.3)
html-pipeline (~> 1.9.0)
jekyll (~> 2.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.6.2)
jekyll (~> 2.0)
jekyll-sass-converter (1.2.0)
sass (~> 3.2)
jekyll-sitemap (0.6.0)
jekyll-watch (1.1.2)
listen (~> 2.7)
jemoji (0.3.0)
gemoji (~> 2.0)
html-pipeline (~> 1.9)
jekyll (~> 2.0)
json (1.8.1)
kramdown (1.3.1)
liquid (2.6.1)
listen (2.8.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
maruku (0.7.0)
mercenary (0.3.5)
mini_portile (0.6.1)
minitest (5.4.3)
net-dns (0.8.0)
nokogiri (1.6.4.1)
mini_portile (~> 0.6.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.9)
public_suffix (1.4.6)
pygments.rb (0.6.0)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdiscount (2.1.7)
redcarpet (3.1.2)
safe_yaml (1.0.4)
sass (3.4.8)
terminal-table (1.4.5)
thread_safe (0.3.4)
timers (4.0.1)
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
github-pages
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ safe: false
### site serving configuration ###
exclude: [CNAME, README.md, .gitignore]
permalink: / ## disables post output
timezone: null
timezone: Europe/London
lsi: false
markdown: kramdown
highlighter: pygments


### content configuration ###
title: "SinglePaged - Title: Edit me in _config.yml!"
keywords: "SinglePaged, jekyll, template, github, blog, single page"
description: "A single-page template for Jekyll based blogs (like what you'd use on github pages!)"
source_link: "https://github.com/t413/SinglePaged"
title: "Smart Data Hack"
keywords: "smart data hack, ilwhack, informatics, university of edinburgh, ilw, innovatio lab"
description: "Home page for the University of Edinburgh Smart Data Hack"
source_link: "https://github.com/ilwhack/ilwhack.github.io"
favicon: #put a path like: "img/favicon.ico"
touch_icon: #put a path like: "img/apple-touch-icon.png"
google_analytics_key: ## put YOUR key here to enable tracking! (blank to disable)
Expand Down
4 changes: 1 addition & 3 deletions _includes/footer.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@


Design by Tim O'Brien [t413.com](http://t413.com/)
—
[SinglePaged theme](https://github.com/t413/SinglePaged)
SinglePaged theme](https://github.com/t413/SinglePaged)
—
this site is [open source]({{ site.source_link }})

25 changes: 25 additions & 0 deletions _posts/2014-01-01-intro.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
title: "home"
bg: purple
color: black
---

# Innovation Lab + Smart Data Hack


The **Innovation Lab + Smart Data Hack** is a 5-day event during the University of Edinburgh's [Innovative Learning Week](http://www.ed.ac.uk/staff-students/students/academic-life/studies/innovative-learning/innovative-learning-week) that brings students to work together to build cool solutions for real-world problems. It encourages interdisciplinary teams to combine their skills in digital technology, business analysis, ethnography and design.

It is hosted by the [School of Informatics](http://www.ed.ac.uk/schools-departments/informatics/) in partnership with

* [The Business School](http://www.business-school.ed.ac.uk/),
* [The School of Design](http://www.eca.ed.ac.uk/school-of-design)
* [The School of Social and Political Sciences](http://www.sps.ed.ac.uk)
* [The Global Development Academy](http://www.ed.ac.uk/schools-departments/global-development)
* [Edinburgh Living Lab](hgttp://edinburghlivinglab.org)

Last year's Smart Data Hack was a runaway success, and this year we are expanding the event by including more challenges from more partners!

## When and where?

It's happening from Mon 16th to Fri 20th February 2015 in Appleton
Tower Levels 4 and 5.

0 comments on commit 27c1001

Please sign in to comment.