Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Commit 77cdc3f

Browse files
committed
Update gems and new markup styling issue
1 parent 5e649aa commit 77cdc3f

File tree

3 files changed

+71
-57
lines changed

3 files changed

+71
-57
lines changed

Gemfile.lock

Lines changed: 64 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (4.0.4)
4+
activesupport (4.1.7)
55
i18n (~> 0.6, >= 0.6.9)
6-
minitest (~> 4.2)
7-
multi_json (~> 1.3)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
88
thread_safe (~> 0.1)
9-
tzinfo (~> 0.3.37)
10-
chunky_png (1.3.0)
11-
coffee-script (2.2.0)
9+
tzinfo (~> 1.1)
10+
celluloid (0.16.0)
11+
timers (~> 4.0.0)
12+
chunky_png (1.3.3)
13+
coffee-script (2.3.0)
1214
coffee-script-source
1315
execjs
14-
coffee-script-source (1.7.0)
15-
compass (0.12.6)
16+
coffee-script-source (1.8.0)
17+
compass (1.0.1)
1618
chunky_png (~> 1.2)
17-
fssm (>= 0.2.7)
18-
sass (~> 3.2.19)
19-
compass-import-once (1.0.4)
19+
compass-core (~> 1.0.1)
20+
compass-import-once (~> 1.0.5)
21+
rb-fsevent (>= 0.9.3)
22+
rb-inotify (>= 0.9)
23+
sass (>= 3.3.13, < 3.5)
24+
compass-core (1.0.1)
25+
multi_json (~> 1.0)
26+
sass (>= 3.3.0, < 3.5)
27+
compass-import-once (1.0.5)
2028
sass (>= 3.2, < 3.5)
21-
em-websocket (0.5.0)
29+
em-websocket (0.5.1)
2230
eventmachine (>= 0.12.9)
23-
http_parser.rb (~> 0.5.3)
31+
http_parser.rb (~> 0.6.0)
2432
erubis (2.7.0)
2533
eventmachine (1.0.3)
26-
execjs (2.0.2)
27-
ffi (1.9.3)
28-
fssm (0.2.10)
34+
execjs (2.2.2)
35+
ffi (1.9.6)
2936
haml (4.0.5)
3037
tilt
3138
hike (1.2.3)
39+
hitimes (1.2.2)
3240
hooks (0.4.0)
3341
uber (~> 0.0.4)
34-
http_parser.rb (0.5.3)
35-
i18n (0.6.9)
42+
http_parser.rb (0.6.0)
43+
i18n (0.6.11)
3644
json (1.8.1)
37-
kramdown (1.3.3)
38-
libv8 (3.16.14.3)
39-
listen (1.3.1)
45+
kramdown (1.5.0)
46+
libv8 (3.16.14.7)
47+
listen (2.7.11)
48+
celluloid (>= 0.15.2)
4049
rb-fsevent (>= 0.9.3)
4150
rb-inotify (>= 0.9)
42-
rb-kqueue (>= 0.2)
43-
middleman (3.3.2)
44-
coffee-script (~> 2.2.0)
45-
compass (>= 0.12.4)
46-
compass-import-once (~> 1.0.4)
51+
middleman (3.3.6)
52+
coffee-script (~> 2.2)
53+
compass (>= 1.0.0, < 2.0.0)
54+
compass-import-once (= 1.0.5)
4755
execjs (~> 2.0)
4856
haml (>= 4.0.5)
4957
kramdown (~> 1.2)
50-
middleman-core (= 3.3.2)
58+
middleman-core (= 3.3.6)
5159
middleman-sprockets (>= 3.1.2)
52-
sass (>= 3.2.17, < 4.0)
60+
sass (>= 3.4.0, < 4.0)
5361
uglifier (~> 2.5)
54-
middleman-core (3.3.2)
55-
activesupport (~> 4.0.1)
62+
middleman-core (3.3.6)
63+
activesupport (~> 4.1.0)
5664
bundler (~> 1.1)
5765
erubis
5866
hooks (~> 0.3)
5967
i18n (~> 0.6.9)
60-
listen (~> 1.1)
61-
padrino-helpers (~> 0.12.1)
68+
listen (>= 2.7.9, < 3.0)
69+
padrino-helpers (~> 0.12.3)
6270
rack (>= 1.4.5, < 2.0)
6371
rack-test (~> 0.6.2)
6472
thor (>= 0.15.2, < 2.0)
6573
tilt (~> 1.4.1, < 2.0)
6674
middleman-gh-pages (0.0.3)
6775
rake (> 0.9.3)
68-
middleman-livereload (3.3.2)
69-
em-websocket (~> 0.5.0)
76+
middleman-livereload (3.3.4)
77+
em-websocket (~> 0.5.1)
7078
middleman-core (~> 3.2)
7179
rack-livereload (~> 0.3.15)
72-
middleman-sprockets (3.3.3)
73-
middleman-core (>= 3.2)
74-
sprockets (~> 2.2)
80+
middleman-sprockets (3.3.10)
81+
middleman-core (~> 3.3)
82+
sprockets (~> 2.12.1)
7583
sprockets-helpers (~> 1.1.0)
76-
sprockets-sass (~> 1.1.0)
84+
sprockets-sass (~> 1.2.0)
7785
middleman-syntax (2.0.0)
7886
middleman-core (~> 3.2)
7987
rouge (~> 1.0)
80-
minitest (4.7.5)
81-
multi_json (1.9.2)
82-
padrino-helpers (0.12.1)
88+
minitest (5.4.2)
89+
multi_json (1.10.1)
90+
padrino-helpers (0.12.4)
8391
i18n (~> 0.6, >= 0.6.7)
84-
padrino-support (= 0.12.1)
92+
padrino-support (= 0.12.4)
8593
tilt (~> 1.4.1)
86-
padrino-support (0.12.1)
94+
padrino-support (0.12.4)
8795
activesupport (>= 3.1)
8896
rack (1.5.2)
8997
rack-livereload (0.3.15)
9098
rack
9199
rack-test (0.6.2)
92100
rack (>= 1.0)
93-
rake (10.3.1)
101+
rake (10.3.2)
94102
rb-fsevent (0.9.4)
95-
rb-inotify (0.9.3)
96-
ffi (>= 0.5.0)
97-
rb-kqueue (0.2.2)
103+
rb-inotify (0.9.5)
98104
ffi (>= 0.5.0)
99105
redcarpet (3.1.2)
100106
ref (1.0.5)
101-
rouge (1.3.3)
107+
rouge (1.7.2)
102108
ruby18_source_location (0.2)
103-
sass (3.2.19)
104-
sprockets (2.12.1)
109+
sass (3.4.7)
110+
sprockets (2.12.3)
105111
hike (~> 1.2)
106112
multi_json (~> 1.0)
107113
rack (~> 1.0)
108114
tilt (~> 1.1, != 1.3.0)
109115
sprockets-helpers (1.1.0)
110116
sprockets (~> 2.0)
111-
sprockets-sass (1.1.0)
117+
sprockets-sass (1.2.0)
112118
sprockets (~> 2.0)
113119
tilt (~> 1.1)
114120
therubyracer (0.12.1)
115121
libv8 (~> 3.16.14.0)
116122
ref
117123
thor (0.19.1)
118-
thread_safe (0.3.3)
124+
thread_safe (0.3.4)
119125
tilt (1.4.1)
120-
tzinfo (0.3.39)
121-
uber (0.0.4)
122-
uglifier (2.5.0)
126+
timers (4.0.1)
127+
hitimes
128+
tzinfo (1.2.2)
129+
thread_safe (~> 0.1)
130+
uber (0.0.10)
131+
uglifier (2.5.3)
123132
execjs (>= 0.3.0)
124133
json (>= 1.8.0)
125134

source/javascripts/app/lang.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ under the License.
2626
$(".lang-selector a").removeClass('active');
2727
$(".lang-selector a[data-language-name='" + language + "']").addClass('active');
2828
for (var i=0; i < languages.length; i++) {
29-
$(".highlight." + languages[i]).hide();
29+
$(".highlight." + languages[i]).parent().hide();
3030
}
31-
$(".highlight." + language).show();
31+
$(".highlight." + language).parent().show();
3232

3333
// scroll to the new location of the position
3434
$(window.location.hash).get(0).scrollIntoView(true);

source/stylesheets/screen.css.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,11 @@ html, body {
475475
@extend %code-font;
476476
}
477477

478+
pre>code {
479+
background-color: transparent;
480+
padding: 0;
481+
}
482+
478483
aside {
479484
padding-top: 1em;
480485
padding-bottom: 1em;

0 commit comments

Comments
 (0)