Skip to content

Commit 5284f2e

Browse files
cmontellacmontella
committed
Merge remote-tracking branch 'refs/remotes/origin/update-stdlib-examples' into document-log-function
2 parents ee26175 + f946dde commit 5284f2e

File tree

7 files changed

+2998
-373
lines changed

7 files changed

+2998
-373
lines changed

‎_layouts/default.html

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@
22
<html>
33
<head>
44
<title>Eve Docs</title>
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=10.0, user-scalable=1" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=10.0, user-scalable=1" />
66
<link rel="stylesheet" type="text/css" href="/css/style.css" />
77
<link rel="stylesheet" type="text/css" href="/css/syntax.css" />
8+
<link rel="stylesheet" type="text/css" href="/css/codemirror-default-theme.css">
89
<link rel="icon" type="image/png" href="https://witheve.github.io/assets/images/favicon.png">
910
<link rel="alternate" type="application/atom+xml" title="Eve Programming Language" href="/atom.xml" />
1011
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,400,700' rel='stylesheet' type='text/css'>
11-
<meta name="Description" content="This is the development blog of the Eve programming language">
12+
<meta name="Description" content="This is the documentation of the Eve programming language">
1213
</head>
1314
<body>
1415

1516
<div class="layer-wrapper header-wrapper">
16-
<header class="layer">
17-
<a href="http://witheve.com">
18-
<div class="logo">
19-
<img src="https://witheve.github.io/assets/images/logo_square.png" />
20-
<h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" /></h1>
21-
</div>
22-
</a>
23-
<div class="flex-spacer"></div>
24-
<nav>
25-
<a class="btn rounded cta secondary play-cta" href="http://play.witheve.com">Play</a>
17+
<header class="layer">
18+
<a href="http://witheve.com">
19+
<div class="logo">
20+
<img src="https://witheve.github.io/assets/images/logo_square.png" />
21+
<h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" /></h1>
22+
</div>
23+
</a>
24+
<div class="flex-spacer"></div>
25+
<nav>
26+
<a class="btn rounded cta secondary play-cta" href="http://play.witheve.com">Play</a>
2627

27-
<a href="http://incidentalcomplexity.com">Blog</a>
28-
<a href="/">Docs</a>
29-
<a href="https://groups.google.com/forum/#!forum/eve-talk">Community</a>
30-
</nav>
31-
</header>
28+
<a href="http://incidentalcomplexity.com">Blog</a>
29+
<a href="/">Docs</a>
30+
<a href="https://groups.google.com/forum/#!forum/eve-talk">Community</a>
31+
</nav>
32+
</header>
3233
</div>
3334

3435

3536
<main class="main layer-wrapper">
3637
<div class="toplayer">
37-
3838
<div class="drawer">
3939
<div class="wrapper">
4040
<ul class="sidebar-menu">
@@ -79,8 +79,6 @@ <h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" />
7979
</ul>
8080
</div>
8181
</div>
82-
83-
8482
<article class="article">
8583
<div class="wrapper">
8684
{{ content }}
@@ -89,15 +87,19 @@ <h1><img alt="EVE" src="https://witheve.github.io/assets/images/wordmark.svg" />
8987
</div>
9088
</main>
9189

92-
<script>
93-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
94-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
95-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
96-
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
90+
<script>
91+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
92+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
93+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
94+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
9795

98-
ga('create', 'UA-74222157-2', 'auto');
99-
ga('send', 'pageview');
100-
</script>
101-
</body>
102-
</head>
96+
ga('create', 'UA-74222157-2', 'auto');
97+
ga('send', 'pageview');
98+
</script>
99+
<script src="/js/highlighter-bundle.js"></script>
100+
<script>
101+
window["eve-highlighter"].highlightAll();
102+
</script>
103+
104+
</body>
103105
</html>

