Skip to content

Commit 7f88aaf

Browse files
committed
Upgrade to middleman 4
1 parent f4dea90 commit 7f88aaf

File tree

7 files changed

+98
-117
lines changed

7 files changed

+98
-117
lines changed

Gemfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
source 'https://rubygems.org'
22

33
# Middleman
4-
gem 'middleman', '~>3.3.10'
4+
gem 'middleman', '~>4.0.0'
55
gem 'middleman-gh-pages', '~> 0.0.3'
6-
gem 'middleman-syntax', '~> 2.0.0'
7-
gem 'middleman-autoprefixer', '~> 2.5.0'
8-
gem 'rouge', '~> 1.9.1'
6+
gem 'middleman-syntax', '~> 2.1.0'
7+
gem 'middleman-autoprefixer', '~> 2.7.0'
8+
gem "middleman-sprockets", "~> 4.0.0.rc"
9+
gem 'rouge', '~> 1.10.1'
910
gem 'redcarpet', '~> 3.3.2'
1011

1112
gem 'rake', '~> 10.4.2'

Gemfile.lock

+76-78
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,135 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.1.12)
5-
i18n (~> 0.6, >= 0.6.9)
4+
activesupport (4.2.5.1)
5+
i18n (~> 0.7)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
autoprefixer-rails (5.2.1.1)
10+
addressable (2.4.0)
11+
autoprefixer-rails (6.3.1)
1112
execjs
1213
json
13-
celluloid (0.16.0)
14-
timers (~> 4.0.0)
15-
chunky_png (1.3.4)
14+
backports (3.6.7)
15+
capybara (2.5.0)
16+
mime-types (>= 1.16)
17+
nokogiri (>= 1.3.3)
18+
rack (>= 1.0.0)
19+
rack-test (>= 0.5.4)
20+
xpath (~> 2.0)
1621
coffee-script (2.4.1)
1722
coffee-script-source
1823
execjs
19-
coffee-script-source (1.9.1.1)
20-
compass (1.0.3)
21-
chunky_png (~> 1.2)
22-
compass-core (~> 1.0.2)
23-
compass-import-once (~> 1.0.5)
24-
rb-fsevent (>= 0.9.3)
25-
rb-inotify (>= 0.9)
26-
sass (>= 3.3.13, < 3.5)
27-
compass-core (1.0.3)
28-
multi_json (~> 1.0)
29-
sass (>= 3.3.0, < 3.5)
24+
coffee-script-source (1.10.0)
3025
compass-import-once (1.0.5)
3126
sass (>= 3.2, < 3.5)
27+
concurrent-ruby (0.9.2)
28+
contracts (0.12.0)
3229
erubis (2.7.0)
33-
execjs (2.5.2)
30+
execjs (2.6.0)
31+
fastimage (1.8.1)
32+
addressable (~> 2.3, >= 2.3.5)
3433
ffi (1.9.10)
35-
haml (4.0.6)
34+
haml (4.0.7)
3635
tilt
37-
hike (1.2.3)
38-
hitimes (1.2.2)
39-
hooks (0.4.0)
40-
uber (~> 0.0.4)
36+
hamster (2.0.0)
37+
concurrent-ruby (~> 0.8)
38+
hashie (3.4.3)
4139
i18n (0.7.0)
4240
json (1.8.3)
43-
kramdown (1.8.0)
44-
listen (2.10.1)
45-
celluloid (~> 0.16.0)
41+
kramdown (1.9.0)
42+
listen (3.0.5)
4643
rb-fsevent (>= 0.9.3)
4744
rb-inotify (>= 0.9)
48-
middleman (3.3.12)
45+
middleman (4.0.0)
4946
coffee-script (~> 2.2)
50-
compass (>= 1.0.0, < 2.0.0)
5147
compass-import-once (= 1.0.5)
52-
execjs (~> 2.0)
5348
haml (>= 4.0.5)
5449
kramdown (~> 1.2)
55-
middleman-core (= 3.3.12)
56-
middleman-sprockets (>= 3.1.2)
50+
middleman-cli (= 4.0.0)
51+
middleman-core (= 4.0.0)
5752
sass (>= 3.4.0, < 4.0)
58-
uglifier (~> 2.5)
59-
middleman-autoprefixer (2.5.0)
60-
autoprefixer-rails (~> 5.2.0)
53+
middleman-autoprefixer (2.7.0)
54+
autoprefixer-rails (>= 6.3.1, < 7.0.0)
6155
middleman-core (>= 3.3.3)
62-
middleman-core (3.3.12)
63-
activesupport (~> 4.1.0)
56+
middleman-cli (4.0.0)
57+
thor (>= 0.17.0, < 2.0)
58+
middleman-core (4.0.0)
59+
activesupport (~> 4.2)
60+
addressable (~> 2.4.0)
61+
backports (~> 3.6)
6462
bundler (~> 1.1)
63+
capybara (~> 2.5.0)
64+
contracts (~> 0.12.0)
6565
erubis
66-
hooks (~> 0.3)
66+
execjs (~> 2.0)
67+
fastimage (~> 1.8)
68+
hamster (~> 2.0)
69+
hashie (~> 3.4)
6770
i18n (~> 0.7.0)
68-
listen (>= 2.7.9, < 3.0)
69-
padrino-helpers (~> 0.12.3)
71+
listen (~> 3.0)
72+
padrino-helpers (~> 0.13.0)
7073
rack (>= 1.4.5, < 2.0)
71-
rack-test (~> 0.6.2)
72-
thor (>= 0.15.2, < 2.0)
73-
tilt (~> 1.4.1, < 2.0)
74+
sass (>= 3.4)
75+
tilt (~> 1.4.1)
76+
uglifier (~> 2.6)
7477
middleman-gh-pages (0.0.3)
7578
rake (> 0.9.3)
76-
middleman-sprockets (3.4.2)
77-
middleman-core (>= 3.3)
78-
sprockets (~> 2.12.1)
79-
sprockets-helpers (~> 1.1.0)
80-
sprockets-sass (~> 1.3.0)
81-
middleman-syntax (2.0.0)
82-
middleman-core (~> 3.2)
79+
middleman-sprockets (4.0.0.rc.1)
80+
middleman-core (>= 4.0.0.rc.1)
81+
sprockets (~> 3.0)
82+
middleman-syntax (2.1.0)
83+
middleman-core (>= 3.2)
8384
rouge (~> 1.0)
84-
minitest (5.7.0)
85-
multi_json (1.11.2)
86-
padrino-helpers (0.12.5)
85+
mime-types (3.0)
86+
mime-types-data (~> 3.2015)
87+
mime-types-data (3.2015.1120)
88+
mini_portile2 (2.0.0)
89+
minitest (5.8.4)
90+
nokogiri (1.6.7.2)
91+
mini_portile2 (~> 2.0.0.rc2)
92+
padrino-helpers (0.13.1)
8793
i18n (~> 0.6, >= 0.6.7)
88-
padrino-support (= 0.12.5)
94+
padrino-support (= 0.13.1)
8995
tilt (~> 1.4.1)
90-
padrino-support (0.12.5)
96+
padrino-support (0.13.1)
9197
activesupport (>= 3.1)
9298
rack (1.6.4)
9399
rack-test (0.6.3)
94100
rack (>= 1.0)
95101
rake (10.4.2)
96-
rb-fsevent (0.9.5)
102+
rb-fsevent (0.9.7)
97103
rb-inotify (0.9.5)
98104
ffi (>= 0.5.0)
99-
redcarpet (3.3.2)
100-
rouge (1.9.1)
101-
sass (3.4.16)
102-
sprockets (2.12.4)
103-
hike (~> 1.2)
104-
multi_json (~> 1.0)
105-
rack (~> 1.0)
106-
tilt (~> 1.1, != 1.3.0)
107-
sprockets-helpers (1.1.0)
108-
sprockets (~> 2.0)
109-
sprockets-sass (1.3.1)
110-
sprockets (~> 2.0)
111-
tilt (~> 1.1)
105+
redcarpet (3.3.4)
106+
rouge (1.10.1)
107+
sass (3.4.21)
108+
sprockets (3.4.1)
109+
rack (> 1, < 3)
112110
thor (0.19.1)
113111
thread_safe (0.3.5)
114112
tilt (1.4.1)
115-
timers (4.0.1)
116-
hitimes
117113
tzinfo (1.2.2)
118114
thread_safe (~> 0.1)
119-
uber (0.0.13)
120-
uglifier (2.7.1)
115+
uglifier (2.7.2)
121116
execjs (>= 0.3.0)
122117
json (>= 1.8.0)
118+
xpath (2.0.0)
119+
nokogiri (~> 1.3)
123120

