From f85fc866fe9a29de5eafc785c85f24450d247d53 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Wed, 23 Sep 2015 18:51:34 -0700 Subject: [PATCH 1/9] Put "Edit this page" link in footer --- website/source/layouts/_footer.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb index df095a820..d2ea893fc 100644 --- a/website/source/layouts/_footer.erb +++ b/website/source/layouts/_footer.erb @@ -7,6 +7,9 @@
  • Intro
  • Docs
  • Community
    • + <% if current_page.url != '/' %> +
  • Edit this page
    • + <% end %>
    From 8895ab751d73b13d94fdefdcc69095ac4845d9ee Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Wed, 23 Sep 2015 18:51:42 -0700 Subject: [PATCH 2/9] Add Makefile --- website/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 website/Makefile diff --git a/website/Makefile b/website/Makefile new file mode 100644 index 000000000..6b32d222a --- /dev/null +++ b/website/Makefile @@ -0,0 +1,11 @@ +all: + build + +init: + bundle + +dev: init + bundle exec middleman server + +build: init + bundle exec middleman build \ No newline at end of file From ec43972b7b0010a1d3b1c2236a73e163391f1caa Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 09:57:38 -0700 Subject: [PATCH 3/9] Update README to point to Makefile --- website/README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/website/README.md b/website/README.md index 0e1c0fa49..cb83f714d 100644 --- a/website/README.md +++ b/website/README.md @@ -12,15 +12,7 @@ requests like any normal GitHub project, and we'll merge it in. ## Running the Site Locally -Running the site locally is simple. First you need a working copy of [Ruby >= 2.0](https://www.ruby-lang.org/en/downloads/) and [Bundler](http://bundler.io/). -Then you can clone this repo and run the following commands from this directory: - -``` -$ bundle -# ( installs all gem dependencies ) -$ bundle exec middleman server -# ( boots the local server ) -``` +Running the site locally is simple. First you need a working copy of [Ruby >= 2.0](https://www.ruby-lang.org/en/downloads/) and [Bundler](http://bundler.io/). Then you can clone this repo and run `make dev`. Then open up `http://localhost:4567`. Note that some URLs you may need to append ".html" to make them work (in the navigation). From f1800a4841a69abcdf471d06c12c54b860767e91 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 10:07:48 -0700 Subject: [PATCH 4/9] `bundle update middleman-hashicorp` --- website/Gemfile.lock | 79 ++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 826d25e8f..fac790740 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://github.com/hashicorp/middleman-hashicorp - revision: 76f0f284ad44cea0457484ea83467192f02daf87 + revision: fc131cfce2a1d5c8671812d9844a944ebb4bd92f specs: middleman-hashicorp (0.1.0) bootstrap-sass (~> 3.3) builder (~> 3.2) less (~> 2.6) - middleman (~> 3.3) + middleman (~> 3.4) middleman-livereload (~> 3.4) middleman-minify-html (~> 3.4) middleman-syntax (~> 2.0) @@ -21,21 +21,25 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.1.12) - i18n (~> 0.6, >= 0.6.9) + activesupport (4.2.4) + 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) - autoprefixer-rails (5.2.1) + autoprefixer-rails (6.0.3) execjs json bootstrap-sass (3.3.5.1) autoprefixer-rails (>= 5.0.0.1) sass (>= 3.3.0) builder (3.2.2) - celluloid (0.16.0) - timers (~> 4.0.0) + capybara (2.4.4) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) chunky_png (1.3.4) coffee-script (2.4.1) coffee-script-source @@ -59,16 +63,15 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.7) - execjs (2.5.2) + eventmachine (1.0.8) + execjs (2.6.0) ffi (1.9.10) git-version-bump (0.15.1) - haml (4.0.6) + haml (4.0.7) tilt hike (1.2.3) - hitimes (1.2.2) - hooks (0.4.0) - uber (~> 0.0.4) + hooks (0.4.1) + uber (~> 0.0.14) htmlcompressor (0.2.0) http_parser.rb (0.6.0) i18n (0.7.0) @@ -77,34 +80,33 @@ GEM less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.11) - listen (2.10.1) - celluloid (~> 0.16.0) + listen (3.0.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.3.12) + middleman (3.4.0) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.12) + middleman-core (= 3.4.0) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.3.12) - activesupport (~> 4.1.0) + middleman-core (3.4.0) + activesupport (~> 4.1) bundler (~> 1.1) + capybara (~> 2.4.4) erubis hooks (~> 0.3) i18n (~> 0.7.0) - listen (>= 2.7.9, < 3.0) + listen (~> 3.0.3) padrino-helpers (~> 0.12.3) rack (>= 1.4.5, < 2.0) - rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-livereload (3.4.2) + middleman-livereload (3.4.3) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) @@ -119,8 +121,12 @@ GEM middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - minitest (5.7.0) + mime-types (2.6.2) + mini_portile (0.6.2) + minitest (5.8.1) multi_json (1.11.2) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.5) @@ -128,7 +134,7 @@ GEM padrino-support (0.12.5) activesupport (>= 3.1) rack (1.6.4) - rack-contrib (1.3.0) + rack-contrib (1.4.0) git-version-bump (~> 0.15) rack (~> 1.4) rack-livereload (0.3.16) @@ -136,16 +142,16 @@ GEM rack-protection (1.5.3) rack rack-rewrite (1.5.1) - rack-ssl-enforcer (0.2.8) + rack-ssl-enforcer (0.2.9) rack-test (0.6.3) rack (>= 1.0) - rb-fsevent (0.9.5) + rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.3.2) ref (2.0.0) - rouge (1.9.1) - sass (3.4.16) + rouge (1.10.1) + sass (3.4.18) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -159,24 +165,27 @@ GEM therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thin (1.6.3) + thin (1.6.4) daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) + eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timers (4.0.1) - hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.13) - uglifier (2.7.1) + uber (0.0.15) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES middleman-hashicorp! + +BUNDLED WITH + 1.10.6 From 22c2d6cf21cec706143533a88ec67506f4d6c221 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 10:29:03 -0700 Subject: [PATCH 5/9] Fix up spacing --- website/Makefile | 8 ++++---- website/source/layouts/_footer.erb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/website/Makefile b/website/Makefile index 6b32d222a..ba2a5b1de 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,11 +1,11 @@ all: - build + build init: - bundle + bundle dev: init - bundle exec middleman server + bundle exec middleman server build: init - bundle exec middleman build \ No newline at end of file + bundle exec middleman build \ No newline at end of file diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb index d2ea893fc..c190d0879 100644 --- a/website/source/layouts/_footer.erb +++ b/website/source/layouts/_footer.erb @@ -7,9 +7,9 @@
  • Intro
  • Docs
  • Community
    • - <% if current_page.url != '/' %> -
  • Edit this page
    • - <% end %> + <% if current_page.url != '/' %> +
  • Edit this page
    • + <% end %>
    From 0bda98899ebe1c996598acd9c51676e2782423a4 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 10:59:16 -0700 Subject: [PATCH 6/9] Make wants tabs --- website/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/Makefile b/website/Makefile index ba2a5b1de..6b32d222a 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,11 +1,11 @@ all: - build + build init: - bundle + bundle dev: init - bundle exec middleman server + bundle exec middleman server build: init - bundle exec middleman build \ No newline at end of file + bundle exec middleman build \ No newline at end of file From b593502dcbc89481e61a6699b8345f39dd04b2da Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 11:29:04 -0700 Subject: [PATCH 7/9] _footer spacing fix --- website/source/layouts/_footer.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb index c190d0879..791861e42 100644 --- a/website/source/layouts/_footer.erb +++ b/website/source/layouts/_footer.erb @@ -6,10 +6,10 @@
    From 462167521e8c77d351cd9029df59655007b4f3f7 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 11:31:17 -0700 Subject: [PATCH 8/9] Single tab in makefile --- website/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/Makefile b/website/Makefile index 6b32d222a..bb857f17c 100644 --- a/website/Makefile +++ b/website/Makefile @@ -5,7 +5,7 @@ init: bundle dev: init - bundle exec middleman server + bundle exec middleman server build: init - bundle exec middleman build \ No newline at end of file + bundle exec middleman build \ No newline at end of file From 2e89ac1da0c3108e54decf1d8601a7a5c5e0afdf Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Thu, 24 Sep 2015 11:48:52 -0700 Subject: [PATCH 9/9] fix Makefile --- website/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/Makefile b/website/Makefile index bb857f17c..63bb4cab1 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,5 +1,4 @@ -all: - build +all: build init: bundle