Skip to content

Commit

Permalink
updates ive been meaning to send
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Cardneau authored and Ryan Cardneau committed Mar 18, 2016
1 parent 9cb9083 commit 8cf7b5b
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 14 deletions.
Binary file modified .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion app/includes/container-start.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<main class="l-grid">
<section class="l-m-col-6 l-d-col-6" id="content">
<h1 class="visuallyhidden">Ryan Williamson-Cardneau</h1>
<h3 class="visuallyhidden">Ryan Williamson-Cardneau</h3>
<h2 class="l-text-right c-tagline">&#8249; UX Designer / Information Architect / Front-End Developer &#8250;</h2>
<div id="body-copy" class="">
2 changes: 1 addition & 1 deletion app/includes/nav.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<nav id="main-nav" class="open">
<nav id="main-nav" class="">
<ul id="site-nav">
<li id="menu-toggle"><button>Menu <i class="fa fa-arrow-circle-o-left"></i></button></li>
<li id="home"><a href="/" title="to the homepage and beyond!">Home <i class="fa fa-home"></i></a></li>
Expand Down
16 changes: 12 additions & 4 deletions app/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,16 @@ function fade(el, fadeType) {
event.preventDefault(el);
console.log('flyout toggle trigger');
if (el.classList) {
el.classList.toggle('open');
el.classList.toggle('closed');
if(el.classList.length > 0) {
el.classList.toggle('open');
el.classList.toggle('closed');
} else {
if(el.classList.contains('open')) {
el.classList.toggle('open', 'closed');
} else {
el.classList.toggle('closed');
}
}
} else {
var classes = el.className.split(' ');
var existingIndex = classes.indexOf('open');
Expand Down Expand Up @@ -162,13 +170,13 @@ var fn = function() {
};//End of ready function

///Wait for document to be ready
function ready(fn) {
function ready(fa) {
'use strict';
if (document.readyState !== 'loading'){
console.log('document no ready');
fn();
} else {
document.addEventListener('DOMContentLoaded', fn);
document.addEventListener('DOMContentLoaded', fa);
console.log('yep still working');
}
}
Expand Down
18 changes: 13 additions & 5 deletions app/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ button {
}

a, button {
border-bottom: 1px solid $white;
border-bottom: 1px solid currentColor;
color: $white;
display: block;
outline: none;
Expand All @@ -394,7 +394,7 @@ button {

i {
float: right;
font-size: 1.875rem;
font-size: 1.775em;
text-align: right;
margin-top: -.2em;
}
Expand All @@ -414,7 +414,7 @@ button {
font-family: $tenso;
font-size: 1em;
font-weight: 700;
padding-right: .4em;
padding-right: .6em;
text-align: left;
width: 100%;

Expand Down Expand Up @@ -471,7 +471,7 @@ button {

.logo {
position: absolute;
bottom: 0px;
bottom: 1px;
width: 100%;
padding: 0 1em;

Expand Down Expand Up @@ -537,7 +537,7 @@ footer#footer {
}
}
///////////////////////////////Media Queries
@media screen and (min-width: 1280px) {
@media screen and (min-width: 1281px) {
body {
font-size: 1.2vw;
max-width: 1280px;
Expand All @@ -558,4 +558,12 @@ footer#footer {
body {
font-size: 5vw;
}
#main-nav, #main-nav.closed {
left: -230px;
font-size: 0.8rem;

~ main {
margin-left: 70px;
}
}
}
16 changes: 15 additions & 1 deletion app/work.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,24 @@
include 'includes/container-start.php';
}
?>
<h3>Some projects I've worked on</h3>
<h1>Some projects I've worked on</h1>
<p>content to come....</p>
<p>For the time being please download this <a href="/assets/short-port.pdf" target="_blank" title="ryan williamson-cardneaus short portfolio">resume &amp; short portfolio</a> illustrating my process on a recently launched project.</p>
<p>I also continue to work with the wonderful people over at <a href="http://brandingentourage.com" target="_blank" title="my night job with Branding Entourage">Branding Entourage</a></p>
<h3>Here are some companies I've worked with:</h3>
<ul>
<li>Recycle Ann Arbor</li>
<li>IHA</li>
<li>OSRAM Semi Opto Conductors</li>
<li>Delphi</li>
<li>IQ2 Debates (NPR Affiliate)</li>
<li>Millicare</li>
<li>Goldfish Swim School</li>
<li>Ferris State University</li>
<li>University of Michigan</li>
<li>Waterloo Trails</li>
<li>DTE</li>
</ul>
<?php
if($fetchCall != 'true') {
include 'includes/container-end.php';
Expand Down
4 changes: 2 additions & 2 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ gulp.task('clean', del.bind(null, ['.tmp', 'dist']));
gulp.task('serve', ['lint', 'styles', 'scripts', 'fonts'], () => {
connect.server({
port: 8000,
bin: 'C:/MAMP/bin/php/php5.4.40/php',
ini: 'C:/MAMP/bin/php/php5.4.40/php.ini-development',
bin: '/Applications/MAMP/bin/php/php5.4.42/bin/php',
ini: '/Applications/MAMP/bin/php/php5.4.42/conf/php.ini',
base: 'app',
open: false
});
Expand Down

0 comments on commit 8cf7b5b

Please sign in to comment.