Skip to content

Commit 7b68864

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into update-stdlib-examples
# Conflicts: # v0.3/handbook/libraries/stdlib.md
2 parents fb898e0 + b5a9cb4 commit 7b68864

File tree

8 files changed

+46
-82
lines changed

8 files changed

+46
-82
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ _cache/
44
_jekyll_s3.yml
55
.DS_Store
66
*.swp
7-
.jekyll-metadata
7+
.jekyll-metadata
8+
CNAME

_config.yml

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

_layouts/default.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
<head>
44
<title>Eve Docs</title>
55
<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" />
7-
<link rel="stylesheet" type="text/css" href="{{ site.url }}/css/syntax.css" />
6+
<link rel="stylesheet" type="text/css" href="/css/style.css" />
7+
<link rel="stylesheet" type="text/css" href="/css/syntax.css" />
8+
<link rel="icon" type="image/png" href="https://witheve.github.io/assets/images/favicon.png">
89
<link rel="alternate" type="application/atom+xml" title="Eve Programming Language" href="/atom.xml" />
910
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,400,700' rel='stylesheet' type='text/css'>
1011
<meta name="Description" content="This is the development blog of the Eve programming language">
@@ -24,7 +25,7 @@ <h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" />
2425
<a class="btn rounded cta secondary play-cta" href="http://play.witheve.com">Play</a>
2526

2627
<a href="http://incidentalcomplexity.com">Blog</a>
27-
<a href="{{ site.url }}">Docs</a>
28+
<a href="/">Docs</a>
2829
<a href="https://groups.google.com/forum/#!forum/eve-talk">Community</a>
2930
</nav>
3031
</header>
@@ -38,40 +39,39 @@ <h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" />
3839
<div class="wrapper">
3940
<ul class="sidebar-menu">
4041
<li class="sub-menu">
41-
<a href="{{ site.url }}/v0.3/" class="">
42+
<a href="/v0.3/" class="">
4243

4344
<span class="colored">Introduction</span>
4445
<span class="menu-arrow arrow_carrot-right"></span>
4546
</a>
4647
<ul class="sub">
4748

48-
<li><a href="{{ site.url }}/v0.3/install/"> Installation </a> </li>
49+
<li><a href="/v0.3/install/"> Installation </a> </li>
4950

5051

51-
<li><a href="{{ site.url }}/v0.3/tutorials/quickstart/"> Quickstart </a> </li>
52+
<li><a href="/v0.3/tutorials/quickstart/"> Quickstart </a> </li>
5253

5354

54-
<li><a href="{{ site.url }}/v0.3/syntaxreference/"> Syntax Ref </a> </li>
55+
<li><a href="/v0.3/syntaxreference/"> Syntax Ref </a> </li>
5556

5657

5758
</ul>
5859
</li>
5960
<li class="sub-menu active">
60-
<a class="" href="{{ site.url }}/v0.3/handbook/libraries/stdlib/">
61+
<a class="" href="/v0.3/handbook/libraries/stdlib/">
6162

6263
<span class="colored">Library</span>
6364
</a>
6465
<ul class="sub">
6566

66-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#aggregates">Aggregates</a></li>
67-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#math">Math</a></li>
68-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#strings">Strings</a></li>
69-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#html">HTML</a></li>
70-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#canvas">Canvas</a></li>
71-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#ui">UI</a></li>
72-
<li><a href="{{ site.url }}/v0.3/handbook/libraries/stdlib/#system">System</a></li>
67+
<li><a href="/v0.3/handbook/libraries/stdlib/#aggregates">Aggregates</a></li>
68+
<li><a href="/v0.3/handbook/libraries/stdlib/#math">Math</a></li>
69+
<li><a href="/v0.3/handbook/libraries/stdlib/#strings">Strings</a></li>
70+
<li><a href="/v0.3/handbook/libraries/stdlib/#html">HTML</a></li>
71+
<li><a href="/v0.3/handbook/libraries/stdlib/#canvas">Canvas</a></li>
72+
<li><a href="/v0.3/handbook/libraries/stdlib/#ui">UI</a></li>
73+
<li><a href="/v0.3/handbook/libraries/stdlib/#system">System</a></li>
7374

74-
7575
</ul>
7676
</li>
7777
</ul>

_layouts/post.html

