Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit d47c238

Browse files
mikealmikeal
committed
Merge pull request #17 from laosb/master
New design (again).
2 parents 5dff27e + b9bb688 commit d47c238

File tree

3 files changed

+87
-80
lines changed

3 files changed

+87
-80
lines changed

‎faq.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
87
<meta name="description" content="iojs">
98
<meta name="keywords" content="iojs, io.js, io js, javascript io, uv, libuv, node-forward, node forward, node, node.js, node.js forward, nodejs, nodejs forward, javascript">
10-
119
<title>Javascript IO - FAQ</title>
12-
13-
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css"> -->
14-
<link href='https://fonts.googleapis.com/css?family=Lato:300,700' rel='stylesheet' type='text/css'>
1510
<link href="style.css" rel="stylesheet" type="text/css">
1611

1712
</head>
1813

1914
<body>
20-
<h1>FAQ</h1>
15+
<h2 class="brand">io.js</h2>
16+
<h1 class="heading">FAQ</h1>
2117

2218
<div class="faq-item">
2319

‎index.html

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,47 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
3+
4+
<head>
45
<meta charset="utf-8">
56
<meta http-equiv="X-UA-Compatible" content="IE=edge">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
88
<meta name="description" content="iojs">
99
<meta name="keywords" content="iojs, io.js, io js, javascript io, uv, libuv, node-forward, node forward, node, node.js, node.js forward, nodejs, nodejs forward, javascript">
10-
1110
<title>JavaScript I/O</title>
12-
13-
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css"> -->
14-
<link href='https://fonts.googleapis.com/css?family=Lato:300,700' rel='stylesheet' type='text/css'>
1511
<link href="style.css" rel="stylesheet" type="text/css">
12+
</head>
1613

17-
</head>
18-
19-
<body>
20-
<h1>JavaScript I/O</h1>
21-
14+
<body>
15+
<h2 class="brand">io.js</h2>
16+
<h1 class="heading">JavaScript I/O</h1>
2217
<h2>
2318
<a href="https://github.com/iojs/io.js"><code>io.js</code></a> is a JavaScript platform that is compatible with <a href="https://nodejs.org">Node.js</a> &amp; <a href="https://www.npmjs.org/">npm</a>.
2419
</h2>
25-
20+
<a href="https://github.com/iojs/io.js" class="large button">Coming soon...</a>
2621
<p>
27-
<code>io.js</code> contributions, releases, and contributorship are under an <a href="https://github.com/iojs/io.js/blob/v0.12/CONTRIBUTING.md#governance">open governance</a> model.
22+
The initial 1.0.0-alpha.1 release <a href="https://github.com/iojs/io.js/issues/28">is planned</a> for January 13, 2015.
2823
</p>
2924
<p>
30-
The initial 1.0.0-alpha.1 release <a href="https://github.com/iojs/io.js/issues/28">is planned</a> for January 13, 2015.
25+
<code>io.js</code> contributions, releases, and contributorship are under an <a href="https://github.com/iojs/io.js/blob/v0.12/CONTRIBUTING.md#governance">open governance</a> model.
3126
</p>
32-
3327
<a class="button" href="faq.html">
3428
FAQ
3529
</a>
36-
<a class="button" target="_blank" href="https://github.com/iojs/io.js/issues">
30+
<div class="multi-button">
31+
<a class="button" target="_blank" href="https://github.com/iojs/io.js/issues">
3732
Github Issues
33+
</a><a class="button" href="https://github.com/iojs">
34+
Github Org
3835
</a>
36+
</div>
3937
<div class="multi-button">
40-
<a class="button" target="_blank" href="http://webchat.freenode.net/?channels=io.js">
38+
<a class="button" target="_blank" href="http://webchat.freenode.net/?channels=io.js">
4139
Chat (IRC)
42-
</a><!--
43-
remove whitespace
44-
--><a class="button" target="_blank" href="http://logs.libuv.org/io.js/latest">
40+
</a><a class="button" target="_blank" href="http://logs.libuv.org/io.js/latest">
4541
Logs
4642
</a>
4743
</div>
4844
<br/>
49-
<a class="button" href="https://github.com/iojs">
50-
There is a Github Org.
51-
</br>
52-
That's your kind of thing, right?
53-
</a>
54-
</body>
45+
</body>
46+
5547
</html>

