Adjust site structure, make Work + Wordpress files primary site landi…

…ng page, change About section to secondary page
alison-mk · Dec 13, 2016 · 3b164ab · 3b164ab
1 parent f80fd3f
commit 3b164ab
Show file tree

Hide file tree

Showing 1,505 changed files with 12,451 additions and 12,043 deletions.
diff --git a/.ftpquota b/.ftpquota
@@ -0,0 +1 @@
+2105 97003525
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 _private
-/work/wp-snapshots/
-/work/wp-content/themes/bones/library/scss/.sass-cache/
+/wp-snapshots/
+/wp-content/themes/bones/library/scss/.sass-cache/
 .sass-cache/
 /donuts/tokens.php
 .DS_Store
+/about/.sass-cache
+error_log
diff --git a/.htaccess b/.htaccess
@@ -0,0 +1,12 @@
+
+# BEGIN WordPress
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /
+RewriteRule ^index\.php$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /index.php [L]
+</IfModule>
+
+# END WordPress
diff --git a/resume/resume → about/.htaccess b/resume/resume → about/.htaccess
diff --git a/css/style.css → about/css/style.css b/css/style.css → about/css/style.css
diff --git a/about/css/style.css.map b/about/css/style.css.map
diff --git a/work/wp-content/themes/bones/favicon.ico → about/favicon.ico b/work/wp-content/themes/bones/favicon.ico → about/favicon.ico
diff --git a/about/graphics/about-alison.jpg b/about/graphics/about-alison.jpg
diff --git a/...es/bones/library/images/icon-facebook.png → about/graphics/icon-facebook.png b/...es/bones/library/images/icon-facebook.png → about/graphics/icon-facebook.png
diff --git a/...emes/bones/library/images/icon-google.png → about/graphics/icon-google.png b/...emes/bones/library/images/icon-google.png → about/graphics/icon-google.png
diff --git a/...s/bones/library/images/icon-instagram.png → about/graphics/icon-instagram.png b/...s/bones/library/images/icon-instagram.png → about/graphics/icon-instagram.png
diff --git a/...es/bones/library/images/icon-linkedin.png → about/graphics/icon-linkedin.png b/...es/bones/library/images/icon-linkedin.png → about/graphics/icon-linkedin.png
diff --git a/about/graphics/line-icon-facebook.png b/about/graphics/line-icon-facebook.png
diff --git a/about/graphics/line-icon-googleplus.png b/about/graphics/line-icon-googleplus.png
diff --git a/about/graphics/line-icon-instagram.png b/about/graphics/line-icon-instagram.png
diff --git a/about/graphics/line-icon-linkedin.png b/about/graphics/line-icon-linkedin.png
diff --git a/index.html → about/index.html b/index.html → about/index.html
@@ -3,19 +3,19 @@
 	<head>
 	    <meta charset="utf-8" />
 	    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<link href="/css/style.css" rel="stylesheet">
+		<link href="css/style.css" rel="stylesheet">
 		<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
 		<title>Alison McKay | Front End Developer</title>
 	</head>
-	<body class="sky">
+	<body class="color1">
 		<div class="container">
 			<header>
 				<div class="menu main-header">
 					<div class="menu-wrapper">
 						<h1 class="title"><a href="/" title="Home">Alison McKay</a></h1>
 						<ul>
-							<li><a href="http://work.alisonleemckay.com" title="View my portfolio">work</a></li>
-							<li><a href="http://work.alisonleemckay.com/blog" title="See my blog">blog</a></li>
+								<li><a href="http://alisonleemckay.com" title="See my work">work</a></li>
+								<li><a href="http://alisonleemckay.com/about" title="About me">about</a></li>
 							<li><a href="mailto:[email protected]" target="_blank" title="Email me">contact</a></li>
 						</ul>
 					</div>
