Skip to content

Commit

Permalink
Merge pull request #16 from matthewdking/update-desc
Browse files Browse the repository at this point in the history
Update desc
  • Loading branch information
matthewdking authored Dec 15, 2017
2 parents 19b15b8 + 839b26a commit 2cea8a7
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 39 deletions.
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<body>
<div class="wrapper">
<h1 class="title">Matt King</h1>
<div class="description-hidden">
Hi, I'm Matt King Full stack web developer Graduate of Founders and Coders Previous projects Impact Sustainability
</div>
<section class="description-hidden">
I'm a full stack javascript developer. I'm a graduate of Founders and Coders. I'm passionate about the environment and sustainability, and always looking for projects with a positive footprint.
</section>
<div class="description-container" id="typed" aria-hidden="true">
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions public/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const typedDiv = document.getElementById('typed');

const myDescription =
"I'm a full stack javascript developer. $I'm a graduate of $^Founder and Coders. $I'm passionate about the environment and sustainability, and always looking for projects with a positive footprint.";
"I'm a full stack javascript developer. $I'm a graduate of $^Founders and Coders. $I'm passionate about the environment and sustainability, and always looking for projects with a positive footprint.";

const p1 = document.createElement('p');
const p2 = document.createElement('p');
Expand All @@ -14,7 +14,7 @@ a1.href = 'https://foundersandcoders.com/';

const arrayOfEl = [p1, p2, a1, p3];

typeText(str, element, arr) => {
const typeText = (str, element, arr) => {
setTimeout(() => {
if (str[0] === '$') {
if (str[1] === '^') {
Expand All @@ -29,6 +29,6 @@ typeText(str, element, arr) => {
typeText(str.slice(1), element, arr);
}
}, Math.random() * 100);
}
};

typeText(myDescription, p1, arrayOfEl);
12 changes: 12 additions & 0 deletions public/style/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,15 @@ footer {
.icon:hover {
opacity: 1;
}

a:link {
color: #fff;
}

a:visited {
color: #fff;
}

a:active {
color: #fff;
}
147 changes: 114 additions & 33 deletions public/style/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,127 @@
License: none (public domain)
*/

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}
body {
line-height: 1;
line-height: 1;
}
ol, ul {
list-style: none;
ol,
ul {
list-style: none;
}
blockquote, q {
quotes: none;
blockquote,
q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
blockquote:before,
blockquote:after,
q:before,
q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
border-collapse: collapse;
border-spacing: 0;
}

0 comments on commit 2cea8a7

Please sign in to comment.