Skip to content

Commit a006bcc

Browse files
Updated slate to 1.2
1 parent 58f0403 commit a006bcc

40 files changed

+3656
-2827
lines changed

.editorconfig

+6
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,9 @@ trim_trailing_whitespace = false
2020
insert_final_newline = false
2121
indent_size = 2
2222
tab_width = 2
23+
indent_style = space
24+
25+
[*.scss]
26+
indent_size = 2
27+
tab_width = 2
28+
indent_style = space

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM ubuntu:trusty
22

33
RUN apt-get update
4-
RUN apt-get install -yq ruby ruby-dev build-essential
4+
RUN apt-get install -yq ruby ruby-dev build-essential git
55
RUN gem install --no-ri --no-rdoc bundler
66
ADD Gemfile /app/Gemfile
77
ADD Gemfile.lock /app/Gemfile.lock
88
RUN cd /app; bundle install
99
ADD . /app
1010
EXPOSE 4567
1111
WORKDIR /app
12-
CMD ["bundle", "exec", "middleman", "server"]
12+
CMD ["bundle", "exec", "middleman", "server"]

Gemfile

+12-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,12 @@
1-
# If you have OpenSSL installed, we recommend updating
2-
# the following line to use "https"
3-
source 'http://rubygems.org'
4-
5-
gem "middleman", "~>3.3.0"
6-
7-
# For syntax highlighting
8-
gem "middleman-syntax"
9-
10-
# Plugin for middleman to generate Github pages
11-
gem 'middleman-gh-pages'
12-
13-
# Live-reloading plugin
14-
gem "middleman-livereload", "~> 3.3.0"
15-
16-
gem 'redcarpet', '~> 3.1.1'
17-
18-
# For faster file watcher updates on Windows:
19-
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
20-
21-
# Cross-templating language block fix for Ruby 1.8
22-
platforms :mri_18 do
23-
gem "ruby18_source_location"
24-
end
25-
26-
gem "rake", "~> 10.3.0"
27-
28-
gem 'therubyracer', :platforms => :ruby
1+
source 'https://rubygems.org'
2+
3+
# Middleman
4+
gem 'middleman', '~>3.3.10'
5+
gem 'middleman-gh-pages', '~> 0.0.3'
6+
gem 'middleman-syntax', '~> 2.0.0'
7+
gem 'middleman-autoprefixer', '~> 2.4.4'
8+
gem 'rouge', '~> 1.9.0'
9+
gem 'redcarpet', '~> 3.3.1'
10+
11+
gem 'rake', '~> 10.4.2'
12+
gem 'therubyracer', '~> 0.12.1', platforms: :ruby

Gemfile.lock