Lines changed: 0 additions & 22 deletions
This file was deleted.

_layouts/specpost.html

Lines changed: 0 additions & 18 deletions
This file was deleted.

index.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,39 @@
1313
<meta name="generator" content="Hugo 0.19" />
1414

1515

16-
<link rel="canonical" href="{{ site-url }}/">
16+
<link rel="canonical" href="/">
1717

1818
<meta name="author" content="Eve">
1919

2020

21-
<meta property="og:url" content="{{ site-url }}/">
21+
<meta property="og:url" content="/">
2222
<meta property="og:title" content="Eve Documentation">
2323

2424
<meta name="apple-mobile-web-app-title" content="Eve Documentation">
2525
<meta name="apple-mobile-web-app-capable" content="yes">
2626
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
2727

28-
<link rel="shortcut icon" type="image/x-icon" href="{{ site-url }}/images/favicon.png">
29-
<link rel="icon" type="image/x-icon" href="{{ site-url }}/images/favicon.png">
28+
<link rel="shortcut icon" type="image/x-icon" href="https://witheve.github.io/assets/images/favicon.png">
29+
<link rel="icon" type="image/x-icon" href="https://witheve.github.io/assets/images/favicon.png">
3030

3131
<style>
3232
@font-face {
3333
font-family: 'Icon';
34-
src: url('{{ site-url }}/fonts/icon.eot?52m981');
35-
src: url('{{ site-url }}/fonts/icon.eot?#iefix52m981')
34+
src: url('/fonts/icon.eot?52m981');
35+
src: url('/fonts/icon.eot?#iefix52m981')
3636
format('embedded-opentype'),
37-
url('{{ site-url }}/fonts/icon.woff?52m981')
37+
url('/fonts/icon.woff?52m981')
3838
format('woff'),
39-
url('{{ site-url }}/fonts/icon.ttf?52m981')
39+
url('/fonts/icon.ttf?52m981')
4040
format('truetype'),
41-
url('{{ site-url }}/fonts/icon.svg?52m981#icon')
41+
url('/fonts/icon.svg?52m981#icon')
4242
format('svg');
4343
font-weight: normal;
4444
font-style: normal;
4545
}
4646
</style>
4747

48-
<link rel="stylesheet" href="{{ site-url }}/css/style.css">
48+
<link rel="stylesheet" href="/css/style.css">
4949

5050
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu:400,700|Ubuntu&#43;Mono">
5151
<style>
@@ -57,8 +57,8 @@
5757
}
5858
</style>
5959

60-
<link href="{{ site-url }}/index.xml" rel="alternate" type="application/rss+xml" title="Eve Documentation" />
61-
<link href="{{ site-url }}/index.xml" rel="feed" type="application/rss+xml" title="Eve Documentation" />
60+
<link href="/index.xml" rel="alternate" type="application/rss+xml" title="Eve Documentation" />
61+
<link href="/index.xml" rel="feed" type="application/rss+xml" title="Eve Documentation" />
6262

6363

6464
</head>
@@ -69,15 +69,15 @@
6969
<a href="http://witheve.com">
7070
<div class="logo">
7171
<img src="https://witheve.github.io/assets/images/logo_square.png" />
72-
<h1><img alt="EVE" src="{{ site-url }}/images/eve.svg" /></h1>
72+
<h1><img alt="EVE" src="/images/eve.svg" /></h1>
7373
</div>
7474
</a>
7575
<div class="flex-spacer"></div>
7676
<nav>
7777
<a class="btn rounded cta secondary play-cta" href="http://play.witheve.com">Play</a>
7878

7979
<a href="http://incidentalcomplexity.com">Blog</a>
80-
<a href="{{ site-url }}">Docs</a>
80+
<a href="/">Docs</a>
8181
<a href="https://groups.google.com/forum/#!forum/eve-talk">Community</a>
8282
</nav>
8383
</header>
@@ -88,8 +88,8 @@ <h1><img alt="EVE" src="{{ site-url }}/images/eve.svg" /></h1>
8888
<div class="version-wrapper">
8989
<h2>Which version of Eve are you running?</h2>
9090
<div class="version">
91-
<a class="btn big rounded cta tertiary version-btn" href="{{ site-url }}/v0.2/index.html">v0.2 Documentation</a>
92-
<a class="btn big rounded cta tertiary version-btn" href="{{ site-url }}/v0.3/index.html">v0.3 Documentation</a>
91+
<a class="btn big rounded cta tertiary version-btn" href="/v0.2/index.html">v0.2 Documentation</a>
92+
<a class="btn big rounded cta tertiary version-btn" href="/v0.3/index.html">v0.3 Documentation</a>
9393
</div>
9494
</div>
9595
</div>

