diff --git a/css/fullpage.css b/css/fullpage.css
deleted file mode 100644
index 4f0f0bd..0000000
--- a/css/fullpage.css
+++ /dev/null
@@ -1,212 +0,0 @@
-/*!
- * fullPage 2.7.5
- * https://github.com/alvarotrigo/fullPage.js
- * MIT licensed
- *
- * Copyright (C) 2013 alvarotrigo.com - A project by Alvaro Trigo
- */
-html.fp-enabled,
-.fp-enabled body {
- margin: 0;
- padding: 0;
- overflow:hidden;
-
- /*Avoid flicker on slides transitions for mobile phones #336 */
- -webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-#superContainer {
- height: 100%;
- position: relative;
-
- /* Touch detection for Windows 8 */
- -ms-touch-action: none;
-
- /* IE 11 on Windows Phone 8.1*/
- touch-action: none;
-}
-.fp-section {
- position: relative;
- -webkit-box-sizing: border-box; /* Safari<=5 Android<=3 */
- -moz-box-sizing: border-box; /* <=28 */
- box-sizing: border-box;
-}
-.fp-slide {
- float: left;
-}
-.fp-slide, .fp-slidesContainer {
- height: 100%;
- display: block;
-}
-.fp-slides {
- z-index:1;
- height: 100%;
- overflow: hidden;
- position: relative;
- -webkit-transition: all 0.3s ease-out; /* Safari<=6 Android<=4.3 */
- transition: all 0.3s ease-out;
-}
-.fp-section.fp-table, .fp-slide.fp-table {
- display: table;
- table-layout:fixed;
- width: 100%;
-}
-.fp-tableCell {
- display: table-cell;
- vertical-align: middle;
- width: 100%;
- height: 100%;
-}
-.fp-slidesContainer {
- float: left;
- position: relative;
-}
-.fp-controlArrow {
- -webkit-user-select: none; /* webkit (safari, chrome) browsers */
- -moz-user-select: none; /* mozilla browsers */
- -khtml-user-select: none; /* webkit (konqueror) browsers */
- -ms-user-select: none; /* IE10+ */
- position: absolute;
- z-index: 4;
- top: 50%;
- cursor: pointer;
- width: 0;
- height: 0;
- border-style: solid;
- margin-top: -38px;
- -webkit-transform: translate3d(0,0,0);
- -ms-transform: translate3d(0,0,0);
- transform: translate3d(0,0,0);
-}
-.fp-controlArrow.fp-prev {
- left: 15px;
- width: 0;
- border-width: 38.5px 34px 38.5px 0;
- border-color: transparent #727272 transparent transparent;
-}
-.fp-controlArrow.fp-next {
- right: 15px;
- border-width: 38.5px 0 38.5px 34px;
- border-color: transparent transparent transparent #727272;
-}
-.fp-scrollable {
- overflow: scroll;
-}
-.fp-notransition {
- -webkit-transition: none !important;
- transition: none !important;
-}
-#fp-nav {
- position: fixed;
- z-index: 100;
- margin-top: -32px;
- top: 50%;
- opacity: 1;
- -webkit-transform: translate3d(0,0,0);
-}
-#fp-nav.right {
- right: 17px;
-}
-#fp-nav.left {
- left: 17px;
-}
-.fp-slidesNav{
- position: absolute;
- z-index: 4;
- left: 50%;
- opacity: 1;
-}
-.fp-slidesNav.bottom {
- bottom: 17px;
-}
-.fp-slidesNav.top {
- top: 17px;
-}
-#fp-nav ul,
-.fp-slidesNav ul {
- margin: 0;
- padding: 0;
-}
-#fp-nav ul li,
-.fp-slidesNav ul li {
- display: block;
- width: 14px;
- height: 13px;
- margin: 7px;
- position:relative;
-}
-.fp-slidesNav ul li {
- display: inline-block;
-}
-#fp-nav ul li a,
-.fp-slidesNav ul li a {
- display: block;
- position: relative;
- z-index: 1;
- width: 100%;
- height: 100%;
- cursor: pointer;
- text-decoration: none;
-}
-#fp-nav ul li a.active span,
-.fp-slidesNav ul li a.active span,
-#fp-nav ul li:hover a.active span,
-.fp-slidesNav ul li:hover a.active span{
- height: 12px;
- width: 12px;
- margin: -6px 0 0 -6px;
- border-radius: 100%;
- }
-#fp-nav ul li a span,
-.fp-slidesNav ul li a span {
- border-radius: 50%;
- position: absolute;
- z-index: 1;
- height: 4px;
- width: 4px;
- border: 0;
- background: #333;
- left: 50%;
- top: 50%;
- margin: -2px 0 0 -2px;
- -webkit-transition: all 0.1s ease-in-out;
- -moz-transition: all 0.1s ease-in-out;
- -o-transition: all 0.1s ease-in-out;
- transition: all 0.1s ease-in-out;
-}
-#fp-nav ul li:hover a span,
-.fp-slidesNav ul li:hover a span{
- width: 10px;
- height: 10px;
- margin: -5px 0px 0px -5px;
-}
-#fp-nav ul li .fp-tooltip {
- position: absolute;
- top: -2px;
- color: #727272;
- font-size: 14px;
- font-family: arial, helvetica, sans-serif;
- white-space: nowrap;
- max-width: 220px;
- overflow: hidden;
- display: block;
- opacity: 0;
- width: 0;
-}
-#fp-nav ul li:hover .fp-tooltip,
-#fp-nav.fp-show-active a.active + .fp-tooltip {
- -webkit-transition: opacity 0.2s ease-in;
- transition: opacity 0.2s ease-in;
- width: auto;
- opacity: 1;
-}
-#fp-nav ul li .fp-tooltip.right {
- right: 20px;
-}
-#fp-nav ul li .fp-tooltip.left {
- left: 20px;
-}
-.fp-auto-height.fp-section,
-.fp-auto-height .fp-slide,
-.fp-auto-height .fp-tableCell{
- height: auto !important;
-}
\ No newline at end of file
diff --git a/css/style.css b/css/style.css
index 6111786..b66e204 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,216 +1,133 @@
/*
-* GENERAL
+* General
*/
body {
- margin: 0 0;
-}
-
-#page-gen {
- position: relative;
- height: 100vh;
width: 100vw;
- background-color: #fff;
-
- min-width: 1020px;
- min-height: 640px;
+ margin: 0;
}
-#topmenu {
+/*
+* Fonts
+*/
+
+@font-face {
+ font-family: Ubuntu;
+ src: url("../fonts/Ubuntu-R.ttf");
+}
+
+.ubuntu { font-family: Ubuntu;}
+
+/*
+* Spacing
+*/
+
+.pad10vw { padding-left: 10vw; padding-right: 10vw;}
+.pad10vh { padding-top: 10vh !important; }
+
+.marb1r { margin-bottom: 1rem;}
+
+
+/*
+* Colours
+*/
+
+.accent { color: #03A9F4; }
+.primary { color: #727272; }
+
+/*
+* Header
+*/
+header {
position: fixed;
top: 0;
+ left: 0;
+ width: 100vw;
+
+ background-color: #fff;
+}
+
+header > hr {
+ clear: both;
+}
+
+header > nav {
+ float: left;
+}
+
+header > ul {
+ float: right;
+ padding-right: 1rem;
+}
+
+nav > ul {
+ list-style: none;
+ padding-left: 1rem;
+}
+
+header > nav a {
+ padding: 1rem 1rem;
+ font-size: 1.7rem;
+ line-height: 1.7;
+}
+
+header ul > li {
+ display: inline-block;
+}
+
+header a {
+ text-decoration: none;
+ color :inherit;
+}
+
+/*
+* Panels (general)
+*/
+
+.panel {
+ height: 100vh;
width: 100vw;
}
-.panel-gen {
- height: 100vh;
- padding-left: 2vw;
- padding-top: 10vh;
+.panel > section {
+ padding-top: 30vh;
}
-
-
-p {
- line-height: 1.2;
- margin: 0 0;
+.panel > section > h1 {
+ font-size: 5rem;
}
-a {
- color :#727272 !important;
+.panel > section > h2 {
+ font-size: 3rem;
}
-a:hover {
- color: #03A9F4 !important;
-}
-
-a i {
- color: inherit;
+.panel p {
+ font-size: 1.5rem;
+ line-height: 1.4;
}
/*
-* LANDING PANEL
+* Typed.js cursor
*/
-/*Bigger things*/
-
-#container-landing{
- padding-top: 25vh;
+.typed-cursor{
+ opacity: 1;
+ -webkit-animation: blink 0.7s infinite;
+ -moz-animation: blink 0.7s infinite;
+ animation: blink 0.7s infinite;
}
-
-#greet {
- margin-bottom: 0;
- font-size: 7vw;
+@keyframes blink{
+ 0% { opacity:1; }
+ 50% { opacity:0; }
+ 100% { opacity:1; }
}
-
-#landing-blurb {
- overflow: hidden;
- margin-left:0.4vw;
+@-webkit-keyframes blink{
+ 0% { opacity:1; }
+ 50% { opacity:0; }
+ 100% { opacity:1; }
}
-
-/*Navigation*/
-
-#container-landing ul {
- list-style: none;
- font-size: 4vw;
- padding-left: 0;
+@-moz-keyframes blink{
+ 0% { opacity:1; }
+ 50% { opacity:0; }
+ 100% { opacity:1; }
}
-
-#container-landing ul li {
- display: inline;
- margin-top: 0;
- margin-bottom: 0;
- margin-right: 1vw;
-
-}
-
-/*
-* ABOUT ME PANEL
-*/
-
-/*Bigger things*/
-
-#container-aboutme {
- width: 95%;
-}
-
-#container-aboutme p {
- margin-top: 0;
-}
-
-#img_bubble1 {
- border-radius: 7em;
- height:20vh;
- display: inline;
-}
-
-
-/*
-* INTOUCH PANEL
-*/
-
-#panel-intouch .fp-tableCell {
- vertical-align: baseline;
-}
-
-#container-intouch {
- margin-left:2vw;
- width: 95%;
- margin-top:2vh
-}
-
-form p textarea {
- width: 90vw;
- height: 20vh;
- resize: none;
-}
-
-/*
-* MODIFIERS
-*/
-
-.accentsize { font-size: 3vw; }
-.basesize { font-size: 2vw; }
-
-.bold { font-weight: bold; }
-
-.pos-abs { position: absolute; }
-
-.mt-z { margin-top: 0; }
-.mt2 { margin-top: 0.5em;}
-.mb-z { margin-bottom: 0; }
-
-.vcenter {
- top: 40vh;
- position: relative;
- transform: translateY(-50%);
-}
-
-.primarytext {color :#727272;}
-.accent {color:#03A9F4;}
-
-.ta-center { text-align: center; }
-
-/*
-* SOCIAL MEDIA BOXES
-*/
-
-
-.social ul {
- list-style: none;
- margin-bottom: 0;
-}
-
-.social ul li {
- display: inline;
-}
-
-.social ul li a i {
- font-size: 7vh;
-}
-
-/*
-* CONTACT FORM POPUP
-*/
-
-#contact-popup {
- position: fixed;
- top: 20vh;
- height: 50vh;
- width: 50vw;
- background-color: #03A9F4;
- left: 25vw;
- border-radius: 15vw;
- text-align: center;
- padding-top: 18vh;
- display: none;
-}
-
-#thanks {
- color: #fff;
- font-family: Oswald;
- font-size: 4vw;
-}
-
-
-/*
-* FONT DATA
-*/
-
-.opensans { font-family: OpenSans; }
-.oswald { font-family: Oswald; }
-.courgette { font-family: Courgette; }
-
-@font-face {
- font-family: OpenSans;
- src: url("../fonts/OpenSans-CondLight.ttf") format("truetype");
-}
-
-@font-face {
- font-family: Oswald;
- src: url("../fonts/Oswald-Light.ttf") format("truetype");
-}
-
-@font-face {
- font-family: Courgette;
- src: url("../fonts/Courgette-Regular.ttf") format("truetype");
-}
\ No newline at end of file
diff --git a/css/typed/main.css b/css/typed/main.css
deleted file mode 100755
index e802d71..0000000
--- a/css/typed/main.css
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-*{
- padding:0;
- margin:0;
-}
-
-body{
- font-family: "Ubuntu", sans-serif;
- font-size: 100%;
- background:#f8f8f8;
-}
-
-a{
- text-decoration: none;
- color:#666;
-}
- a:hover{
- color:#999;
- }
-p{
- line-height: 2em;
- margin:0 0 20px;
- text-align: center;
-}
-*/
-
-.wrap{
- max-width: 600px;
- margin:150px auto;
-}
-
-.type-wrap{
- margin:10px auto;
- padding:20px;
- background:#f0f0f0;
- border-radius:5px;
- border:#CCC 1px solid;
-}
-
-.links{
- margin:20px 0;
- font-size: 0.75em;
- text-align: center;
-}
-
-.typed-cursor{
- opacity: 1;
- -webkit-animation: blink 0.7s infinite;
- -moz-animation: blink 0.7s infinite;
- animation: blink 0.7s infinite;
-}
-@keyframes blink{
- 0% { opacity:1; }
- 50% { opacity:0; }
- 100% { opacity:1; }
-}
-@-webkit-keyframes blink{
- 0% { opacity:1; }
- 50% { opacity:0; }
- 100% { opacity:1; }
-}
-@-moz-keyframes blink{
- 0% { opacity:1; }
- 50% { opacity:0; }
- 100% { opacity:1; }
-}
\ No newline at end of file
diff --git a/fonts/Courgette-Regular.ttf b/fonts/Courgette-Regular.ttf
deleted file mode 100755
index 433766b..0000000
Binary files a/fonts/Courgette-Regular.ttf and /dev/null differ
diff --git a/fonts/OpenSans-CondLight.ttf b/fonts/OpenSans-CondLight.ttf
deleted file mode 100755
index 97c355b..0000000
Binary files a/fonts/OpenSans-CondLight.ttf and /dev/null differ
diff --git a/fonts/Oswald-Heavy.ttf b/fonts/Oswald-Heavy.ttf
deleted file mode 100755
index 0db6cf0..0000000
Binary files a/fonts/Oswald-Heavy.ttf and /dev/null differ
diff --git a/fonts/Oswald-Light.ttf b/fonts/Oswald-Light.ttf
deleted file mode 100755
index 18cac63..0000000
Binary files a/fonts/Oswald-Light.ttf and /dev/null differ
diff --git a/fonts/Ubuntu-R.ttf b/fonts/Ubuntu-R.ttf
new file mode 100644
index 0000000..45a038b
Binary files /dev/null and b/fonts/Ubuntu-R.ttf differ
diff --git a/images/IMG_1904.JPG b/images/IMG_1904.JPG
deleted file mode 100755
index 2bcdb72..0000000
Binary files a/images/IMG_1904.JPG and /dev/null differ
diff --git a/images/bathbomb1.jpg b/images/bathbomb1.jpg
deleted file mode 100644
index 62a9723..0000000
Binary files a/images/bathbomb1.jpg and /dev/null differ
diff --git a/images/bg-landing.jpg b/images/bg-landing.jpg
deleted file mode 100644
index 5286777..0000000
Binary files a/images/bg-landing.jpg and /dev/null differ
diff --git a/images/logo.png b/images/logo.png
deleted file mode 100644
index 65bdcb4..0000000
Binary files a/images/logo.png and /dev/null differ
diff --git a/images/robotdpm.png b/images/robotdpm.png
deleted file mode 100644
index e2a4070..0000000
Binary files a/images/robotdpm.png and /dev/null differ
diff --git a/images/web_couchpotato.jpg b/images/web_couchpotato.jpg
deleted file mode 100644
index 2847422..0000000
Binary files a/images/web_couchpotato.jpg and /dev/null differ
diff --git a/index.html b/index.html
index 31ea9d2..725e9f9 100644
--- a/index.html
+++ b/index.html
@@ -2,120 +2,70 @@
- Hello! I'm Marc!
+
+
+
+
+
-
-
-
+
+
+
-
-