Skip to content

Commit

Permalink
init commit fpr facelift
Browse files Browse the repository at this point in the history
  • Loading branch information
jleajones committed Feb 13, 2017
1 parent b61e505 commit 1e4d9e2
Show file tree
Hide file tree
Showing 97 changed files with 905 additions and 406 deletions.
627 changes: 299 additions & 328 deletions .idea/workspace.xml

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ module.exports = function (grunt) {
vendor: {
files: {
'assets/vendor/scripts.min.js': ['assets/vendor/js/jquery.min.js',
'assets/vendor/js/jquery.animatecss.min.js']
'assets/vendor/js/jquery.animatecss.min.js',
'assets/vendor/js/EasePack.min.js',
'assets/vendor/js/TweenLite.min.js']
}
},
scripts: {
files: {
'assets/js/scripts.min.js': ['assets/js/form.js',
'assets/js/tracker.js', 'assets/js/page.js']
'assets/js/scripts.min.js': ['assets/js/alert.js', 'assets/js/form.js',
'assets/js/tracker.js', 'assets/js/audioPlayer.js', 'assets/js/page.js']
}
}
},
Expand All @@ -54,7 +56,7 @@ module.exports = function (grunt) {
bowerJS: {
expand: true,
cwd: 'bower_components/',
src: ['**/**.min.js', '!**/src/**'],
src: ['**/**.min.js', '!**/jquery/src/**'],
flatten: true,
dest: 'assets/vendor/js'
},
Expand Down
2 changes: 0 additions & 2 deletions _beats/the-introduction.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@
image: the_introduction.png
date: 2017-01-31 11:18:58
---

<iframe width="100%" height="650" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/playlists/296459174&amp;auto_play=false&amp;hide_related=false&amp;show_comments=true&amp;show_user=true&amp;show_reposts=false&amp;visual=true"></iframe>
7 changes: 7 additions & 0 deletions _includes/aside.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="widget">
<div style="width:300px; height:600px; border:solid 1px #ccc;"></div>
</div>

<div class="widget">
<div style="width:300px; height:250px; border:solid 1px #ccc;"></div>
</div>
3 changes: 3 additions & 0 deletions _includes/beatHeader.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<header>
<h1>{{ include.title }}</h1>
</header>
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<head>
<link href='http://fonts.googleapis.com/css?family=Roboto+Slab:700,400|Roboto:500,300,700' rel='stylesheet' type='text/css'> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">

<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
Expand Down
4 changes: 2 additions & 2 deletions _includes/postHeader.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="post-header">
<header>
{% if include.category %}
<span><a href="/category/{{ include.category }}" class="{{ include.category }}">{{ include.category }}</a></span>
{% endif %}
Expand All @@ -13,4 +13,4 @@ <h1>{{ include.title }}</h1>
{{ include.meta }}
{% endif %}
</p>
</div>
</header>
3 changes: 2 additions & 1 deletion _includes/projectExcerpt.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<h2>
<a href="{{ include.project.url }}">{{ include.project.title }}</a>
</h2>
<em class="tcd">{{ include.project.tech }}</em>
<em class="tcd">
<i class="fa fa-laptop"></i> {{ include.project.tech }}</em>
<!-- <p>{{ project.description | truncate: 65 }}</p>-->
</figcaption>
</figure>
6 changes: 6 additions & 0 deletions _includes/projectHeader.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<header>
<h1>{{ include.title }}</h1>
<em class="tcd">
<i class="fa fa-laptop"></i> {{ include.tech }}
</em>
</header>
20 changes: 12 additions & 8 deletions _layouts/beat.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,24 @@
---
<div class="layout">
<a href="/beats">&laquo; Back to beats</a>
<!--{% if page.image %}-->
<!--<div class="post-header-img">-->
<!--<img src="/assets/images/{{page.image}}" />-->
<!--</div>-->
<!--{% endif %}-->
{% if page.image %}
<header>
<div class="container">
<img src="/assets/images/{{page.image}}" />
</div>
</header>
{% endif %}

<div class="container">
<section class="row">
<article class="eight offset-by-two columns">
<!--{% include postHeader.html title=page.title meta=page.tech %}-->
<article class="eight columns">
{% include beatHeader.html title=page.title %}

<h1>{{ page.title }}</h1>
{{ content }}
</article>
<aside class="four columns">
{% include aside.html %}
</aside>
</section>
</div>
</div>
18 changes: 8 additions & 10 deletions _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ <h5>{{ page.subheading}}</h5>
</header>

<div class="container">
<div class="widget">
<section class="row">
<article class="eight columns">
{{ content }}
</article>
<aside class="four columns">

</aside>
</section>
</div>
<section class="row">
<article class="eight columns">
{{ content }}
</article>
<aside class="four columns">
{% include aside.html %}
</aside>
</section>
</div>
</div>
10 changes: 6 additions & 4 deletions _layouts/project.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
---
<div class="layout project">
<div class="layout">
<a href="/projects">&laquo; Back to projects</a>
{% if page.image %}
<header>
Expand All @@ -14,12 +14,14 @@
<div class="container">
<section class="row">
<article class="eight columns">
{% include postHeader.html title=page.title meta=page.tech %}
<div class="widget">
{% include projectHeader.html title=page.title tech=page.tech %}

{{ content }}
{{ content }}
</div>
</article>
<aside class="four columns">

{% include aside.html %}
</aside>
</section>
</div>
Expand Down
10 changes: 7 additions & 3 deletions _projects/267pacific.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
---
layout: project
title: "267 Pacific"
created: 3
created: 2
permalink: /projects/267-pacific/
description: "267 Pacific is a high rise rental buidling in Borhem Hill Brooklyn, NY. The building is modern and full of luxury finishes and the website reflects that. The web application was built with Node, Yo, Bower, Grunt, Angular-Generator, AngularJS, SASS, Karma, Jasmine, Amazon DynamoDB, Amazon EC2, Amazon Cloudfront, Amazon Route 53"
image: 267_pacific.png
tech: Javascript, AWS SDK, AngularJS, SASS, Jasmine, Karma, Grunt, Bower, Yo, NPM, Git
tech: PHP, HTML5, Sass, Javascript, Jasmine, Karma, Gulp, Git
---
This is 267 Pacific
Responsive website with robust back-end for inventory management and sophisticated notification system for lead generation.
Built with PHP, HTML5, AngularJS, Twitter Bootstrap, Modernizr, and Mocha. Git was used for version control and Grunt was
used for automating tasks such as minification, running tests, and deploying to different environments.
<br><br>
Third party integrations with Google AdWords, Google Analytics, Twillo, and Amazon Web Services.
4 changes: 2 additions & 2 deletions _projects/about.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
layout: project
title: "About.com"
created: 4
created: 3
permalink: /projects/about-dot-com/
description: "About.com is a premium content provider focused on helping users find answers to their questions from experts in a related field. This web application was built with Java, FreeMarker, SASS, and Javascript and uses server side responsive design."
image: about.png
tech: Java, FreeMarker, Sass, Javascript, XML, Maven, Grunt, Jenkins, Git, MongoDB, Node, Bash
tech: Java, FreeMarker, Sass, Javascript, XML, Grunt, Jenkins, Git, MongoDB
---
this is About.com
4 changes: 2 additions & 2 deletions _projects/american-express.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
layout: project
title: "American Express Corporate"
created: 6
created: 5
permalink: /projects/american-express/
description: "American Express is a global services company that provides customers with access to products, insights and experiences that enrich lives and build business success. This project is in support of there Global Corporate Payments site."
image: american-express.png
tech: .NET, Sass, Razor, Javascript, Node, NPM, Git, Ruby
tech: Sitecore, Razor, Sass, Javascript, XML, Git
---
This is American Express Global Corporate Payments.
4 changes: 2 additions & 2 deletions _projects/consumersearch.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
layout: project
title: "ConsumerSearch"
created: 2
created: 1
permalink: /projects/consumer-search/
description: "ConsumerSearch is an aggregate review site to help users make the most informed decision when making a large purchase. Built with Drupal, CSS, and jQuery."
image: consumer_search.png
tech: Drupal, PHP, MySQL, SASS, Javascript, Git
tech: Drupal, Sass, Javascript, Grunt, Git
---
This is ConsumerSearch.
10 changes: 10 additions & 0 deletions _projects/longloveleajones.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
layout: project
title: "Long Love Lea-Jones"
created: 4
permalink: /projects/long-love-leajones/
description: "Long Love Lea-Jones is a wedding website I created for our wedding."
image: longloveleajones.png
tech: HTML5, Sass, Javascript, Grunt, Git
---
This is LongLoveLeaJones, a wedding website.
2 changes: 1 addition & 1 deletion _sass/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
background: linear-gradient($background-color, $white);
.layout {
> a {
position: relative;
position: absolute;
z-index: 1;
}

Expand Down
2 changes: 1 addition & 1 deletion _sass/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ body > header {



@include media-query($on-palm-lg) {
@include media-query($on-tablet) {
position: absolute;
top: 16px;
right: 30px;
Expand Down
12 changes: 10 additions & 2 deletions _sass/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

.layout {
> header {
padding-top: 10px;
padding-bottom: $spacing-unit;
color: $white;
text-shadow: 2px 2px 5px rgba(0, 0, 0, 0.75);
@include border(solid 10px $divider-color, bottom);
Expand All @@ -25,4 +23,14 @@
background-image: url(/assets/images/css/beats_bg.png);
background-repeat: no-repeat;
}

&.photos > header {
background-image: url(/assets/images/css/photography_bg.png);
background-repeat: no-repeat;
}

&.projects > header {
background-image: url(/assets/images/css/code_bg.png);
background-repeat: no-repeat;
}
}
11 changes: 10 additions & 1 deletion _sass/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
}
}


@mixin font-size($font-size, $line-height: auto, $base-font-size: $base-font-size) {
@include font-size-only($font-size, $base-font-size);

Expand All @@ -28,6 +27,16 @@
line-height: ceil(percentage($line-height / $font-size));
}

@mixin radial-gradient($from, $to) {
background: -moz-radial-gradient(center, circle cover, $from 0%, $to 100%);
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, $from), color-stop(100%, $to));
background: -webkit-radial-gradient(center, circle cover, $from 0%, $to 100%);
background: -o-radial-gradient(center, circle cover, $from 0%, $to 100%);
background: -ms-radial-gradient(center, circle cover, $from 0%, $to 100%);
background: radial-gradient(center, circle cover, $from 0%, $to 100%);
background-color: $from;
}


@mixin border($style, $sides...){
@if ($style) {
Expand Down
29 changes: 24 additions & 5 deletions _sass/_spotlight.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,36 @@
.spotlight {
padding-top: 10px;
padding-bottom: $spacing-unit;
background: url(/assets/images/css/jumbotron_bg.png) no-repeat;
background-size: cover;
background-position: center center;
position: relative;
//background: url(/assets/images/css/jumbotron_bg.png) no-repeat;
//background-size: cover;
//background-position: center center;
background: $primary-color-dark;
color: $white;
text-shadow: 2px 2px 5px rgba(0, 0, 0, 0.75);
@include radial-gradient($primary-color-dark, darken($primary-color-dark, 15%));
@include border(solid 10px $divider-color, bottom);

.spotlight-container {
position: absolute;
top: 0;
left: 0;
padding-top: 10px;
padding-bottom: $spacing-unit;
height: 100%;
width: 100%;
}
h1 {
padding: 130px 0;
-webkit-animation-duration: 1.5s;
animation-duration: 1.5s;

@include font-size(38px);

@include media-query($on-tablet) {
@include font-size(30px);
}

@include media-query($on-palm) {
@include font-size(24px);
}
}
}
4 changes: 2 additions & 2 deletions _sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ $categories: coding $coding-color, general $general-color, photography $photogra
$content-width: 1000px;

// Breakpoints
$on-palm: 320px;
$on-palm-lg: 768px;
$on-palm: 420px;
$on-tablet: 768px;
$on-laptop: 1024px;
1 change: 1 addition & 0 deletions about/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
icon: user
subheading: Web Developer, music producer, and novice photographer.
---
<div class="widget"></div>
<p class="no-top-margin">Yo! I'm Jason, a front-end developer who loves building cool things! I enjoy building small reusuable components and modules to create larger complex mobile and web applications. I hate repeating myself, in code and conversation.<p>

<p>I live in the greatest city in the world with my beautiful fianc&eacute;, Danielle. I currently work for About.com, using technologies like Java, Freemarker, Javascript, MongoDB, Solr, XML, and SASS. I also have exprience with PHP, JSP, Perl, Python, Ruby, CSS (obviously), and C++. In my spare time I work on side projects for clients in addition to creating and contributing to multiple open source projects.</p>
Expand Down
Binary file removed assets/images/adidas_yeezy.png
Binary file not shown.
Binary file removed assets/images/audi_q5.png
Binary file not shown.
Binary file removed assets/images/aurelia.png
Binary file not shown.
Binary file removed assets/images/banned_1s.png
Binary file not shown.
Binary file removed assets/images/boys_trip_cancun.png
Binary file not shown.
Binary file added assets/images/css/code_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/css/photography_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/dev_setup.png
Binary file not shown.
Binary file removed assets/images/dotfiles.png
Binary file not shown.
Binary file removed assets/images/etihad.png
Binary file not shown.
Binary file removed assets/images/fall_fashion_essentials_2015.png
Binary file not shown.
Binary file removed assets/images/fantasy_football_begins.png
Binary file not shown.
Binary file removed assets/images/fathersday.png
Binary file not shown.
Binary file removed assets/images/ff_draft_recap_2015.png
Binary file not shown.
Binary file removed assets/images/getfit_dietrying.png
Binary file not shown.
Binary file removed assets/images/halloween_2015.png
Binary file not shown.
Binary file removed assets/images/happy_thanksgiving.png
Binary file not shown.
Binary file removed assets/images/hello_world.png
Binary file not shown.
Binary file removed assets/images/home_sweet_home.png
Binary file not shown.
Binary file removed assets/images/html_emails.png
Binary file not shown.
Binary file removed assets/images/iwatches.png
Binary file not shown.
Binary file removed assets/images/jlj3dot0.png
Binary file not shown.
Binary file removed assets/images/js_logo.png
Binary file not shown.
Binary file removed assets/images/learning_swift.png
Binary file not shown.
Binary file removed assets/images/lions_tigers_bears.png
Binary file not shown.
Binary file removed assets/images/love-sac.png
Diff not rendered.
Binary file removed assets/images/mean.png
Diff not rendered.
Binary file removed assets/images/new-year-new-me.png
Diff not rendered.
Binary file removed assets/images/nfl_recap.png
Diff not rendered.
Binary file removed assets/images/nfl_week_1_2015.png
Diff not rendered.
Binary file removed assets/images/olympic_5s.png
Diff not rendered.
Binary file removed assets/images/photo_dump.png
Diff not rendered.
Binary file removed assets/images/poker.png
Diff not rendered.
Binary file removed assets/images/ps4_review.png
Diff not rendered.
Binary file removed assets/images/san_fran.png
Diff not rendered.
Binary file removed assets/images/sneaker_cleaner.png
Diff not rendered.
Binary file removed assets/images/south_africa.png
Diff not rendered.
Binary file removed assets/images/south_africa_2.png
Diff not rendered.
Binary file removed assets/images/studio.png
Diff not rendered.
Binary file removed assets/images/uae_photos.png
Diff not rendered.
Binary file removed assets/images/vegas_again.png
Diff not rendered.
Binary file removed assets/images/web_content_accessibility.png
Diff not rendered.
Binary file removed assets/images/wedding_shit.png
Diff not rendered.
3 changes: 3 additions & 0 deletions assets/js/alert.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/**
* Created by jleajones on 2/8/17.
*/
3 changes: 3 additions & 0 deletions assets/js/audioPlayer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/**
* Created by jleajones on 2/8/17.
*/
Loading

0 comments on commit 1e4d9e2

Please sign in to comment.