‎css/codemirror-default-theme.css

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/* DEFAULT THEME */
2+
3+
.cm-s-default .cm-header {color: blue;}
4+
.cm-s-default .cm-quote {color: #090;}
5+
.cm-negative {color: #d44;}
6+
.cm-positive {color: #292;}
7+
.cm-header, .cm-strong {font-weight: bold;}
8+
.cm-em {font-style: italic;}
9+
.cm-link {text-decoration: underline;}
10+
.cm-strikethrough {text-decoration: line-through;}
11+
12+
.cm-s-default .cm-keyword {color: #708;}
13+
.cm-s-default .cm-atom {color: #219;}
14+
.cm-s-default .cm-number {color: #164;}
15+
.cm-s-default .cm-def {color: #00f;}
16+
.cm-s-default .cm-variable,
17+
.cm-s-default .cm-punctuation,
18+
.cm-s-default .cm-property,
19+
.cm-s-default .cm-operator {}
20+
.cm-s-default .cm-variable-2 {color: #05a;}
21+
.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
22+
.cm-s-default .cm-comment {color: #a50;}
23+
.cm-s-default .cm-string {color: #a11;}
24+
.cm-s-default .cm-string-2 {color: #f50;}
25+
.cm-s-default .cm-meta {color: #555;}
26+
.cm-s-default .cm-qualifier {color: #555;}
27+
.cm-s-default .cm-builtin {color: #30a;}
28+
.cm-s-default .cm-bracket {color: #997;}
29+
.cm-s-default .cm-tag {color: #170;}
30+
.cm-s-default .cm-attribute {color: #00c;}
31+
.cm-s-default .cm-hr {color: #999;}
32+
.cm-s-default .cm-link {color: #00c;}
33+
34+
.cm-s-default .cm-error {color: #f00;}
35+
.cm-invalidchar {color: #f00;}

‎css/style.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ nav > .play-cta { margin: 0; padding: 10px 20px; color: white; }
328328

329329
ul { display: block; margin-left: 2em; }
330330

331-
code { 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;}
332332

333333
strong { font-weight: 600; }
334334

@@ -351,6 +351,10 @@ td {
351351
margin-left: 0px;
352352
}
353353

354+
.arglist li {
355+
margin-top: 10px;
356+
}
357+
354358
.libitem {
355359
margin-bottom: 20px;
356360
}

‎css/syntax.css

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,15 @@
55
padding-left: 15px;
66
}
77

8-
.k {
9-
color: black;
10-
}
11-
12-
.c1 {
13-
color: #747474;
14-
}
15-
16-
.nt {
17-
color: rgb(0, 118, 206);
18-
}
19-
20-
.s {
21-
color: rgb(1, 165, 136);
22-
}
23-
24-
.m {
25-
color: rgb(1, 165, 136);
26-
}
27-
28-
.l {
29-
color: rgb(1, 165, 136);
30-
}
31-
32-
.p {
33-
color: gray;
34-
}
35-
36-
.nf {
37-
color: rgb(128, 128, 128);
38-
}
39-
40-
.s2 {
41-
color: rgb(1, 165, 136);
42-
}
43-
44-
.x {
45-
color: rgb(0, 0, 0);
46-
}
8+
.CodeMirror.cm-s-default span.cm-syntax { color: #747474; }
9+
.CodeMirror.cm-s-default span.cm-comment { color: #747474; font-style: italic; }
10+
.CodeMirror.cm-s-default span.cm-literal,
11+
.CodeMirror.cm-s-default span.cm-string,
12+
.CodeMirror.cm-s-default span.cm-number,
13+
.CodeMirror.cm-s-default span.cm-atom { color: #00a588; }
14+
.CodeMirror.cm-s-default span.cm-operator { font-weight: bold; }
15+
.CodeMirror.cm-s-default span.cm-keyword { font-weight: bold; color: rgb(74, 64, 136); }
16+
.CodeMirror.cm-s-default span.cm-section { color: black; }
17+
.CodeMirror.cm-s-default span.cm-tag,
18+
.CodeMirror.cm-s-default span.cm-def { color: #0076ce; }
19+
.CodeMirror.cm-s-default span.cm-function { color: #0076ce; }

0 commit comments

Comments
 (0)