Skip to content

Commit 359ea6d

Browse files
author
frostwind
committed
Seperated index into views
Added new test view (incomplete) A few css tweaks
1 parent f563394 commit 359ea6d

21 files changed

+374
-128
lines changed

‎assets/fonts/Montserrat-Bold.ttf

28.9 KB
Binary file not shown.

‎assets/fonts/Montserrat-Regular.ttf

28.3 KB
Binary file not shown.

‎assets/fonts/Pacifico.ttf

42.6 KB
Binary file not shown.

‎assets/index.html

+1-41
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
<meta name="author" content="">
1212

1313
<!-- Stylesheets -->
14-
<link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
15-
<link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'>
16-
<link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
1714
<link rel="stylesheet" href="stylesheets/main.css">
1815

1916
<!-- Javascripts -->
@@ -43,46 +40,9 @@ <h1>
4340
</div>
4441
</header>
4542

46-
<main>
47-
<section id="hero">
48-
<div class="container">
49-
<h2>A load/stress testing tool without... stress</h2>
50-
<a href="/#/new">Try me !</a><a href="https://github.com/gophergala/gopherling">Contribute</a>
51-
</div>
52-
</section>
53-
54-
<section id="how-to">
55-
<div class="container">
56-
<h2>How it works</h2>
57-
<ul>
58-
<li>
59-
<span>
60-
<i class="icon-docs"></i>
61-
</span>
62-
<p>Create a new test</p>
63-
</li>
64-
<li>
65-
<span>
66-
<i class="icon-plus-squared"></i>
67-
</span>
68-
<p>Add a list of tasks to run</p>
69-
</li>
70-
<li>
71-
<span>
72-
<i class="icon-eye"></i>
73-
</span>
74-
<p>Monitor the requests in real-time</p>
75-
</li>
76-
</ul>
77-
</div>
78-
</section>
43+
<main ng-view>
7944
</main>
8045

81-
<footer>
82-
<div class="container">
83-
<span>Gopherling is developed by Frostwind for the Gophergala.</span>
84-
</div>
85-
</footer>
8646

8747
</body>
8848

‎assets/stylesheets/elements.styl

+3
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ button(bg-color = $blue, text-color = white)
2626
border 2px solid text-color
2727
color text-color
2828
opacity .4
29+
30+
input:disabled
31+
opacity .4

‎assets/stylesheets/fonts.styl

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
@font-face {
2+
font-family: 'fontello';
3+
src: url('../fonts/fontello.eot?64691259');
4+
src: url('../fonts/fontello.eot?64691259#iefix') format('embedded-opentype'),
5+
url('../fonts/fontello.woff?64691259') format('woff'),
6+
url('../fonts/fontello.ttf?64691259') format('truetype'),
7+
url('../fonts/fontello.svg?64691259#fontello') format('svg');
8+
font-weight: normal;
9+
font-style: normal;
10+
}
11+
12+
@font-face {
13+
font-family: 'Pacifico';
14+
src: url('../fonts/Pacifico.ttf');
15+
font-weight: normal;
16+
font-style: normal;
17+
}
18+
19+
@font-face {
20+
font-family: 'Montserrat';
21+
src: url('../fonts/Montserrat-Regular.ttf');
22+
font-weight: normal;
23+
font-style: normal;
24+
}
25+
26+
@font-face {
27+
font-family: 'Montserrat';
28+
src: url('../fonts/Montserrat-Bold.ttf');
29+
font-weight: bold;
30+
font-style: normal;
31+
}

‎assets/stylesheets/icons.styl