+45-52
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.1.9)
4+
activesupport (4.1.11)
55
i18n (~> 0.6, >= 0.6.9)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.1)
99
tzinfo (~> 1.1)
10+
autoprefixer-rails (5.2.0.1)
11+
execjs
12+
json
1013
celluloid (0.16.0)
1114
timers (~> 4.0.0)
12-
chunky_png (1.3.3)
13-
coffee-script (2.3.0)
15+
chunky_png (1.3.4)
16+
coffee-script (2.4.1)
1417
coffee-script-source
1518
execjs
16-
coffee-script-source (1.8.0)
19+
coffee-script-source (1.9.1.1)
1720
compass (1.0.3)
1821
chunky_png (~> 1.2)
1922
compass-core (~> 1.0.2)
@@ -26,45 +29,43 @@ GEM
2629
sass (>= 3.3.0, < 3.5)
2730
compass-import-once (1.0.5)
2831
sass (>= 3.2, < 3.5)
29-
em-websocket (0.5.1)
30-
eventmachine (>= 0.12.9)
31-
http_parser.rb (~> 0.6.0)
3232
erubis (2.7.0)
33-
eventmachine (1.0.4)
34-
execjs (2.2.2)
35-
ffi (1.9.6)
33+
execjs (2.5.2)
34+
ffi (1.9.8)
3635
haml (4.0.6)
3736
tilt
3837
hike (1.2.3)
3938
hitimes (1.2.2)
4039
hooks (0.4.0)
4140
uber (~> 0.0.4)
42-
http_parser.rb (0.6.0)
43-
i18n (0.6.11)
44-
json (1.8.2)
45-
kramdown (1.5.0)
41+
i18n (0.7.0)
42+
json (1.8.3)
43+
kramdown (1.7.0)
4644
libv8 (3.16.14.7)
47-
listen (2.8.5)
48-
celluloid (>= 0.15.2)
45+
listen (2.10.1)
46+
celluloid (~> 0.16.0)
4947
rb-fsevent (>= 0.9.3)
5048
rb-inotify (>= 0.9)
51-
middleman (3.3.7)
49+
middleman (3.3.12)
5250
coffee-script (~> 2.2)
5351
compass (>= 1.0.0, < 2.0.0)
5452
compass-import-once (= 1.0.5)
5553
execjs (~> 2.0)
5654
haml (>= 4.0.5)
5755
kramdown (~> 1.2)
58-
middleman-core (= 3.3.7)
56+
middleman-core (= 3.3.12)
5957
middleman-sprockets (>= 3.1.2)
6058
sass (>= 3.4.0, < 4.0)
6159
uglifier (~> 2.5)
62-
middleman-core (3.3.7)
60+
middleman-autoprefixer (2.4.4)
61+
autoprefixer-rails (~> 5.2.0)
62+
middleman-core (>= 3.3.3)
63+
middleman-core (3.3.12)
6364
activesupport (~> 4.1.0)
6465
bundler (~> 1.1)
6566
erubis
6667
hooks (~> 0.3)
67-
i18n (~> 0.6.9)
68+
i18n (~> 0.7.0)
6869
listen (>= 2.7.9, < 3.0)
6970
padrino-helpers (~> 0.12.3)
7071
rack (>= 1.4.5, < 2.0)
@@ -73,40 +74,33 @@ GEM
7374
tilt (~> 1.4.1, < 2.0)
7475
middleman-gh-pages (0.0.3)
7576
rake (> 0.9.3)
76-
middleman-livereload (3.3.4)
77-
em-websocket (~> 0.5.1)
78-
middleman-core (~> 3.2)
79-
rack-livereload (~> 0.3.15)
80-
middleman-sprockets (3.4.1)
77+
middleman-sprockets (3.4.2)
8178
middleman-core (>= 3.3)
8279
sprockets (~> 2.12.1)
8380
sprockets-helpers (~> 1.1.0)
8481
sprockets-sass (~> 1.3.0)
8582
middleman-syntax (2.0.0)
8683
middleman-core (~> 3.2)
8784
rouge (~> 1.0)
88-
minitest (5.5.1)
89-
multi_json (1.10.1)
90-
padrino-helpers (0.12.4)
85+
minitest (5.7.0)
86+
multi_json (1.11.1)
87+
padrino-helpers (0.12.5)
9188
i18n (~> 0.6, >= 0.6.7)
92-
padrino-support (= 0.12.4)
89+
padrino-support (= 0.12.5)
9390
tilt (~> 1.4.1)
94-
padrino-support (0.12.4)
91+
padrino-support (0.12.5)
9592
activesupport (>= 3.1)
96-
rack (1.6.0)
97-
rack-livereload (0.3.15)
98-
rack
93+
rack (1.6.4)
9994
rack-test (0.6.3)
10095
rack (>= 1.0)
101-
rake (10.3.2)
102-
rb-fsevent (0.9.4)
96+
rake (10.4.2)
97+
rb-fsevent (0.9.5)
10398
rb-inotify (0.9.5)
10499
ffi (>= 0.5.0)
105-
redcarpet (3.1.2)
100+
redcarpet (3.3.1)
106101
ref (1.0.5)
107-
rouge (1.7.7)
108-
ruby18_source_location (0.2)
109-
sass (3.4.10)
102+
rouge (1.9.0)
103+
sass (3.4.14)
110104
sprockets (2.12.3)
111105
hike (~> 1.2)
112106
multi_json (~> 1.0)
@@ -117,31 +111,30 @@ GEM
117111
sprockets-sass (1.3.1)
118112
sprockets (~> 2.0)
119113
tilt (~> 1.1)
120-
therubyracer (0.12.1)
114+
therubyracer (0.12.2)
121115
libv8 (~> 3.16.14.0)
122116
ref
123117
thor (0.19.1)
124-
thread_safe (0.3.4)
118+
thread_safe (0.3.5)
125119
tilt (1.4.1)
126120
timers (4.0.1)
127121
hitimes
128122
tzinfo (1.2.2)
129123
thread_safe (~> 0.1)
130124
uber (0.0.13)
131-
uglifier (2.7.0)
125+
uglifier (2.7.1)
132126
execjs (>= 0.3.0)
133127
json (>= 1.8.0)
134128

