diff --git a/css/style.css b/css/style.css index 383c2f7..14e2f12 100644 --- a/css/style.css +++ b/css/style.css @@ -6,7 +6,7 @@ body { margin: 0 0; } -#page { +#page-gen { position: relative; height: 100vh; width: 100vw; @@ -16,21 +16,19 @@ body { min-height: 640px; } -.social { - position: absolute; - bottom: 1em; - margin-left: 0; - right: 1em; +#topmenu { + position: fixed; + top: 0; + width: 100vw; } -.social ul { - list-style: none; - margin-bottom: 0; +.panel-gen { + height: 100vh; + padding-left: 2vw; + padding-top: 10vh; } -.social ul li { - display: inline; -} + p { line-height: 1.2; @@ -38,45 +36,25 @@ p { } a { - color :#727272; + color :#727272 !important; } a:hover { - color: #03A9F4; + color: #03A9F4 !important; } a i { color: inherit; } -/* -* PANELS -*/ - -#panel-landing { - /*text-align: center;*/ - height: 25vh; - background-color: #FFF; -} - -#panel-resume { - -} - -#panel-projects { - -} - -#panel-intouch { - -} - /* * LANDING PANEL */ +/*Bigger things*/ + #container-landing{ - margin-left:2vw; + padding-top: 25vh; } #greet { @@ -89,6 +67,8 @@ a i { margin-left:0.4vw; } +/*Navigation*/ + #container-landing ul { list-style: none; font-size: 4vw; @@ -104,20 +84,16 @@ a i { } /* -* RESUME PANEL +* ABOUT ME PANEL */ -#panel-resume .fp-tableCell { - vertical-align: baseline; -} +/*Bigger things*/ -#container-me { - margin-left:2vw; +#container-aboutme { width: 95%; - margin-top:2vh } -#container-me p { +#container-aboutme p { margin-top: 0; } @@ -127,59 +103,6 @@ a i { display: inline; } -/* -* PROJECTS PANEL -*/ - -#panel-projects .fp-tableCell { - vertical-align: baseline; -} - -.projects-row { - height: 36%; - width: 90%; - margin-left: auto; - margin-right:auto; - margin-top: 1vh; - padding: 1.5vh 7vw; -} - -.projects-cell { - width: 30%; - height:100%; - background-color: #03A9F4; - margin:1% 1%; - float:left; -} - -#container-projects-main { - text-align:center; -} - -.slide-header { - font-size: 4vw; -} - -#cell1 { - background-image: url("../images/bathbomb1.jpg"); - background-size: 100% 100%; - box-shadow: inset 0px 0px 0px 1000px rgba(0,0,0,0.5); -} - -#cell2 { - background-image: url("../images/robotdpm.jpg"); - background-size: 100% ; - box-shadow: inset 0px 0px 0px 1000px rgba(0,0,0,0.5); -} - -.projects-cell p { - color: #fff; - font-family: Oswald; -} - -.cell-date { font-size: 7vh; } -.cell-title { font-size: 5vh; } -.cell-source { font-size: 3vh; } /* * INTOUCH PANEL @@ -195,18 +118,10 @@ a i { margin-top:2vh } -#social-boxes { - text-align: center; -} - -#social-boxes ul { - list-style: none; -} - -#social-boxes ul li { - display: inline; - margin-left: 3vh; - font-size:5vh; +form p textarea { + width: 90vw; + height: 20vh; + resize: none; } /* @@ -233,7 +148,25 @@ a i { .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; +} /* * FONT DATA @@ -241,6 +174,7 @@ a i { .opensans { font-family: OpenSans; } .oswald { font-family: Oswald; } +.courgette { font-family: Courgette; } @font-face { font-family: OpenSans; @@ -250,4 +184,9 @@ a i { @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/fonts/Courgette-Regular.ttf b/fonts/Courgette-Regular.ttf new file mode 100755 index 0000000..433766b Binary files /dev/null and b/fonts/Courgette-Regular.ttf differ diff --git a/images/IMG_1904.JPG b/images/IMG_1904.JPG new file mode 100755 index 0000000..2bcdb72 Binary files /dev/null and b/images/IMG_1904.JPG differ diff --git a/images/bathbomb1.jpg b/images/bathbomb1.jpg new file mode 100644 index 0000000..62a9723 Binary files /dev/null and b/images/bathbomb1.jpg differ diff --git a/images/robotdpm.png b/images/robotdpm.png new file mode 100644 index 0000000..e2a4070 Binary files /dev/null and b/images/robotdpm.png differ diff --git a/index.html b/index.html index 76f7207..d926d00 100644 --- a/index.html +++ b/index.html @@ -5,14 +5,51 @@ Hello! - - + + + -
-
+
+
+ +
+ +