124121
PLATFORMS
125122
ruby
126123

127124
DEPENDENCIES
128-
middleman (~> 3.3.10)
129-
middleman-autoprefixer (~> 2.5.0)
125+
middleman (~> 4.0.0)
126+
middleman-autoprefixer (~> 2.7.0)
130127
middleman-gh-pages (~> 0.0.3)
131-
middleman-syntax (~> 2.0.0)
128+
middleman-sprockets (~> 4.0.0.rc)
129+
middleman-syntax (~> 2.1.0)
132130
rake (~> 10.4.2)
133131
redcarpet (~> 3.3.2)
134-
rouge (~> 1.9.1)
132+
rouge (~> 1.10.1)
135133

136134
BUNDLED WITH
137-
1.10.5
135+
1.10.6
File renamed without changes.

source/layouts/layout.erb

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ under the License.
2424

2525
<%= stylesheet_link_tag :screen, media: :screen %>
2626
<%= stylesheet_link_tag :print, media: :print %>
27+
<style>
28+
<%= Rouge::Themes::Base16::Monokai.render(:scope => '.highlight') %>
29+
</style>
2730
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
2831
<% if current_page.data.search %>
2932
<%= javascript_include_tag "all" %>
File renamed without changes.

source/stylesheets/_syntax.scss.erb