‎style.css

Lines changed: 67 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,93 @@
11
html {
2-
font-family: 'Lato', sans-serif;
3-
font-weight: 300;
4-
font-size: 16px;
5-
line-height: 1.4;
6-
text-align: center;
2+
font-family: "Myriad Set Pro", "Lucida Grande", "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", Arial, sans-serif;
3+
font-weight: 300;
4+
font-size: 16px;
5+
line-height: 1.4;
6+
text-align: center;
7+
}
8+
.brand {
9+
margin: 5px 10px;
10+
color: #aaa;
11+
text-align: left;
12+
}
13+
.heading {
14+
font-size: 55px;
15+
line-height: 175px;
716
}
8-
917
body {
10-
display: inline-block;
11-
max-width: 600px;
12-
margin: 5px 6px;
18+
display: inline-block;
19+
max-width: 700px;
20+
margin: 5px 6px;
21+
background: #111;
22+
color: #eee;
1323
}
14-
1524
h1 {
16-
font-size: 2em;
25+
font-size: 2em;
1726
}
18-
1927
h2 {
20-
font-size: 1.125em;
21-
margin: 2.2em 0;
28+
font-size: 1.125em;
29+
margin: 2.2em 0;
2230
}
23-
2431
p {
25-
font-size: 15px;
26-
margin: .6em 0;
32+
font-size: 15px;
33+
margin: .6em 0;
2734
}
28-
2935
a {
30-
text-decoration: none;
31-
color: #455A64;
32-
border-bottom: 1px solid #CFD8DC;
36+
text-decoration: none;
37+
color: #eee;
38+
border-bottom: 1px solid #eee;
39+
transition: .3s all ease;
3340
}
3441
a:hover {
35-
color: #607D8B;
36-
border-bottom: 1px solid #607D8B;
42+
color: #aaa;
43+
border-bottom: 1px solid #aaa;
3744
}
38-
39-
abbr {
40-
cursor: pointer;
41-
}
42-
4345
.button {
44-
border: none;
45-
display: inline-block;
46-
padding: 0.5em;
47-
margin: 10px;
48-
background-color: rgba(100, 100, 100, 0.06);
49-
border-radius: 3px;
46+
border: solid 1px #eee;
47+
display: inline-block;
48+
padding: 1em;
49+
margin: 10px;
50+
background-color: transparent;
51+
border-radius: 3px;
52+
transition: .3s all ease;
53+
color: #eee;
5054
}
51-
.button:hover {
52-
border: none;
53-
background-color: rgba(100, 100, 100, 0.1);
55+
.large {
56+
font-size: 20px;
57+
margin: 15px !important;
58+
padding: 1.3em;
59+
border-radius: 5px;
5460
}
55-
.logo {
56-
margin-top:20px;
61+
.button:hover {
62+
background-color: #eee;
63+
color: #333;
5764
}
58-
5965
.multi-button {
60-
display: inline-block
66+
display: inline-block
6167
}
6268
.multi-button .button {
63-
margin: 10px 0;
64-
border-right: 1px solid rgba(100, 100, 100, 0.08);
69+
margin: 0;
70+
border-left: none;
6571
}
6672
.multi-button .button:first-child {
67-
margin: 10px 0 10px 10px;
68-
border-radius: 3px 0 0 3px;
73+
margin: 0;
74+
border-radius: 3px 0 0 3px;
75+
border: solid 1px #eee;
6976
}
7077
.multi-button .button:last-child {
71-
margin: 10px 10px 10px 0;
72-
border-right: none;
73-
border-radius: 0 3px 3px 0;
78+
border-radius: 0 3px 3px 0;
79+
}
80+
.faq-item {
81+
border-radius: 3px;
82+
border:solid 1px #eee;
83+
margin:20px;
84+
}
85+
.faq-title {
86+
margin:0;
87+
line-height:3em;
88+
background: #eee;
89+
color:#333;
7490
}
91+
.faq-body {
92+
margin:1em;
93+
}

0 commit comments

Comments
 (0)