home is index; links open new tab; cleaned up index mobile view css; …

…general css clean up; added line on current page
Matt-Bessette · Mar 16, 2016 · e70eabf · e70eabf
1 parent 13e3dbb
commit e70eabf
Show file tree

Hide file tree

Showing 15 changed files with 109 additions and 60 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -15,6 +15,7 @@ module.exports = (grunt) ->
 				files:
 					'build/css/projects.min.css': 'src/scss/projects/projects.scss'
 					'build/css/index.min.css': 'src/scss/index/index.scss'
+					'build/css/contact.min.css': 'src/scss/contact/contact.scss'
 
 		# Copy normalize css into build
 		copy:

diff --git a/build/.htaccess b/build/.htaccess
@@ -1,6 +1,3 @@
-RewriteEngine on
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ $1.php [NC,L]
 
 ErrorDocument 500 /500.php
 ErrorDocument 403 /403.php

diff --git a/build/contact.php b/build/contact.php
@@ -0,0 +1,23 @@
+<?php
+
+require_once 'includes/Definitions.php';
+
+?>
+
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>MBes Contact</title>
+		<link rel="icon" href="/img/ico.png" type="image/png" />
+		<link rel="stylesheet" type="text/css" href="css/normalize.css">
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+		<link rel="stylesheet" type="text/css" href="css/contact.min.css">
+		<script src="//code.jquery.com/jquery-1.12.0.min.js"></script>
+	</head>
+	<body>
+		<?php require_once(HEADER); ?>
+		<h1>Contact</h1>
+		<p>You can reach me at [email protected]</p>
+		<?php require_once(FOOTER); ?>
+	</body>
+</html>
diff --git a/build/index.php → build/home.php b/build/index.php → build/home.php
@@ -7,14 +7,15 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<title>MBes Projects</title>
+		<title>MBes Home</title>
+		<link rel="icon" href="/img/ico.png" type="image/png" />
 		<link rel="stylesheet" type="text/css" href="css/normalize.css">
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 		<link rel="stylesheet" type="text/css" href="css/index.min.css">
 		<script src="//code.jquery.com/jquery-1.12.0.min.js"></script>
 	</head>
 	<body>
-		<?php echo file_get_contents(HEADER); ?>
+		<?php require_once(HEADER); ?>
 		<div class="portfolio">
 			<div>
 				<span><img src="http://ratemyprofessors.mtvnimages.com/prof/t_Patrick_Logan_813936.jpeg"></span>
@@ -29,6 +30,6 @@
 				</span>
 			</div>
 		</div>
-		<?php echo file_get_contents(FOOTER); ?>
+		<?php require_once(FOOTER); ?>
 	</body>
 </html>
diff --git a/build/includes/Footer.php b/build/includes/Footer.php
@@ -1,7 +1,7 @@
+</div>
 <footer class="footer" role="contentinfo">
   <div class="footer-links">
-    <a href='https://www.facebook.com/matthew.bessette.1'><i class='fa fa-facebook-official fa-2x'></i></a>
-     <a href='https://www.linkedin.com/in/mattbessette94'><i class='fa fa-linkedin-square fa-2x'></i></a>
-    <a href='https://github.com/Matt-Bessette'><i class='fa fa-github-square fa-2x'></i></a>
+     <a href='https://www.linkedin.com/in/mattbessette94' target="_blank"><i class='fa fa-linkedin-square fa-2x'></i></a>
+    <a href='https://github.com/Matt-Bessette' target="_blank"><i class='fa fa-github-square fa-2x'></i></a>
   </div>
 </footer>
diff --git a/build/includes/Header.php b/build/includes/Header.php
@@ -1,4 +1,4 @@
-
+<div class='wrapper-for-content-outside-of-footer'>
 <header class="centered-navigation" role="banner">
 
 <script>
@@ -21,28 +21,29 @@
     <a href="javascript:void(0)" class="centered-navigation-mobile-menu" id="js-centered-navigation-mobile-menu"><i class="fa fa-bars fa-2x"></i></a>
     <nav role="navigation">
       <ul id="js-centered-navigation-menu" class="centered-navigation-menu show">
-        <li class="nav-link"><a href="/">Home</a></li>
-        <li class="nav-link"><a href="/projects.php">Projects</a></li>
-        <li class="nav-link"><a href="javascript:void(0)">Contact</a></li>
+        <?php 
+          $selected = explode('/',$_SERVER['REQUEST_URI'])[1];
+        ?>
+
+        <li class="nav-link"><a href="/"><span class="<?php echo $selected === '' ? 'underline' : '' ?>" >Home</span></a></li>
+        <li class="nav-link"><a href="/projects"><span class="<?php echo $selected === 'projects' ? 'underline' : '' ?>" >Projects</span></a></li>
+        <li class="nav-link"><a href="/contact"><span class="<?php echo $selected === 'contact' ? 'underline' : '' ?>" >Contact</span></a></li>
         <li class="nav-link logo">
           <a href="/" class="logo">
             <img src="/img/ico.png" alt="Logo image">
           </a>
         </li>
         <li class="nav-link more"><a href="javascript:void(0)">Other Sites</a>
           <ul class="submenu">
-            <li><a href="https://github.com/Matt-Bessette">
+            <li><a href="https://github.com/Matt-Bessette" target="_blank">
           <i class="fa fa-github-square fa-lg"></i> GitHub
         </a></li>
