Skip to content

Commit

Permalink
Add gitignore and make it ignore the /build folder, updating about pa…
Browse files Browse the repository at this point in the history
…ge, prepping new holding page
  • Loading branch information
carterdea committed Dec 31, 2015
1 parent 8ad4596 commit 39875be
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 52 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Build/
.DS_Store
38 changes: 28 additions & 10 deletions Build/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
if(typeof ws != 'undefined' && ws.readyState == 1){return true;}
ws = new WebSocket('ws://'+(location.host || 'localhost').split(':')[0]+':35353')
ws.onopen = function(){ws.onclose = function(){document.location.reload()}}
window.onbeforeunload = function() { ws = null }
ws.onmessage = function(){
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
link.href = href + (href.indexOf('?')>=0?'&':'?') + 'hammer='+(new Date().valueOf());
}
}
Expand Down Expand Up @@ -47,7 +48,7 @@
<body class="about">
<div class="container">
<header class="cf">
<a href="index.html" class="logo">
<a href="index.html" class="current-parent logo">
Carter De Angelis
<span class="tagline">Product Designer &amp; Digital Producer</span>
</a>
Expand All @@ -66,17 +67,34 @@ <h3>Services</h3>
<div class="thirds">
<i class="strategy"></i>
<h2>Product Strategy</h2>
<p>With real-time access to reporting data, you can connect Stripe with your existing accounting or ERP systems.</p>
<ul>
<li>User research</li>
<li>Strategic planning &amp; Project Management</li>
<li>Competetive analysis</li>
<li>Product features</li>
<li>A/B testing &amp; User testing</li>
<li>Product Roadmap</li>
</ul>
</div><!--.thirds-->
<div class="thirds">
<i class="design"></i>
<h2>Product Design</h2>
<p>Stripe actively works to protect your business from fraudulent charges and monitors suspicious transactions.</p>
<ul>
<li>Mobile-first Design Philosophy</li>
<li>Product Prototyping</li>
<li>User Experience Design</li>
<li>Visual Design</li>
</ul>
</div><!--.thirds-->
<div class="thirds">
<i class="production"></i>
<h2>Digital Production</h2>
<p>Work with international customers right out of the box while still getting paid in your preferred currency.</p>
<ul>
<li>Front-end Development (HTML/CSS/Ember.js)</li>
<li>Back-end Development (Ruby on Rails/Elixir &amp; Phoenix Framework)</li>
<li>Mobile First, Responsive Web Development</li>
<li>Native Mobile Development (iOS)</li>
</ul>
</div><!--.thirds-->
</div><!--.services-->
<p class="pitch">Clients approach us at many different points in the life of a product. As a result, we've built a diverse team of world-class designers, developers, marketers, project managers, and QA pros to ensure that we can meet any challenge.</p>
Expand Down Expand Up @@ -132,7 +150,7 @@ <h2>Contact</h2>
<div class="contact-info">
<ul>
<li>(424) 268-0717</li>
<li>Living in Santa Monica, CA</li>
<li>Santa Monica, CA</li>
<li><a href="skype:carterdea">carterdea on Skype</a></li>
<li><a href="http://twitter.com/carterdea">@carterdea on Twitter</a></li>
</ul>
Expand Down
14 changes: 7 additions & 7 deletions Build/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -347,13 +347,13 @@ h4 {

#simplemodal-overlay {
background-color: #fff;
background: -moz-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.8) 100%);
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, white), color-stop(100%, rgba(255, 255, 255, 0.8)));
background: -webkit-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.8) 100%);
background: -o-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.8) 100%);
background: -ms-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.8) 100%);
background: radial-gradient(ellipse at center, white 0%, rgba(255, 255, 255, 0.8) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ccffffff',GradientType=1 ); }
background: -moz-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.9) 100%);
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, white), color-stop(100%, rgba(255, 255, 255, 0.9)));
background: -webkit-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.9) 100%);
background: -o-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.9) 100%);
background: -ms-radial-gradient(center, ellipse cover, white 0%, rgba(255, 255, 255, 0.9) 100%);
background: radial-gradient(ellipse at center, white 0%, rgba(255, 255, 255, 0.9) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ccffffff',GradientType=1 ); }

#simplemodal-container {
position: absolute !important;
Expand Down
16 changes: 8 additions & 8 deletions Build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
if(typeof ws != 'undefined' && ws.readyState == 1){return true;}
ws = new WebSocket('ws://'+(location.host || 'localhost').split(':')[0]+':35353')
ws.onopen = function(){ws.onclose = function(){document.location.reload()}}
window.onbeforeunload = function() { ws = null }
ws.onmessage = function(){
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
link.href = href + (href.indexOf('?')>=0?'&':'?') + 'hammer='+(new Date().valueOf());
}
}
Expand Down Expand Up @@ -61,11 +62,10 @@
</header>
<section>
<h1>Product Design for startups in Los Angeles.</h1>
<p>Gin Lane is a collective of over two dozen creative technologists. We build compelling experiences with brands that get results.</p>
<p>Carterdea is a design and development studio led by Carter De Angelis. We work with startups and small-ish businesses.</p>
<a href="work/index.html" class="button">See Work</a>
<script>
$(document).ready(function(){

$.backstretch("../assets/img/home-hero.jpg");
});
</script>
Expand All @@ -87,7 +87,7 @@ <h2>Contact</h2>
<div class="contact-info">
<ul>
<li>(424) 268-0717</li>
<li>Living in Santa Monica, CA</li>
<li>Santa Monica, CA</li>
<li><a href="skype:carterdea">carterdea on Skype</a></li>
<li><a href="http://twitter.com/carterdea">@carterdea on Twitter</a></li>
</ul>
Expand Down
57 changes: 49 additions & 8 deletions Build/work/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
if(typeof ws != 'undefined' && ws.readyState == 1){return true;}
ws = new WebSocket('ws://'+(location.host || 'localhost').split(':')[0]+':35353')
ws.onopen = function(){ws.onclose = function(){document.location.reload()}}
window.onbeforeunload = function() { ws = null }
ws.onmessage = function(){
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
link.href = href + (href.indexOf('?')>=0?'&':'?') + 'hammer='+(new Date().valueOf());
}
}
Expand Down Expand Up @@ -53,7 +54,7 @@
</a>
<nav>
<ul>
<li class='current-parent current'><a class='current-parent current' href="index.html">Work</a></li>
<li class='current'><a class='current' href="index.html">Work</a></li>
<li><a href="../about.html">About</a></li>
<li class="contact-button"><a href="#" class="button">Contact</a></li>
</ul>
Expand All @@ -70,6 +71,36 @@ <h2>Spinlister</h2>
</div><!--.text-->
</div><!--.row-->
</a>
<a href="#">
<div class="row cf">
<img src="../assets/img/row-meddevicejobs.png" alt="MedDeviceJobs" />
<div class="text">
<h2>Alexander Yulish</h2>
<p>We build compelling experiences with brands that get results.</p>
<span class="services-rendered">Design, Strategy, Production</span>
</div><!--.text-->
</div><!--.row-->
</a>
<a href="#">
<div class="row cf">
<img src="../assets/img/row-meddevicejobs.png" alt="MedDeviceJobs" />
<div class="text">
<h2>Stussy</h2>
<p>We build compelling experiences with brands that get results.</p>
<span class="services-rendered">Design, Strategy, Production</span>
</div><!--.text-->
</div><!--.row-->
</a>
<a href="#">
<div class="row cf">
<img src="../assets/img/row-meddevicejobs.png" alt="MedDeviceJobs" />
<div class="text">
<h2>GrubMarket</h2>
<p>We build compelling experiences with brands that get results.</p>
<span class="services-rendered">Design, Strategy, Production</span>
</div><!--.text-->
</div><!--.row-->
</a>
<a href="#">
<div class="row cf">
<img src="../assets/img/row-meddevicejobs.png" alt="MedDeviceJobs" />
Expand All @@ -85,12 +116,22 @@ <h2>MedDeviceJobs</h2>
<!--<img src="#" />-->
<img src='http://placehold.it/100x100' width='100' height='100' alt='Placeholder Image' />
<div class="text">
<h2>Content Blvd</h2>
<h2>AdoptTogether</h2>
<p>We build compelling experiences with brands that get results.</p>
<span class="services-rendered">Design, Strategy, Production</span>
</div><!--.text-->
</div><!--.row-->
</a>
<a href="#">
<div class="row cf">
<!--<img src="#" />-->
<img src='http://placehold.it/100x100' width='100' height='100' alt='Placeholder Image' />
<div class="text">
<h2>Happ</h2>
<p>We build compelling experiences with brands that get results.</p>
<span class="services-rendered">Design, Strategy, Production</span>
</div><!--.text-->
</div><!--.row-->
<a href="#">
<div class="row cf">
<!--<img src="#" />-->
Expand Down Expand Up @@ -121,7 +162,7 @@ <h2>Contact</h2>
<div class="contact-info">
<ul>
<li>(424) 268-0717</li>
<li>Living in Santa Monica, CA</li>
<li>Santa Monica, CA</li>
<li><a href="skype:carterdea">carterdea on Skype</a></li>
<li><a href="http://twitter.com/carterdea">@carterdea on Twitter</a></li>
</ul>
Expand Down
13 changes: 7 additions & 6 deletions Build/work/spinlister.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
if(typeof ws != 'undefined' && ws.readyState == 1){return true;}
ws = new WebSocket('ws://'+(location.host || 'localhost').split(':')[0]+':35353')
ws.onopen = function(){ws.onclose = function(){document.location.reload()}}
window.onbeforeunload = function() { ws = null }
ws.onmessage = function(){
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
var links = document.getElementsByTagName('link');
for (var i = 0; i < links.length;i++) {
var link = links[i];
if (link.rel === 'stylesheet' && !link.href.match(/typekit/)) {
href = link.href.replace(/((&|\?)hammer=)[^&]+/,'');
link.href = href + (href.indexOf('?')>=0?'&':'?') + 'hammer='+(new Date().valueOf());
}
}
Expand Down Expand Up @@ -85,7 +86,7 @@ <h2>Contact</h2>
<div class="contact-info">
<ul>
<li>(424) 268-0717</li>
<li>Living in Santa Monica, CA</li>
<li>Santa Monica, CA</li>
<li><a href="skype:carterdea">carterdea on Skype</a></li>
<li><a href="http://twitter.com/carterdea">@carterdea on Twitter</a></li>
</ul>
Expand Down
23 changes: 20 additions & 3 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,34 @@ <h3>Services</h3>
<div class="thirds">
<i class="strategy"></i>
<h2>Product Strategy</h2>
<p>With real-time access to reporting data, you can connect Stripe with your existing accounting or ERP systems.</p>
<ul>
<li>User research</li>
<li>Strategic planning &amp; Project Management</li>
<li>Competetive analysis</li>
<li>Product features</li>
<li>A/B testing &amp; User testing</li>
<li>Product Roadmap</li>
</ul>
</div><!--.thirds-->
<div class="thirds">
<i class="design"></i>
<h2>Product Design</h2>
<p>Stripe actively works to protect your business from fraudulent charges and monitors suspicious transactions.</p>
<ul>
<li>Mobile-first Design Philosophy</li>
<li>Product Prototyping</li>
<li>User Experience Design</li>
<li>Visual Design</li>
</ul>
</div><!--.thirds-->
<div class="thirds">
<i class="production"></i>
<h2>Digital Production</h2>
<p>Work with international customers right out of the box while still getting paid in your preferred currency.</p>
<ul>
<li>Front-end Development (HTML/CSS/Ember.js)</li>
<li>Back-end Development (Ruby on Rails/Elixir &amp; Phoenix Framework)</li>
<li>Mobile First, Responsive Web Development</li>
<li>Native Mobile Development (iOS)</li>
</ul>
</div><!--.thirds-->
</div><!--.services-->
<p class="pitch">Clients approach us at many different points in the life of a product. As a result, we've built a diverse team of world-class designers, developers, marketers, project managers, and QA pros to ensure that we can meet any challenge.</p>
Expand Down
12 changes: 6 additions & 6 deletions assets/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,12 @@ h4 {

#simplemodal-overlay {
background-color:#fff;
background: -moz-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%, rgba(255,255,255,0.8) 100%);
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,0.8)));
background: -webkit-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0.8) 100%);
background: -o-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0.8) 100%);
background: -ms-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0.8) 100%);
background: radial-gradient(ellipse at center, rgba(255,255,255,1) 0%,rgba(255,255,255,0.8) 100%);
background: -moz-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%, rgba(255,255,255,0.9) 100%);
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,0.9)));
background: -webkit-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0.9) 100%);
background: -o-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0.9) 100%);
background: -ms-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0.9) 100%);
background: radial-gradient(ellipse at center, rgba(255,255,255,1) 0%,rgba(255,255,255,0.9) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ccffffff',GradientType=1 );
}

Expand Down
2 changes: 1 addition & 1 deletion includes/_contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h2>Contact</h2>
<div class="contact-info">
<ul>
<li>(424) 268-0717</li>
<li>Living in Santa Monica, CA</li>
<li>Santa Monica, CA</li>
<li><a href="skype:carterdea">carterdea on Skype</a></li>
<li><a href="http://twitter.com/carterdea">@carterdea on Twitter</a></li>
</ul>
Expand Down
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
<!-- $body-class home -->
<!-- @include _header -->
<h1>Product Design for startups in Los Angeles.</h1>
<p>Gin Lane is a collective of over two dozen creative technologists. We build compelling experiences with brands that get results.</p>
<p>Carterdea is a design and development studio led by Carter De Angelis. We work with startups and small-ish businesses.</p>
<a href="<!-- @path work -->" class="button">See Work</a>
<script>
$(document).ready(function(){

$.backstretch("../assets/img/home-hero.jpg");
});
</script>
Expand Down
Loading

0 comments on commit 39875be

Please sign in to comment.