-21
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
@font-face {
2-
font-family: 'fontello';
3-
src: url('../fonts/fontello.eot?64691259');
4-
src: url('../fonts/fontello.eot?64691259#iefix') format('embedded-opentype'),
5-
url('../fonts/fontello.woff?64691259') format('woff'),
6-
url('../fonts/fontello.ttf?64691259') format('truetype'),
7-
url('../fonts/fontello.svg?64691259#fontello') format('svg');
8-
font-weight: normal;
9-
font-style: normal;
10-
}
11-
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
12-
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
13-
/*
14-
@media screen and (-webkit-min-device-pixel-ratio:0) {
15-
@font-face {
16-
font-family: 'fontello';
17-
src: url('../font/fontello.svg?64691259#fontello') format('svg');
18-
}
19-
}
20-
*/
21-
221
[class^="icon-"]:before, [class*=" icon-"]:before {
232
font-family: "fontello";
243
font-style: normal;

‎assets/stylesheets/main.styl

+38-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import 'jeet'
22
@import 'citrine'
33

4+
@import 'fonts'
45
@import 'colors'
56
@import 'icons'
67
@import 'animations'
@@ -56,7 +57,6 @@ body > header
5657
a
5758
color white
5859
display inline-block
59-
font-family 'Montserrat', sans-serif
6060
font-size remify(13)
6161
font-weight 700
6262
height remify(74)
@@ -65,7 +65,7 @@ body > header
6565
&:hover
6666
color white
6767

68-
body > footer
68+
main > footer
6969
background darken($blue, 80%)
7070
padding remify(32) 0
7171
span
@@ -78,7 +78,6 @@ body > footer
7878

7979
h2
8080
color white
81-
font-family 'Montserrat', sans-serif
8281
font-size remify(48)
8382
font-weight bold
8483
text-shadow #fff 0 0 1px, #000 1px 1px 1px
@@ -132,3 +131,39 @@ body > footer
132131
transition color 0.3s ease
133132
p
134133
margin-top remify(180)
134+
135+
.subheader
136+
background darken($blue, 10%)
137+
padding remify(38)
138+
139+
h2
140+
color white
141+
font-size remify(32)
142+
font-weight bold
143+
text-transform uppercase
144+
text-shadow #fff 0 0 0px, #fff 0px 0px 1px
145+
146+
#new
147+
form
148+
col(1/2, cycle:2)
149+
border 1px solid $very-light-grey
150+
border-radius 4px
151+
margin 0 auto
152+
margin-top remify(38)
153+
fieldset
154+
padding remify(12)
155+
li
156+
display inline-block
157+
input, label
158+
display block
159+
width 100%
160+
input
161+
border 1px solid $very-light-grey
162+
border-radius 2px
163+
margin-top remify(6)
164+
padding remify(6)
165+
select
166+
background white
167+
border-radius 2px
168+
margin-top remify(6)
169+
padding remify(6)

‎assets/views/home.html

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<section id="hero">
2+
<div class="container">
3+
<h2>A load/stress testing tool without... stress</h2>
4+
<a href="/#/new">Try me !</a><a href="https://github.com/gophergala/gopherling">Contribute</a>
5+
</div>
6+
</section>
7+
8+
<section id="how-to">
9+
<div class="container">
10+
<h2>How it works</h2>
11+
<ul>
12+
<li>
13+
<span>
14+
<i class="icon-docs"></i>
15+
</span>
16+
<p>Create a new test</p>
17+
</li>
18+
<li>
19+
<span>
20+
<i class="icon-plus-squared"></i>
21+
</span>
22+
<p>Add a list of tasks to run</p>
23+
</li>
24+
<li>
25+
<span>
26+
<i class="icon-eye"></i>
27+
</span>
28+
<p>Monitor the requests in real-time</p>
29+
</li>
30+
</ul>
31+
</div>
32+
</section>
33+
34+
<footer>
35+
<div class="container">
36+
<span>Gopherling is developed by Frostwind for the Gophergala.</span>
37+
</div>
38+
</footer>

‎assets/views/new.html

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<section class="subheader">
2+
<div class="container">
3+
<h2>Add a new test</h2>
4+
</div>
5+
</section>
6+
7+
<section id="new">
8+
<div class="container">
9+
<form action="">
10+
<fieldset>
11+
<label for="">Name</label>
12+
<input type="text" placeholder="My awesome test">
13+
</fieldset>
14+
<fieldset>
15+
<label for="">Description</label>
16+
<input type="text" placeholder="This is the best test ever made in human history">
17+
</fieldset>
18+
<fieldset>
19+
<label for="">Base URI</label>
20+
<input type="text" placeholder="http://gopherling.tld:8080">
21+
</fieldset>
22+
<fieldset>
23+
<label for="">Number of users</label>
24+
<input type="text" placeholder="Test name">
25+
</fieldset>
26+
<fieldset>
27+
<label for="">Users spawn/second</label>
28+
<input type="text" placeholder="Test name">
29+
</fieldset>
30+
</form>
31+
<form action="">
32+
<fieldset>
33+
<ul>
34+
<li>
35+
<label for="">Method</label>
36+
<select id="" name="">
37+
<option value="GET">GET</option>
38+
<option value="POST">POST</option>
39+
<option value="PUT">PUT</option>
40+
<option value="DELETE">DELETE</option>
41+
</select>
42+
</li>
43+
<li>
44+
<label for="">Host</label>
45+
<input type="text" disabled>
46+
</li>
47+
<li>
48+
<label for="">Path</label>
49+
<input type="text">
50+
</li>
51+
</ul>
52+
</fieldset>
53+
</form>
54+
</div>
55+
</section>

‎gulpfile.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ gulp.task 'watch', () ->
4949
gulp.watch 'assets/javascripts/**/*.coffee', ['js']
5050
gulp.watch 'assets/stylesheets/**/*.styl', ['css']
5151
gulp.watch 'assets/fonts/**/*', ['fonts']
52-
gulp.watch 'assets/*.html', ['html']
52+
gulp.watch 'assets/**/*', ['html']
5353

5454
gulp.task 'build', ['js', 'css', 'fonts', 'html']
5555
gulp.task 'server', ['build', 'webserver', 'watch']

‎static/fonts/Montserrat-Bold.ttf

28.9 KB
Binary file not shown.

‎static/fonts/Montserrat-Regular.ttf

28.3 KB
Binary file not shown.

‎static/fonts/Pacifico.ttf

42.6 KB
Binary file not shown.

‎static/index.html

+1-41
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
<meta name="author" content="">
1212

1313
<!-- Stylesheets -->
14-
<link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
15-
<link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'>
16-
<link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
1714
<link rel="stylesheet" href="stylesheets/main.css">
1815

1916
<!-- Javascripts -->
@@ -43,46 +40,9 @@ <h1>
4340
</div>
4441
</header>
4542

46-
<main>
47-
<section id="hero">
48-
<div class="container">
49-
<h2>A load/stress testing tool without... stress</h2>
50-
<a href="/#/new">Try me !</a><a href="https://github.com/gophergala/gopherling">Contribute</a>
51-
</div>
52-
</section>
53-
54-
<section id="how-to">
55-
<div class="container">
56-
<h2>How it works</h2>
57-
<ul>
58-
<li>
59-
<span>
60-
<i class="icon-docs"></i>
61-
</span>
62-
<p>Create a new test</p>
63-
</li>
64-
<li>
65-
<span>
66-
<i class="icon-plus-squared"></i>
67-
</span>
68-
<p>Add a list of tasks to run</p>
69-
</li>
70-
<li>
71-
<span>
72-
<i class="icon-eye"></i>
73-
</span>
74-
<p>Monitor the requests in real-time</p>
75-
</li>
76-
</ul>
77-
</div>
78-
</section>
43+
<main ng-view>
7944
</main>
8045

81-
<footer>
82-
<div class="container">
83-
<span>Gopherling is developed by Frostwind for the Gophergala.</span>
84-
</div>
85-
</footer>
8646

8747
</body>
8848

‎static/stylesheets/elements.css

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
input:disabled {
2+
opacity: 0.4;
3+
}

‎static/stylesheets/fonts.css

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
@font-face {
2+
font-family: 'fontello';
3+
src: url("../fonts/fontello.eot?64691259");
4+
src: url("../fonts/fontello.eot?64691259#iefix") format('embedded-opentype'), url("../fonts/fontello.woff?64691259") format('woff'), url("../fonts/fontello.ttf?64691259") format('truetype'), url("../fonts/fontello.svg?64691259#fontello") format('svg');
5+
font-weight: normal;
6+
font-style: normal;
7+
}
8+
@font-face {
9+
font-family: 'Pacifico';
10+
src: url("../fonts/Pacifico.ttf");
11+
font-weight: normal;
12+
font-style: normal;
13+
}
14+
@font-face {
15+
font-family: 'Montserrat';
16+
src: url("../fonts/Montserrat-Regular.ttf");
17+
font-weight: normal;
18+
font-style: normal;
19+
}
20+
@font-face {
21+
font-family: 'Montserrat';
22+
src: url("../fonts/Montserrat-Bold.ttf");
23+
font-weight: bold;
24+
font-style: normal;
25+
}

0 commit comments

Comments
 (0)