I'm Marc and I love to

@@ -20,24 +57,11 @@

I am a third-year computer engineering student at McGill University.

I'm interested in full-stack web development, hardware design and low-level programming.

- - -
-
-
-
+
+

My name is Marc Cataford, I am a 25 years old Montrealer.

I'm currently completing my third year as a computer engineering student at McGill University and I am looking for new opportunities. @@ -48,34 +72,31 @@

- +
-
+

Want to get in touch?

I'd love to hear from you!


-

Feel free to reach out through social media by clicking on the appropriate icon:

-
-
    -
  • -
  • -
  • -
  • -
-
+

Feel free to reach out through social media by clicking on the appropriate icon in the bar at the top of the page.

+ +

You can also send me an email at c.marcandre[at]gmail.com, or fill the form below!

+ +
+

About you:

+

My name is , I'm a . You can come back to me at

+

I'd like to tell you about ...

+

+
+ +
+ +
-

...or send me an email at c.marcandre[at]gmail.com

@@ -83,9 +104,13 @@ + + + - + + diff --git a/js/animate.js b/js/animate.js index ec2381a..72ba7cd 100644 --- a/js/animate.js +++ b/js/animate.js @@ -1,7 +1,7 @@ $(window).ready(function() { - $('#page').fullpage({ + /*$('#page').fullpage({ anchors:["landing","resume","getInTouch"] - }); + });*/ var period = "."; var typedStrings = ["code"+period, "learn new things"+period, "tinker"+period, "communicate"+period, "teach"+period, "solve problems"+period, "get things done"+period]; @@ -16,4 +16,14 @@ $(window).ready(function() { loop: true, contentType: 'html' }); - }); \ No newline at end of file + }); + +$(".menulink").click(function() { + var $panel = $(this).attr("id"); + + console.log($panel); + + $('html,body').animate({ + scrollTop: $($panel).offset().top}, + 'slow'); +}); diff --git a/js/jquery-visible/LICENSE.txt b/js/jquery-visible/LICENSE.txt new file mode 100644 index 0000000..812556b --- /dev/null +++ b/js/jquery-visible/LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2012 Digital Fusion, http://teamdf.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/js/jquery-visible/jquery.visible.min.js b/js/jquery-visible/jquery.visible.min.js new file mode 100644 index 0000000..417039c --- /dev/null +++ b/js/jquery-visible/jquery.visible.min.js @@ -0,0 +1 @@ +!function(t){var i=t(window);t.fn.visible=function(t,e,o){if(!(this.length<1)){var r=this.length>1?this.eq(0):this,n=r.get(0),f=i.width(),h=i.height(),o=o?o:"both",l=e===!0?n.offsetWidth*n.offsetHeight:!0;if("function"==typeof n.getBoundingClientRect){var g=n.getBoundingClientRect(),u=g.top>=0&&g.top0&&g.bottom<=h,c=g.left>=0&&g.left0&&g.right<=f,v=t?u||s:u&&s,b=t?c||a:c&&a;if("both"===o)return l&&v&&b;if("vertical"===o)return l&&v;if("horizontal"===o)return l&&b}else{var d=i.scrollTop(),p=d+h,w=i.scrollLeft(),m=w+f,y=r.offset(),z=y.top,B=z+r.height(),C=y.left,R=C+r.width(),j=t===!0?B:z,q=t===!0?z:B,H=t===!0?R:C,L=t===!0?C:R;if("both"===o)return!!l&&p>=q&&j>=d&&m>=L&&H>=w;if("vertical"===o)return!!l&&p>=q&&j>=d;if("horizontal"===o)return!!l&&m>=L&&H>=w}}}}(jQuery); diff --git a/projectsdev b/projectsdev new file mode 100644 index 0000000..bc4b9c9 --- /dev/null +++ b/projectsdev @@ -0,0 +1,30 @@ +
+
+

Featured projects

+
+
+

November 2015
Queerness & Sexuality
special issue


The McGill Daily

+
+
+

December 2015
Lego-based autonomous robot

Design project management
Course project

+
+
+
+
+
+
+
+
+
+
Slide 2
+
Slide 3
+
Slide 4
+ +
\ No newline at end of file