-        <li><a href="https://www.linkedin.com/in/mattbessette94">
+        <li><a href="https://www.linkedin.com/in/mattbessette94" target="_blank">
           <i class="fa fa-linkedin-square fa-lg"></i> LinkedIn
-        </a></li>
-        <li><a href="https://www.facebook.com/matthew.bessette.1">
-          <i class="fa fa-facebook-official fa-lg"></i> Facebook (Private)
         </a></li>
           </ul>
         </li>
-        <li class="nav-link"><a href='https://github.com/Matt-Bessette/portfolio-site'><i class="fa fa-github-square fa-lg"></i> Site Source</a></li>
+        <li class="nav-link"><a href='https://github.com/Matt-Bessette/portfolio-site' target="_blank"><i class="fa fa-github-square fa-lg"></i> Site Source</a></li>
       </ul>
     </nav>
   </div>

diff --git a/build/includes/Modal.php b/build/includes/Modal.php
diff --git a/build/projects.php b/build/projects.php
@@ -42,14 +42,15 @@
 	<head>
 		<meta charset="UTF-8">
 		<title>MBes Projects</title>
+		<link rel="icon" href="/img/ico.png" type="image/png" />
 		<link rel="stylesheet" type="text/css" href="css/normalize.css">
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 		<link rel="stylesheet" type="text/css" href="css/projects.min.css">
 		<script src="//code.jquery.com/jquery-1.12.0.min.js"></script>
 		<script src="projects.js"></script>
 	</head>
 	<body>
-		<?php echo file_get_contents(HEADER); ?>
+		<?php require_once(HEADER); ?>
 
 		<div class='mbes_projects_list'>
 			<div class="cards">
@@ -72,8 +73,6 @@
 			</div>
 		</div>
 
-		<?php echo file_get_contents(MODAL); ?>
-
-		<?php echo file_get_contents(FOOTER); ?>
+		<?php require_once(FOOTER); ?>
 	</body>
 </html>
diff --git a/src/scss/contact/contact.scss b/src/scss/contact/contact.scss
@@ -0,0 +1,9 @@
+@import '../external/bourbon/bourbon';
+@import '../external/base/base';
+@import '../external/neat/neat';
+
+@import '../general/header';
+
+@import '../general/core';
+
+@import '../general/footer';
diff --git a/src/scss/general/_footer.scss b/src/scss/general/_footer.scss
@@ -1,3 +1,28 @@
+
+.wrapper-for-content-outside-of-footer {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin: 0 auto -4em;
+}
+
+html, body {
+ height: 100%;
+}
+
+.wrapper-for-content-outside-of-footer:after {
+  content: "";
+  display: block;
+}
+
+.footer, .wrapper-for-content-outside-of-footer:after {
+  height: 17em;
+
+  @include media($large-screen) {
+    height: 4em;
+  }
+}
+
 .footer {
   $base-spacing: 1.5em !default;
   $action-color: #477DCA !default;

diff --git a/src/scss/general/_header.scss b/src/scss/general/_header.scss
@@ -114,6 +114,10 @@
       outline: none;
       text-decoration: none;
 
+      span.underline {
+        border-bottom: 1px solid grey;
+      }
+
       &:focus,
       &:hover {
         color: $centered-navigation-color-hover;

diff --git a/src/scss/general/_modal.scss b/src/scss/general/_modal.scss
diff --git a/src/scss/index/index.scss b/src/scss/index/index.scss
@@ -8,7 +8,8 @@
 
 div.portfolio {
 
-	height:87%;
+	$min-screen : 500px;
+	$max-screen : $min-screen - 1;
 
 	$margin: 50px;
 
@@ -21,15 +22,29 @@ div.portfolio {
 	div {
 
 		span {
-			@include span-columns(6);
-			@include shift-in-context(1);
-			margin-bottom:$margin;
-			margin-left: 0;
+
+			@include media(max-width $max-screen) {
+				@include row;
+			}
+
+			@include media(min-width $min-screen) {
+				@include span-columns(5);
+				@include shift-in-context(1);
+				margin-bottom:$margin;
+			}
+
 		}
 
 		span:nth-child(2n+1) {
-			@include span-columns(6);
-			margin-bottom:$margin;
+
+			@include media(max-width $max-screen) {
+				@include row;
+			}
+
+			@include media(min-width $min-screen) {
+				@include span-columns(5);
+				margin-bottom:$margin;
+			}
 		}
 	}
 

diff --git a/src/scss/projects/_cards.scss b/src/scss/projects/_cards.scss
@@ -1,4 +1,7 @@
 .cards {
+
+  margin-top:30px;
+
   @include display(flex);
   @include flex-wrap(wrap);
   @include justify-content(space-between);

diff --git a/src/scss/projects/projects.scss b/src/scss/projects/projects.scss
@@ -2,8 +2,6 @@
 @import '../external/base/base';
 @import '../external/neat/neat';
 
-@import '../general/modal';
-
 @import '../general/header';
 
 @import '../general/core';
@@ -14,7 +12,7 @@ div.mbes_projects_list {
 	@include outer-container;
 
 	a {
-		font-size:1.2em;
+		//font-size:1.2em;
 	}
 
 }