@@ -24,8 +24,8 @@ <h1 class="title"><a href="/" title="Home">Alison McKay</a></h1>
 					<div class="menu-wrapper">
 						<h1 class="title"><a href="/" title="Home">Alison McKay</a></h1>
 						<ul>
-							<li><a href="http://work.alisonleemckay.com" title="View my portfolio">work</a></li>
-							<li><a href="http://work.alisonleemckay.com/blog" title="See my blog">blog</a></li>
+								<li><a href="http://alisonleemckay.com" title="See my work">work</a></li>
+								<li><a href="http://alisonleemckay.com/about" title="About me">about</a></li>
 							<li><a href="mailto:[email protected]" target="_blank" title="Email me">contact</a></li>
 						</ul>
 					</div>
@@ -36,9 +36,9 @@ <h4 class="about-title">I'm a front end developer based in Seattle, Washington.<
 				<div class="intro">
 					<div class="intro-one">
 						<h2>Skills</h2>
-						<p><u>Things I get excited about:</u> clever Javascript, web accessibility, canvas animations, seamless user experience</p>
-						<p><u>Things I'm really good at:</u> building clean and responsive sites, user experience design, Sass, semantic HTML, CSS animations, Git, simple to intermediate Javascript, Wordpress</p>
-						<p><u>Things I regularly study:</u> Javascript, jQuery, PHP, the open source world</p>
+						<p><strong>Things I get excited about:</strong> clever Javascript, web accessibility, canvas animations, seamless user experience</p>
+						<p><strong>Things I'm really good at:</strong> building clean and responsive sites, user experience design, Sass, semantic HTML, CSS animations, Git, simple to intermediate Javascript, Wordpress</p>
+						<p><strong>Things I regularly study:</strong> Javascript, jQuery, PHP, the open source world</p>
 					</div>
 					<div class="intro-two">
 						<h2>About Me</h2>
@@ -59,7 +59,7 @@ <h3><a href="http://www.seattlewebdesign.com" target="_blank" title="See Efelle"
 
 					<h3>Freelance | Front End Developer</h3>
 					<p class="date">December 2012 - Ongoing</p>
-					<p>Wordpress. Side projects. All-around fun. Projects include: <a href="http://work.alisonleemckay.com/project/alisons-last-donut/" title="See Alison's Last Donut">Alison's Last Donut</a>, a statement of my devotion to circular frosted treats, and <a href="http://laceyclemmons.com/" title="See Lacey Clemmons">Lacey Clemmons</a>, a copywriting and content strategy portfolio site.</p>
+					<p>Wordpress. Side projects. All-around fun. Projects include: <a href="http://alisonleemckay.com/project/alisons-last-donut/" title="See Alison's Last Donut">Alison's Last Donut</a>, a statement of my devotion to circular frosted treats, and <a href="http://alisonleemckay.com/project/lacey-clemmons/" title="See Lacey Clemmons">Lacey Clemmons</a>, a copywriting and content strategy portfolio site.</p>
 
 					<h3><a href="http://www.conflare.com" target="_blank" title="See Conflare">Conflare</a> | Project Manager, Copywriter, Front End Developer</h3>
 					<p class="date">December 2012 - June 2013</p>
@@ -68,12 +68,10 @@ <h3><a href="http://www.conflare.com" target="_blank" title="See Conflare">Confl
 				</div>
 				<div class="awards">
 					<h2>Awards</h2>
-					<h3>Communicator Award of Distinction, winner. 2015</h3>
-					<p class="date"><a href="http://work.alisonleemckay.com/project/foster-law/">Foster Law</a></p>
 					<h3>Communicator Award of Excellence, winner. 2015.</h3>
-					<p class="date"><a href="http://work.alisonleemckay.com/project/dargey-development/">Dargey Development</a></p>
+					<p class="date"><a href="http://alisonleemckay.com/project/dargey-development/">Dargey Development</a></p>
 					<h3>Awwwards, nominee. May 2015.</h3>
