Skip to content

Commit 0a4ea88

Browse files
fathermerryfathermerry
committed
Code, font clean up
1 parent 3e88c45 commit 0a4ea88

15 files changed

+882
-667
lines changed

Diff for: ‎app/assets/css/style.css

+14-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
* {
1111
box-sizing: border-box;
12+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
1213
font-smoothing: antialiased;
14+
-webkit-font-smoothing: antialiased;
1315
text-rendering: optimizeLegibility; }
1416

1517
html {
@@ -981,9 +983,10 @@ textarea {
981983
margin: 15px 0; }
982984
.tracks .list .title {
983985
font-weight: bold;
984-
font-size: 1.7em; }
986+
font-size: 1.7em;
987+
margin-bottom: 0; }
985988
.tracks .list .sub-title {
986-
color: #ccc; }
989+
color: #777; }
987990
.tracks .list a {
988991
float: right;
989992
font-weight: bold; }
@@ -1024,7 +1027,15 @@ textarea {
10241027
border-color: #ccc;
10251028
background-color: transparent; }
10261029

1027-
input[type="email"]:focus, input[type="number"]:focus, input[type="search"]:focus, input[type="text"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="password"]:focus, textarea:focus, select:focus {
1030+
input[type="email"]:focus,
1031+
input[type="number"]:focus,
1032+
input[type="search"]:focus,
1033+
input[type="text"]:focus,
1034+
input[type="tel"]:focus,
1035+
input[type="url"]:focus,
1036+
input[type="password"]:focus,
1037+
textarea:focus,
1038+
select:focus {
10281039
margin-bottom: 30px;
10291040
border-top: none;
10301041
border-right: 0;

Diff for: ‎app/assets/css/style.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎app/index.html

+42-67
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,68 @@
11
<!doctype html>
22
<html>
3-
<head>
3+
4+
<head>
45
<meta charset="utf-8">
56
<title>Coding101</title>
6-
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<meta name="description" content="">
99
<meta name="viewport" content="width=device-width,initial-scale=1">
1010
<link href="assets/components/skeleton/skeleton.css" rel="stylesheet">
1111
<link href="assets/css/style.min.css" rel="stylesheet">
12-
1312
<script src="https://use.fontawesome.com/ab67cbccfa.js"></script>
1413
<script src="assets/components/modernizr/modernizr.js"></script>
15-
</head>
16-
<body>
14+
</head>
1715

16+
<body>
1817
<header class="container">
19-
20-
<nav class="header">
21-
22-
<div class="row">
23-
<div class="six columns">
24-
<a class="nav-logo" href="/">Coding101</a>
25-
</div>
26-
27-
<div class="six columns">
28-
<div class="nav-link">
29-
<a class="active" href="/">Tracks</a>
30-
<a href="questions.html">Questions</a>
18+
<nav class="header">
19+
<div class="row">
20+
<div class="six columns">
21+
<a class="nav-logo" href="/">Coding101</a>
22+
</div>
23+
<div class="six columns">
24+
<div class="nav-link">
25+
<a class="active" href="/">Tracks</a>
26+
<a href="questions.html">Questions</a>
27+
</div>
28+
</div>
3129
</div>
32-
</div>
33-
34-
</div>
35-
36-
</nav>
37-
30+
</nav>
3831
</header>
39-
4032
<section class="borderline"></section>
41-
4233
<section class="container add-track m-t-xl m-b-xl">
43-
<a href="new-track.html"><i class="fa fa-plus"></i>New Track</a>
34+
<a href="new-track.html"><i class="fa fa-plus"></i>New Track</a>
4435
</section>
45-
4636
<section class="container tracks">
47-
48-
<div class="row list">
49-
50-
<div class="eight columns">
51-
<p class="title">Coding With HTML / CSS</p>
52-
<p class="sub-title"><em>coding-with-html.</em> 3 resources</p>
53-
</div>
54-
<div class=" four columns">
55-
<a href="#">Manage Track</a>
56-
</div>
57-
</div>
58-
59-
<div class="row list">
60-
<div class="eight columns">
61-
<p class="title">Back End: Javascript</p>
62-
<p class="sub-title"><em>back-end-javascript.</em> 3 resources</p>
63-
</div>
64-
<div class="four columns">
65-
<a href="#">Manage Track</a>
37+
<div class="row list">
38+
<div class="eight columns">
39+
<p class="title">Coding With HTML / CSS</p>
40+
<p class="sub-title"><em>coding-with-html.</em> 3 resources</p>
41+
</div>
42+
<div class=" four columns">
43+
<a href="new-track.html">Manage Track</a>
44+
</div>
6645
</div>
67-
</div>
68-
69-
<div class="row list">
70-
<div class="eight columns">
71-
<p class="title">Front End: Javascript</p>
72-
<p class="sub-title"><em>front-end-javascript.</em> 3 resources</p>
46+
<div class="row list">
47+
<div class="eight columns">
48+
<p class="title">Back End: Javascript</p>
49+
<p class="sub-title"><em>back-end-javascript.</em> 3 resources</p>
50+
</div>
51+
<div class="four columns">
52+
<a href="new-track.html">Manage Track</a>
53+
</div>
7354
</div>
74-
<div class="four columns">
75-
<a href="#">Manage Track</a>
55+
<div class="row list">
56+
<div class="eight columns">
57+
<p class="title">Front End: Javascript</p>
58+
<p class="sub-title"><em>front-end-javascript.</em> 3 resources</p>
59+
</div>
60+
<div class="four columns">
61+
<a href="new-track.html">Manage Track</a>
62+
</div>
7663
</div>
77-
</div>
7864
</section>
79-
8065
<script src="assets/js/scripts.min.js"></script>
66+
</body>
8167

82-
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
83-
<script>
84-
(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
85-
function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
86-
e=o.createElement(i);r=o.getElementsByTagName(i)[0];
87-
e.src='//www.google-analytics.com/analytics.js';
88-
r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
89-
ga('create','UA-XXXXX-X');ga('send','pageview');
90-
</script>
91-
92-
</body>
9368
</html>

Diff for: ‎app/new-question.html

+74-90
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,100 @@
11
<!doctype html>
22
<html>
3-
<head>
3+
4+
<head>
45
<meta charset="utf-8">
56
<title>Coding101</title>
6-
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<meta name="description" content="">
99
<meta name="viewport" content="width=device-width,initial-scale=1">
1010
<link href="assets/components/skeleton/skeleton.css" rel="stylesheet">
1111
<link href="assets/css/style.min.css" rel="stylesheet">
12-
1312
<script src="https://use.fontawesome.com/ab67cbccfa.js"></script>
1413
<script src="assets/components/modernizr/modernizr.js"></script>
15-
</head>
16-
<body>
14+
</head>
1715

16+
<body>
1817
<header class="container">
19-
20-
<nav class="header">
21-
22-
<div class="row">
23-
<div class="six columns">
24-
<a class="nav-logo" href="/">Coding101</a>
25-
</div>
26-
27-
<div class="six columns">
28-
<div class="nav-link">
29-
<a href="/">Tracks</a>
30-
<a class="active" href="questions.html">Questions</a>
18+
<nav class="header">
19+
<div class="row">
20+
<div class="six columns">
21+
<a class="nav-logo" href="/">Coding101</a>
22+
</div>
23+
<div class="six columns">
24+
<div class="nav-link">
25+
<a href="/">Tracks</a>
26+
<a class="active" href="questions.html">Questions</a>
27+
</div>
28+
</div>
3129
</div>
32-
</div>
33-
34-
</div>
35-
36-
</nav>
37-
30+
</nav>
3831
</header>
39-
4032
<section class="borderline"></section>
41-
4233
<section class="container new-question m-t-xl">
43-
<form class="form">
44-
45-
<div class="row nav">
46-
<div class="eight columns">
47-
<p>New Question</p>
48-
</div>
49-
50-
<div class="four columns">
51-
<div class="u-pull-right">
52-
<a href="#">Cancel</a>
53-
<a class="new-track-active" href="#">Save</a>
34+
<form class="form">
35+
<div class="row nav">
36+
<div class="eight columns">
37+
<p>New Question</p>
38+
</div>
39+
<div class="four columns">
40+
<div class="u-pull-right">
41+
<a href="#">Cancel</a>
42+
<a class="new-track-active" href="#">Save</a>
43+
</div>
44+
</div>
5445
</div>
55-
</div>
56-
</div>
57-
58-
<div class="row m-t-xl">
59-
60-
<div class="four columns">
61-
<label>Actual Question</label>
62-
</div>
63-
<div class="eight columns">
64-
<input class="form-control u-full-width" placeholder="Question Name" type="text" required>
65-
</div>
66-
67-
</div>
68-
69-
<div class="row m-t-xl q-row">
70-
71-
<div class="four columns">
72-
<label>Answer 1</label>
73-
<a href="#" class="text-grey delete-this-answer">Remove</a>
74-
</div>
75-
<div class="eight columns">
76-
<input class="form-control u-full-width" placeholder="Actual Answer" type="text" required>
77-
<input class="form-control u-full-width" placeholder="Add track" type="text" required>
78-
</div>
79-
80-
</div>
81-
82-
<div class="row m-t-xl q-row">
83-
84-
<div class="four columns">
85-
<label>Answer 2</label>
86-
<a href="#" class="text-grey delete-this-answer">Remove</a>
87-
</div>
88-
<div class="eight columns">
89-
<input class="form-control u-full-width" placeholder="Actual Answer" type="text" required>
90-
<input class="form-control u-full-width" placeholder="Add track" type="text" required>
91-
</div>
92-
93-
</div>
94-
95-
<div class="row m-t-xl">
96-
<a id="add-another-answer" class="another-answer text-grey" href="#"><i class="fa fa-plus"></i>Add another answer</a>
97-
</div>
98-
99-
</form>
46+
<div class="row m-t-xl">
47+
<div class="four columns">
48+
<label>Actual Question</label>
49+
</div>
50+
<div class="eight columns">
51+
<input class="form-control u-full-width" placeholder="Question Name" type="text" required>
52+
</div>
53+
</div>
54+
<div class="row m-t-xl q-row">
55+
<div class="four columns">
56+
<label>Answer 1</label>
57+
<a href="#" class="text-grey delete-this-answer">Remove</a>
58+
</div>
59+
<div class="eight columns">
60+
<input class="form-control u-full-width" placeholder="Actual Answer" type="text" required>
61+
<input class="form-control u-full-width" placeholder="Add track" type="text" required>
62+
</div>
63+
</div>
64+
<div class="row m-t-xl q-row">
65+
<div class="four columns">
66+
<label>Answer 2</label>
67+
<a href="#" class="text-grey delete-this-answer">Remove</a>
68+
</div>
69+
<div class="eight columns">
70+
<input class="form-control u-full-width" placeholder="Actual Answer" type="text" required>
71+
<input class="form-control u-full-width" placeholder="Add track" type="text" required>
72+
</div>
73+
</div>
74+
<div class="row m-t-xl">
75+
<a id="add-another-answer" class="another-answer text-grey" href="#"><i class="fa fa-plus"></i>Add another answer</a>
76+
</div>
77+
</form>
10078
</section>
101-
10279
<script src="assets/components/jquery/jquery.min.js"></script>
10380
<script src="assets/js/scripts.min.js"></script>
104-
10581
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
10682
<script>
107-
(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
108-
function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
109-
e=o.createElement(i);r=o.getElementsByTagName(i)[0];
110-
e.src='//www.google-analytics.com/analytics.js';
111-
r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
112-
ga('create','UA-XXXXX-X');ga('send','pageview');
83+
(function(b, o, i, l, e, r) {
84+
b.GoogleAnalyticsObject = l;
85+
b[l] || (b[l] =
86+
function() {
87+
(b[l].q = b[l].q || []).push(arguments)
88+
});
89+
b[l].l = +new Date;
90+
e = o.createElement(i);
91+
r = o.getElementsByTagName(i)[0];
92+
e.src = '//www.google-analytics.com/analytics.js';
93+
r.parentNode.insertBefore(e, r)
94+
}(window, document, 'script', 'ga'));
95+
ga('create', 'UA-XXXXX-X');
96+
ga('send', 'pageview');
11397
</script>
98+
</body>
11499

115-
</body>
116100
</html>

0 commit comments

Comments
 (0)