Skip to content

Commit

Permalink
Add HS logo, rebase on US CIO site, bundle update, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiefolsom committed Mar 12, 2015
1 parent 31c2f1b commit 9e67c6a
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 52 deletions.
113 changes: 62 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,118 +2,129 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.1.4)
i18n (~> 0.6, >= 0.6.9)
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
blankslate (2.1.2.4)
bourbon (4.0.2)
sass (~> 3.3)
bourbon (4.2.1)
sass (~> 3.4)
thor
celluloid (0.15.2)
timers (~> 1.1.0)
classifier (1.3.4)
fast-stemmer (>= 1.0.0)
celluloid (0.16.0)
timers (~> 4.0.0)
classifier-reborn (2.0.3)
fast-stemmer (~> 1.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
coffee-script-source (1.9.1)
colorator (0.1)
execjs (2.2.1)
execjs (2.4.0)
fast-stemmer (1.0.2)
ffi (1.9.3)
ffi (1.9.6)
gemoji (2.1.0)
github-pages (22)
github-pages (33)
RedCloth (= 4.2.9)
jekyll (= 2.2.0)
jekyll-coffeescript (= 1.0.0)
jekyll-mentions (= 0.1.3)
jekyll-redirect-from (= 0.4.0)
github-pages-health-check (~> 0.2)
jekyll (= 2.4.0)
jekyll-coffeescript (= 1.0.1)
jekyll-mentions (= 0.2.1)
jekyll-redirect-from (= 0.6.2)
jekyll-sass-converter (= 1.2.0)
jekyll-sitemap (= 0.5.1)
jemoji (= 0.3.0)
kramdown (= 1.3.1)
jekyll-sitemap (= 0.6.3)
jemoji (= 0.4.0)
kramdown (= 1.5.0)
liquid (= 2.6.1)
maruku (= 0.7.0)
pygments.rb (= 0.6.0)
mercenary (~> 0.3)
pygments.rb (= 0.6.1)
rdiscount (= 2.1.7)
redcarpet (= 3.1.2)
terminal-table (~> 1.4)
github-pages-health-check (0.2.2)
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.2.0)
classifier (~> 1.3)
i18n (0.7.0)
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.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)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-gist (1.1.0)
jekyll-mentions (0.1.3)
jekyll-mentions (0.2.1)
html-pipeline (~> 1.9.0)
jekyll (~> 2.0)
jekyll-paginate (1.0.0)
jekyll-redirect-from (0.4.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.5.1)
jekyll-watch (1.1.0)
jekyll-sitemap (0.6.3)
jekyll-watch (1.2.1)
listen (~> 2.7)
jemoji (0.3.0)
jemoji (0.4.0)
gemoji (~> 2.0)
html-pipeline (~> 1.9)
jekyll (~> 2.0)
json (1.8.1)
kramdown (1.3.1)
json (1.8.2)
kramdown (1.5.0)
liquid (2.6.1)
listen (2.7.9)
listen (2.9.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
maruku (0.7.0)
mercenary (0.3.4)
mini_portile (0.6.0)
minitest (5.4.0)
neat (1.6.0)
bourbon (>= 3.1)
mercenary (0.3.5)
mini_portile (0.6.2)
minitest (5.5.1)
neat (1.7.1)
bourbon (>= 4.0)
sass (>= 3.3)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
net-dns (0.8.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.9)
pygments.rb (0.6.0)
posix-spawn (0.3.10)
public_suffix (1.4.6)
pygments.rb (0.6.1)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
yajl-ruby (~> 1.2.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.3)
sass (3.3.14)
safe_yaml (1.0.4)
sass (3.4.13)
terminal-table (1.4.5)
thor (0.19.1)
thread_safe (0.3.4)
timers (1.1.0)
toml (0.1.1)
thread_safe (0.3.5)
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)
yajl-ruby (1.2.1)

PLATFORMS
ruby
Expand Down
Binary file added assets/images/hs_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div id="introduction">
<div class="outer_container">
<div class="inner_container">
<a id="usds_logo" href="http://whitehouse.gov/digital/united-states-digital-service" title="Link to the United States Digital Service"><img src='{{site.baseurl}}/assets/images/usds_logo.png' alt="Logo of the United States Digital Service"></a>
<a id="hs_logo" href="http://hyperstudio.mit.edu/" title="Link to MIT Hyperstudio"><img src='{{site.baseurl}}/assets/images/hs_logo.png' alt="Logo of MIT Hyperstudio"></a>
{% capture introduction %}{% include introduction.md %}{% endcapture %}
{{ introduction | markdownify }}
<div class="button">
Expand Down

0 comments on commit 9e67c6a

Please sign in to comment.