Skip to content

Commit a94405d

Browse files
cmontellacmontella
committed
Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into stdlib-plus-watchers
2 parents e788fcd + 4fdc87f commit a94405d

File tree

10 files changed

+266
-434
lines changed

10 files changed

+266
-434
lines changed

‎.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
_drafts/
2+
_site/
3+
_cache/
4+
_jekyll_s3.yml
5+
.DS_Store
6+
*.swp
7+
.jekyll-metadata

‎Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source 'https://rubygems.org'
2+
gem 'github-pages', group: :jekyll_plugins

‎Gemfile.lock

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
activesupport (4.2.8)
5+
i18n (~> 0.7)
6+
minitest (~> 5.1)
7+
thread_safe (~> 0.3, >= 0.3.4)
8+
tzinfo (~> 1.1)
9+
addressable (2.5.1)
10+
public_suffix (~> 2.0, >= 2.0.2)
11+
coffee-script (2.4.1)
12+
coffee-script-source
13+
execjs
14+
coffee-script-source (1.12.2)
15+
colorator (1.1.0)
16+
ethon (0.10.1)
17+
ffi (>= 1.3.0)
18+
execjs (2.7.0)
19+
faraday (0.12.1)
20+
multipart-post (>= 1.2, < 3)
21+
ffi (1.9.18)
22+
forwardable-extended (2.6.0)
23+
gemoji (3.0.0)
24+
github-pages (139)
25+
activesupport (= 4.2.8)
26+
github-pages-health-check (= 1.3.3)
27+
jekyll (= 3.4.3)
28+
jekyll-avatar (= 0.4.2)
29+
jekyll-coffeescript (= 1.0.1)
30+
jekyll-default-layout (= 0.1.4)
31+
jekyll-feed (= 0.9.2)
32+
jekyll-gist (= 1.4.0)
33+
jekyll-github-metadata (= 2.3.1)
34+
jekyll-mentions (= 1.2.0)
35+
jekyll-optional-front-matter (= 0.1.2)
36+
jekyll-paginate (= 1.1.0)
37+
jekyll-readme-index (= 0.1.0)
38+
jekyll-redirect-from (= 0.12.1)
39+
jekyll-relative-links (= 0.4.0)
40+
jekyll-sass-converter (= 1.5.0)
41+
jekyll-seo-tag (= 2.2.3)
42+
jekyll-sitemap (= 1.0.0)
43+
jekyll-swiss (= 0.4.0)
44+
jekyll-theme-architect (= 0.0.4)
45+
jekyll-theme-cayman (= 0.0.4)
46+
jekyll-theme-dinky (= 0.0.4)
47+
jekyll-theme-hacker (= 0.0.4)
48+
jekyll-theme-leap-day (= 0.0.4)
49+
jekyll-theme-merlot (= 0.0.4)
50+
jekyll-theme-midnight (= 0.0.4)
51+
jekyll-theme-minimal (= 0.0.4)
52+
jekyll-theme-modernist (= 0.0.4)
53+
jekyll-theme-primer (= 0.2.1)
54+
jekyll-theme-slate (= 0.0.4)
55+
jekyll-theme-tactile (= 0.0.4)
56+
jekyll-theme-time-machine (= 0.0.4)
57+
jekyll-titles-from-headings (= 0.1.5)
58+
jemoji (= 0.8.0)
59+
kramdown (= 1.13.2)
60+
liquid (= 3.0.6)
61+
listen (= 3.0.6)
62+
mercenary (~> 0.3)
63+
minima (= 2.1.1)
64+
rouge (= 1.11.1)
65+
terminal-table (~> 1.4)
66+
github-pages-health-check (1.3.3)
67+
addressable (~> 2.3)
68+
net-dns (~> 0.8)
69+
octokit (~> 4.0)
70+
public_suffix (~> 2.0)
71+
typhoeus (~> 0.7)
72+
html-pipeline (2.6.0)
73+
activesupport (>= 2)
74+
nokogiri (>= 1.4)
75+
i18n (0.8.4)
76+
jekyll (3.4.3)
77+
addressable (~> 2.4)
78+
colorator (~> 1.0)
79+
jekyll-sass-converter (~> 1.0)
80+
jekyll-watch (~> 1.1)
81+
kramdown (~> 1.3)
82+
liquid (~> 3.0)
83+
mercenary (~> 0.3.3)
84+
pathutil (~> 0.9)
85+
rouge (~> 1.7)
86+
safe_yaml (~> 1.0)
87+
jekyll-avatar (0.4.2)
88+
jekyll (~> 3.0)
89+
jekyll-coffeescript (1.0.1)
90+
coffee-script (~> 2.2)
91+
jekyll-default-layout (0.1.4)
92+
jekyll (~> 3.0)
93+
jekyll-feed (0.9.2)
94+
jekyll (~> 3.3)
95+
jekyll-gist (1.4.0)
96+
octokit (~> 4.2)
97+
jekyll-github-metadata (2.3.1)
98+
jekyll (~> 3.1)
99+
octokit (~> 4.0, != 4.4.0)
100+
jekyll-mentions (1.2.0)
101+
activesupport (~> 4.0)
102+
html-pipeline (~> 2.3)
103+
jekyll (~> 3.0)
104+
jekyll-optional-front-matter (0.1.2)
105+
jekyll (~> 3.0)
106+
jekyll-paginate (1.1.0)
107+
jekyll-readme-index (0.1.0)
108+
jekyll (~> 3.0)
109+
jekyll-redirect-from (0.12.1)
110+
jekyll (~> 3.3)
111+
jekyll-relative-links (0.4.0)
112+
jekyll (~> 3.3)
113+
jekyll-sass-converter (1.5.0)
114+
sass (~> 3.4)
115+
jekyll-seo-tag (2.2.3)
116+
jekyll (~> 3.3)
117+
jekyll-sitemap (1.0.0)
118+
jekyll (~> 3.3)
119+
jekyll-swiss (0.4.0)
120+
jekyll-theme-architect (0.0.4)
121+
jekyll (~> 3.3)
122+
jekyll-theme-cayman (0.0.4)
123+
jekyll (~> 3.3)
124+
jekyll-theme-dinky (0.0.4)
125+
jekyll (~> 3.3)
126+
jekyll-theme-hacker (0.0.4)
127+
jekyll (~> 3.3)
128+
jekyll-theme-leap-day (0.0.4)
129+
jekyll (~> 3.3)
130+
jekyll-theme-merlot (0.0.4)
131+
jekyll (~> 3.3)
132+
jekyll-theme-midnight (0.0.4)
133+
jekyll (~> 3.3)
134+
jekyll-theme-minimal (0.0.4)
135+
jekyll (~> 3.3)
136+
jekyll-theme-modernist (0.0.4)
137+
jekyll (~> 3.3)
138+
jekyll-theme-primer (0.2.1)
139+
jekyll (~> 3.3)
140+
jekyll-theme-slate (0.0.4)
141+
jekyll (~> 3.3)
142+
jekyll-theme-tactile (0.0.4)
143+
jekyll (~> 3.3)
144+
jekyll-theme-time-machine (0.0.4)
145+
jekyll (~> 3.3)
146+
jekyll-titles-from-headings (0.1.5)
147+
jekyll (~> 3.3)
148+
jekyll-watch (1.5.0)
149+
listen (~> 3.0, < 3.1)
150+
jemoji (0.8.0)
151+
activesupport (~> 4.0)
152+
gemoji (~> 3.0)
153+
html-pipeline (~> 2.2)
154+
jekyll (>= 3.0)
155+
kramdown (1.13.2)
156+
liquid (3.0.6)
157+
listen (3.0.6)
158+
rb-fsevent (>= 0.9.3)
159+
rb-inotify (>= 0.9.7)
160+
mercenary (0.3.6)
161+
mini_portile2 (2.2.0)
162+
minima (2.1.1)
163+
jekyll (~> 3.3)
164+
minitest (5.10.2)
165+
multipart-post (2.0.0)
166+
net-dns (0.8.0)
167+
nokogiri (1.8.0)
168+
mini_portile2 (~> 2.2.0)
169+
octokit (4.7.0)
170+
sawyer (~> 0.8.0, >= 0.5.3)
171+
pathutil (0.14.0)
172+
forwardable-extended (~> 2.6)
173+
public_suffix (2.0.5)
174+
rb-fsevent (0.9.8)
175+
rb-inotify (0.9.8)
176+
ffi (>= 0.5.0)
177+
rouge (1.11.1)
178+
safe_yaml (1.0.4)
179+
sass (3.4.24)
180+
sawyer (0.8.1)
181+
addressable (>= 2.3.5, < 2.6)
182+
faraday (~> 0.8, < 1.0)
183+
terminal-table (1.8.0)
184+
unicode-display_width (~> 1.1, >= 1.1.1)
185+
thread_safe (0.3.6)
186+
typhoeus (0.8.0)
187+
ethon (>= 0.8.0)
188+
tzinfo (1.2.3)
189+
thread_safe (~> 0.1)
190+
unicode-display_width (1.2.1)
191+
192+
PLATFORMS
193+
ruby
194+
195+
DEPENDENCIES
196+
github-pages
197+
198+
BUNDLED WITH
199+
1.15.1