-27
This file was deleted.

source/stylesheets/screen.css.scss

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@charset "utf-8";
22
@import 'normalize';
3-
@import 'compass';
43
@import 'variables';
5-
@import 'syntax';
64
@import 'icon-font';
75

86
/*
@@ -340,7 +338,7 @@ html, body {
340338
padding: 0 $main-padding;
341339
box-sizing: border-box;
342340
display: block;
343-
@include text-shadow($main-embossed-text-shadow);
341+
text-shadow: $main-embossed-text-shadow;
344342

345343
@extend %left-col;
346344
}
@@ -471,20 +469,20 @@ html, body {
471469
aside {
472470
padding-top: 1em;
473471
padding-bottom: 1em;
474-
@include text-shadow(0 1px 0 lighten($aside-notice-bg, 15%));
472+
text-shadow: 0 1px 0 lighten($aside-notice-bg, 15%);
475473
margin-top: 1.5em;
476474
margin-bottom: 1.5em;
477475
background: $aside-notice-bg;
478476
line-height: 1.6;
479477

480478
&.warning {
481479
background-color: $aside-warning-bg;
482-
@include text-shadow(0 1px 0 lighten($aside-warning-bg, 15%));
480+
text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%);
483481
}
484482

485483
&.success {
486484
background-color: $aside-success-bg;
487-
@include text-shadow(0 1px 0 lighten($aside-success-bg, 15%));
485+
text-shadow: 0 1px 0 lighten($aside-success-bg, 15%);
488486
}
489487
}
490488

@@ -511,7 +509,7 @@ html, body {
511509
margin: -2px;
512510
border-radius: 4px;
513511
border: 1px solid #F7E633;
514-
@include text-shadow(1px 1px 0 #666);
512+
text-shadow: 1px 1px 0 #666;
515513
background: linear-gradient(to top left, #F7E633 0%, #F1D32F 100%);
516514
}
517515
}
@@ -534,7 +532,7 @@ html, body {
534532
clear:right;
535533

536534
box-sizing: border-box;
537-
@include text-shadow(0px 1px 2px rgba(0,0,0,0.4));
535+
text-shadow: 0px 1px 2px rgba(0,0,0,0.4);
538536

539537
@extend %right-col;
540538

@@ -618,3 +616,11 @@ html, body {
618616
margin-top: $main-padding;
619617
}
620618
}
619+
620+
.highlight .c, .highlight .cm, .highlight .c1, .highlight .cs {
621+
color: #909090;
622+
}
623+
624+
.highlight, .highlight .w {
625+
background-color: $code-bg;
626+
}

0 commit comments

Comments
 (0)