Skip to content

Commit

Permalink
Revert "Cart setup" (#4)
Browse files Browse the repository at this point in the history
accidentally pushed to personal account instead of org
  • Loading branch information
tmray authored Sep 14, 2016
1 parent 781501c commit 8dca12e
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
_site
.sass-cache
.jekyll-metadata
s3_website.yml
CNAME

# Files
public/albums
Expand Down
7 changes: 0 additions & 7 deletions 404.html

This file was deleted.

4 changes: 2 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="footer-links">
<ul>
<li>
<img src="{{ site.baseurl }}/public/images/keynote-speaker2011.jpg" alt="" />
<img src="{{site.baseurl}}/public/images/keynote-speaker2011.jpg" alt="" />
</li>
<li><h3>Contact Info</h3></li>
<li>Peter Leidy<br/>
Expand All @@ -16,7 +16,7 @@
<li><h3>WHERE’S PETE?</h3></li>
<li>
<a title="Link to Calendar" href="http://peterleidy.com/direct-support-professionals/speaking-and-workshop-schedule/">
<img class=" alignleft" src="{{ site.baseurl }}/public/images/calendar.png" alt="calendar icon">
<img class=" alignleft" src="http://peterleidy.com/images/calendar.png" alt="calendar icon">
</a>
</li>
<li><a href="http://peterleidy.com/direct-support-professionals/speaking-and-workshop-schedule/">Check the: Schedule Page!</a></li>
Expand Down
7 changes: 6 additions & 1 deletion _sass/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
background-color: $card-background;
border-radius: $base-border-radius;
border: $card-border;
// box-shadow: 0 2px 4px darken($base-background-color, 10%);
// cursor: pointer;
margin: 0 $card-margin $base-spacing $card-margin;
position: relative;

Expand Down Expand Up @@ -78,7 +80,7 @@
background-color: $card-background;
}
}

// bundle arrow
.desktop-arrow {
height: 55px;
Expand All @@ -94,3 +96,6 @@ a .side-image {
text-decoration: none !important;
color: #333;
}

// hide card
// .card.none {display: none;}
5 changes: 5 additions & 0 deletions _sass/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
$gradient-angle: 10deg;
$hero-image: '../public/images/peter-leidy-speaker.png';

// @include background(linear-gradient($gradient-angle, $hero-background-bottom, $hero-background-top), no-repeat $hero-background-top scroll);
// background-color: #324766;
// background-position: bottom;
// background-repeat: no-repeat;

.hero-logo img {
float: left;
display: inline-block;
Expand Down
6 changes: 6 additions & 0 deletions _sass/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@ header.navigation {
margin-right: $navigation-submenu-padding;
}

// &:after {
// content: '›';
// font-size: 1.2em;
// position: absolute;
// right: $navigation-submenu-padding / 2;
// }
}

&:focus > .submenu,
Expand Down
22 changes: 21 additions & 1 deletion _sass/grid-items.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
$grid-item-columns: 6;
$grid-item-big-columns: 8;
$grid-item-color: white;
$grid-item-height: 93em;
$grid-item-height: 90em;

@include clearfix;

Expand All @@ -31,6 +31,7 @@
border-left: ($grid-item-border-size / 2) solid $grid-items-background;
border-right: ($grid-item-border-size / 2) solid $grid-items-background;
border-top: 0;
// cursor: pointer;
float: left;
height: $grid-item-height;
outline: none;
Expand Down Expand Up @@ -88,6 +89,9 @@
line-height: 1.5em;
margin: auto;

// @include media($medium-screen) {
// max-width: 70%;
// }
}

.grid-item li {
Expand All @@ -111,6 +115,22 @@
}
}

// .grid-item-image {
// //background: url("https://raw.githubusercontent.com/thoughtbot/refills/master/source/images/mountains.png");
// background-color: $grid-item-background;
// &.seven-ways {
// background: lightseagreen;
// background-position: top;
// background-repeat: no-repeat;
// background-size: cover;
// }
// &.best-work {
// background: lightslategray;
// background-position: top;
// background-repeat: no-repeat;
// background-size: cover;
// }
// }
}
.grid-items .grid-item.dvd-box {
height: 55em;
Expand Down
49 changes: 49 additions & 0 deletions css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,46 @@
---
@charset "utf-8";

// // Our variables
// $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
// $base-font-size: 16px;
// $base-font-weight: 400;
// $small-font-size: $base-font-size * 0.875;
// $base-line-height: 1.5;
//
// $spacing-unit: 30px;
//
// $text-color: #111;
// $background-color: #fdfdfd;
// $brand-color: #2a7ae2;
//
// $grey-color: #828282;
// $grey-color-light: lighten($grey-color, 40%);
// $grey-color-dark: darken($grey-color, 25%);
//
// // Width of the content area
// $content-width: 100%;
//
// $on-palm: 600px;
// $on-laptop: 800px;



// Use media queries like this:
// @include media-query($on-palm) {
// .wrapper {
// padding-right: $spacing-unit / 2;
// padding-left: $spacing-unit / 2;
// }
// }
// @mixin media-query($device) {
// @media screen and (max-width: $device) {
// @content;
// }
// }



// Import partials from `sass_dir` (defaults to `_sass`)
@import
"../bower_components/bourbon/app/assets/stylesheets/bourbon",
Expand Down Expand Up @@ -37,11 +77,14 @@ $base-spacing: 10px;
color: #fff;
cursor: pointer;
display: inline-block;
// font-family: $base-font-family;
// font-size: $base-font-size;
-webkit-font-smoothing: antialiased;
font-weight: 600;
line-height: 1;
padding: $base-spacing;
text-decoration: none;
// transition: background-color $base-duration $base-timing;
user-select: none;
vertical-align: middle;
white-space: nowrap;
Expand All @@ -65,3 +108,9 @@ button a {
color: #fff;
text-decoration: none;
}
// dev font
// p,
// .footer-links li {
// font-family: "Redacted";
// color: #444;
// }
Binary file modified index.html
Binary file not shown.
Binary file removed public/images/calendar.png
Binary file not shown.

0 comments on commit 8dca12e

Please sign in to comment.