135129
PLATFORMS
136130
ruby
137131

138132
DEPENDENCIES
139-
middleman (~> 3.3.0)
140-
middleman-gh-pages
141-
middleman-livereload (~> 3.3.0)
142-
middleman-syntax
143-
rake (~> 10.3.0)
144-
redcarpet (~> 3.1.1)
145-
ruby18_source_location
146-
therubyracer
147-
wdm (~> 0.1.0)
133+
middleman (~> 3.3.10)
134+
middleman-autoprefixer (~> 2.4.4)
135+
middleman-gh-pages (~> 0.0.3)
136+
middleman-syntax (~> 2.0.0)
137+
rake (~> 10.4.2)
138+
redcarpet (~> 3.3.1)
139+
rouge (~> 1.9.0)
140+
therubyracer (~> 0.12.1)

LICENSE

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2008-2013 Concur Technologies, Inc.
2+
3+
Licensed under the Apache License, Version 2.0 (the "License"); you may
4+
not use this file except in compliance with the License. You may obtain
5+
a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11+
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12+
License for the specific language governing permissions and limitations
13+
under the License.

Rakefile

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
require 'middleman-gh-pages'
2+
require 'rake/clean'
3+
4+
CLOBBER.include('build')
25

36
task :default => [:build]
47

config.rb

+22-23
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
1-
require './lib/redcarpet_header_fix'
2-
1+
# Markdown
2+
set :markdown_engine, :redcarpet
3+
set :markdown,
4+
fenced_code_blocks: true,
5+
smartypants: true,
6+
disable_indented_code_blocks: true,
7+
prettify: true,
8+
tables: true,
9+
with_toc_data: true,
10+
no_intra_emphasis: true
11+
12+
# Assets
313
set :css_dir, 'stylesheets'
4-
514
set :js_dir, 'javascripts'
6-
715
set :images_dir, 'images'
8-
916
set :fonts_dir, 'fonts'
1017

11-
set :markdown_engine, :redcarpet
12-
13-
set :markdown, :fenced_code_blocks => true, :smartypants => true, :disable_indented_code_blocks => true, :prettify => true, :tables => true, :with_toc_data => true, :no_intra_emphasis => true
14-
1518
# Activate the syntax highlighter
1619
activate :syntax
1720

18-
# This is needed for Github pages, since they're hosted on a subdomain
21+
activate :autoprefixer do |config|
22+
config.browsers = ['last 2 version', 'Firefox ESR']
23+
config.cascade = false
24+
config.inline = true
25+
end
26+
27+
# Github pages require relative links
1928
activate :relative_assets
2029
set :relative_links, true
2130

22-
# Build-specific configuration
31+
# Build Configuration
2332
configure :build do
24-
# For example, change the Compass output style for deployment
2533
activate :minify_css
26-
27-
# Minify Javascript on build
2834
activate :minify_javascript
29-
30-
# Enable cache buster
31-
# activate :asset_hash
32-
33-
# Use relative URLs
3435
# activate :relative_assets
35-
36-
# Or use a different image path
37-
# set :http_prefix, "/Content/images/"
36+
# activate :asset_hash
37+
# activate :gzip
3838
end
39-

0 commit comments

Comments
 (0)