‎_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ markdown: kramdown
33
timezone: America/Los_Angeles
44
future: true
55
url: http://docs-next.witheve.com
6-
markdown_ext: "markdown,mkdown,mkdn,mkd,md,eve"
6+
markdown_ext: "markdown,mkdown,mkdn,mkd,md,eve"
7+
github: [metadata]

‎_layouts/default.html

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Eve</title>
5-
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=10.0; user-scalable=1;" />
6-
<link rel="stylesheet" type="text/css" href="{{ site.url }}/css/blog.css" />
4+
<title>Eve Docs</title>
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=10.0, user-scalable=1" />
6+
<link rel="stylesheet" type="text/css" href="{{ site.url }}/css/style.css" />
77
<link rel="stylesheet" type="text/css" href="{{ site.url }}/css/syntax.css" />
8-
<link rel="icon" type="image/png" href="/blog/images/icon.png">
98
<link rel="alternate" type="application/atom+xml" title="Eve Programming Language" href="/atom.xml" />
10-
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,400,700' rel='stylesheet' type='text/css'>
9+
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,400,700' rel='stylesheet' type='text/css'>
1110
<meta name="Description" content="This is the development blog of the Eve programming language">
1211
</head>
1312
<body>
@@ -17,7 +16,7 @@
1716
<a href="http://witheve.com">
1817
<div class="logo">
1918
<img src="https://witheve.github.io/assets/images/logo_square.png" />
20-
<h1><img alt="EVE" src="{{ site.url }}/images/eve.svg" /></h1>
19+
<h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" /></h1>
2120
</div>
2221
</a>
2322
<div class="flex-spacer"></div>
@@ -77,15 +76,14 @@ <h1><img alt="EVE" src="{{ site.url }}/images/eve.svg" /></h1>
7776
</main>
7877