-					<p class="date"><a href="http://work.alisonleemckay.com/project/dargey-development/">Dargey Development</a></p>
+					<p class="date"><a href="http://alisonleemckay.com/project/dargey-development/">Dargey Development</a></p>
 				</div>
 			</section>
 			<footer class="contact">
@@ -103,7 +101,7 @@ <h3>Awwwards, nominee. May 2015.</h3>
 			</footer>
 		</div>
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-		<script src="/scripts/scripts.js"></script>
+		<script src="scripts/scripts.js"></script>
 		<script>
 		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

diff --git a/resume/graphics/facebook.png → about/resume/graphics/facebook.png b/resume/graphics/facebook.png → about/resume/graphics/facebook.png
diff --git a/resume/graphics/google.png → about/resume/graphics/google.png b/resume/graphics/google.png → about/resume/graphics/google.png
diff --git a/resume/graphics/icon_desktop.png → about/resume/graphics/icon_desktop.png b/resume/graphics/icon_desktop.png → about/resume/graphics/icon_desktop.png
diff --git a/resume/graphics/icon_documents_alt.png → about/resume/graphics/icon_documents_alt.png b/resume/graphics/icon_documents_alt.png → about/resume/graphics/icon_documents_alt.png
diff --git a/resume/graphics/icon_globe.png → about/resume/graphics/icon_globe.png b/resume/graphics/icon_globe.png → about/resume/graphics/icon_globe.png
diff --git a/resume/graphics/icon_laptop.png → about/resume/graphics/icon_laptop.png b/resume/graphics/icon_laptop.png → about/resume/graphics/icon_laptop.png
diff --git a/resume/graphics/instagram.png → about/resume/graphics/instagram.png b/resume/graphics/instagram.png → about/resume/graphics/instagram.png
diff --git a/resume/graphics/linkedin.png → about/resume/graphics/linkedin.png b/resume/graphics/linkedin.png → about/resume/graphics/linkedin.png
diff --git a/resume/graphics/spotify.png → about/resume/graphics/spotify.png b/resume/graphics/spotify.png → about/resume/graphics/spotify.png
diff --git a/resume/index.html → about/resume/index.html b/resume/index.html → about/resume/index.html
diff --git a/about/resume/resume b/about/resume/resume
diff --git a/resume/scss.scss/resume.scss → about/resume/scss.scss/resume.scss b/resume/scss.scss/resume.scss → about/resume/scss.scss/resume.scss
diff --git a/resume/styles/resume.css → about/resume/styles/resume.css b/resume/styles/resume.css → about/resume/styles/resume.css
diff --git a/about/robots.txt b/about/robots.txt
@@ -0,0 +1,4 @@
+# www.robotstxt.org/
+# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
+
+User-agent: *
diff --git a/scripts/scripts.js → about/scripts/scripts.js b/scripts/scripts.js → about/scripts/scripts.js
@@ -27,19 +27,19 @@ function stickyHeader() {
 function changeBg() {
     window.addEventListener('scroll', function(e){
         var distanceY = window.pageYOffset || document.documentElement.scrollTop;
-        var blush = 250;
-        var mint = 750;
+        var color2 = 250;
+        var color3 = 750;
 
-        if ((distanceY > blush) && (distanceY < mint)) {
-           $("body").addClass("blush");
+        if ((distanceY > color2) && (distanceY < color3)) {
+           $("body").addClass("color2");
         } else {
-           $("body").removeClass("blush");
+           $("body").removeClass("color2");
         }
 
-        if (distanceY > mint) {
-           $("body").addClass("mint");
+        if (distanceY > color3) {
+           $("body").addClass("color3");
         } else {
-           $("body").removeClass("mint");
+           $("body").removeClass("color3");
         }
     });
 }
diff --git a/scss/_media-queries.scss → about/scss/_media-queries.scss b/scss/_media-queries.scss → about/scss/_media-queries.scss