v0.3/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ title: Index
44
---
55

66
## Install guide
7-
Need to install Eve on your machine? [Head here](install) for step-by-step directions.
7+
Need to install Eve on your machine? [Head here](/v0.3/install/) for step-by-step directions.
88

99
## Quickstart
10-
If you’re new to Eve and want a hands-on demo to learn the language, you can jump right in with a 5 minute [quickstart guide](tutorials/quickstart.eve) that shows you how to build a simple incrementing counter.
10+
If you’re new to Eve and want a hands-on demo to learn the language, you can jump right in with a 5 minute [quickstart guide](/v0.3/tutorials/quickstart/) that shows you how to build a simple incrementing counter.
1111

1212
## Syntax reference
13-
Want a reminder how the syntax works or to get an overview of Eve without going through the quickstart? The [syntax reference](syntaxreference) is a good place to start.
13+
Want a reminder how the syntax works or to get an overview of Eve without going through the quickstart? The [syntax reference](/v0.3/syntaxreference/) is a good place to start.
1414

1515
## Libraries
16-
Want to know everything Eve can do? [Here’s a list](handbook/libraries/) of all the functions, operators, and watchers available in the language.
16+
Want to know everything Eve can do? [Here’s a list](/v0.3/handbook/libraries/stdlib/) of all the functions, operators, and watchers available in the language.
1717

1818
## Stuck?
1919
If you didn’t find what you were looking for, you can get in touch with the Eve team and the community through these channels:
@@ -24,5 +24,5 @@ If you didn’t find what you were looking for, you can get in touch with the Ev
2424
- Join the Eve Slack channel to talk with Eve developers and the community in real time _(coming soon)_
2525

2626
## Want to learn more?
27-
- Browse our [gallery](../gallery) of examples from the Eve crew and the community to learn, to be inspired, or just for fun!
27+
- Browse our [gallery](https://github.com/witheve/eve-examples) of examples from the Eve crew and the community to learn, to be inspired, or just for fun!
2828
- Read our [blog](http://incidentalcomplexity.com) to see what we’re up to, from our developer diary to essays, announcements, and more.

v0.3/tutorials/quickstart.eve

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ layout: default
33
title: Quickstart
44
---
55

6+
{% raw %}
7+
68
# Quickstart
79

8-
This guide is a 5 - 10 minute introduction to the essential concepts in Eve. If you've never used Eve before, you're in the right place! Before you start with this tutorial, please follow the [installation and usage](../install) instructions, which will get you running Eve programs on your machine. In the eve-starter/programs directory, create an empty document called "quickstart.eve". Use your favorite editor to edit the program, and run it with the command:
10+
This guide is a 5 - 10 minute introduction to the essential concepts in Eve. If you've never used Eve before, you're in the right place! Before you start with this tutorial, please follow the [installation and usage](/v0.3/install/) instructions, which will get you running Eve programs on your machine. In the eve-starter/programs directory, create an empty document called "quickstart.eve". Use your favorite editor to edit the program, and run it with the command:
911

1012
```
1113
npm start -- eve-starter/programs/quickstart.eve
@@ -114,6 +116,8 @@ That's it for the 5 minute introduction to Eve. To summarize:
114116
This will get you started with Eve, but there's still more to learn. From here, you can:
115117

116118
- Advance to Level 2 of the introductory tutorial (coming soon).
117-
- View the [syntax reference](../syntaxreference) or the [library reference](../handbook/libraries).
119+
- View the [syntax reference](/v0.3/syntaxreference/) or the [library reference](/v0.3/handbook/libraries/stdlib/).
118120
- Explore already made [examples](https://github.com/witheve/eve-examples).
119-
- Or dive right in to the editor and try out the concepts you've just learned (coming soon).
121+
- Or dive right in to the editor and try out the concepts you've just learned (coming soon).
122+
123+
{% endraw %}

0 commit comments

Comments
 (0)