7978
<script>
80-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
81-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
82-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
83-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
79+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
80+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
81+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
82+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
8483

85-
ga('create', 'UA-36105397-2', 'auto');
86-
ga('send', 'pageview');
87-
88-
</script>
84+
ga('create', 'UA-74222157-2', 'auto');
85+
ga('send', 'pageview');
86+
</script>
8987
</body>
9088
</head>
9189
</html>

‎css/blog.css renamed to ‎css/style.css

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ img {
186186
color: rgb(91,89,164);
187187
}
188188

189+
.landing { flex-direction: column; align-items: center;}
190+
189191
.sidebar-menu {
190192
list-style: none;
191193
margin: 0px;
@@ -207,7 +209,7 @@ img {
207209
}
208210

209211
b {
210-
font-weight: bold;
212+
font-weight: bold;
211213
}
212214

213215
.sub li {
@@ -293,6 +295,12 @@ nav > .play-cta { margin: 0; padding: 10px 20px; color: white; }
293295
.cta.primary:hover { background: rgb(0, 158, 224); }
294296
.cta.primary:active { background: rgb(0, 121, 177); }
295297

298+
.version { display: flex; flex-direction: row; }
299+
300+
.version-btn { margin: 0px 20px; font-size: 1.2rem; min-width: 11em; }
301+
302+
.version-wrapper h2 { text-align: center; }
303+
296304
.cta.secondary { background: rgb(107, 103, 173); color: white; }
297305
.cta.secondary:hover { background: rgb(91, 89, 164); }
298306
.cta.secondary:active { background: rgb(74, 64, 136); }
@@ -320,7 +328,7 @@ nav > .play-cta { margin: 0; padding: 10px 20px; color: white; }
320328

321329
ul { display: block; margin-left: 2em; }
322330

323-
code { padding: 0.2em; white-space: pre-wrap; font-family: "Inconsolata", "Monaco", "Consolas", "Ubuntu Mono", monospace; font-size: 0.9rem; }
331+
code { white-space: pre-wrap; font-family: "Inconsolata", "Monaco", "Consolas", "Ubuntu Mono", monospace; font-size: 0.9rem; }
324332

325333
strong { font-weight: 600; }
326334

0 commit comments

Comments
 (0)