Skip to content
This repository has been archived by the owner on Aug 30, 2018. It is now read-only.

v1.3.0 #80

Merged
merged 62 commits into from
Jun 3, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
14bc64a
Minor helpers and removal of defined anchor styles
cshold May 22, 2014
7d91a20
Needs the defaults in the preset or they break
cshold May 22, 2014
018558f
main content and breadcrumb margins
cshold May 22, 2014
dfaba42
Cleaner mobile styles
cshold May 22, 2014
95089b6
IE10 header table layout fix
cshold May 22, 2014
f63eef7
Moved button css under links and button header
cshold May 23, 2014
b2cba6a
Consolidated .rte styles
cshold May 23, 2014
776ece1
Swap the product photo with the thumbnails
cshold May 23, 2014
e4168aa
Product page photo sizes
cshold May 23, 2014
e975b4b
Updated footer styles
cshold May 23, 2014
0c41e2f
Cleaned up product page price markup
cshold May 23, 2014
9c56c35
Found a rogue space
cshold May 23, 2014
b76d180
restructured new JS file
cshold May 23, 2014
25eaf9e
Focus styles on buttons. Specific button class helpers
cshold May 23, 2014
bf7944e
Updated into to theme settings text
cshold May 26, 2014
bdf0763
Restructured theme settings
cshold May 26, 2014
346b2fe
Updated theme colors
cshold May 26, 2014
0b8ec8d
Minor settings updates
cshold May 26, 2014
55b851e
Collection sorting and views. Ajax cart border update
cshold May 26, 2014
249e834
Hide list/grid view links in oldIE
cshold May 26, 2014
dbf846d
Empty product page text
cshold May 26, 2014
446ebee
Globalized JS variables
cshold May 26, 2014
eaad033
Updated JS variables
cshold May 26, 2014
2b5067a
Removed push/pull from small breakpoint
cshold May 26, 2014
17fe5c2
More specific modal overlay selector
cshold May 26, 2014
83a3409
Cleaner sorting styles
cshold May 26, 2014
492a463
Updated cart page layout a little
cshold May 26, 2014
47f3cce
Added type=search to styles
cshold May 27, 2014
9619eff
Changed search bar to type=search
cshold May 27, 2014
1763465
Minor cart style updates. Renamed class in product-list-item
cshold May 27, 2014
2e068be
Multi-screen-size modal sizing
cshold May 27, 2014
9f41e8b
More social theme settings
cshold May 28, 2014
9270fd5
Moved search-bar styles into header section
cshold May 28, 2014
2ab9097
Added minimal icon set for social/payments
cshold May 28, 2014
ba00104
Removed old payment icon css
cshold May 28, 2014
5562ce9
New americna express and mastercard logos
cshold May 28, 2014
ff976a3
Fixed goolge credit card icon
cshold May 28, 2014
c44238c
CSS at-query formating
cshold May 29, 2014
0241ab8
Cleaned product price code
cshold May 29, 2014
725370b
Minor header style update
cshold May 29, 2014
0fa0adb
Bolded theme setting headers
cshold May 29, 2014
15b2270
Removed question marks from settings
cshold May 29, 2014
01f1475
Added related product snippet. Cleaned settings markup
cshold May 29, 2014
71a3f4e
More specific JS selectors
cshold May 29, 2014
04ee025
Added Fancy social setting. Updated icon set
cshold Jun 2, 2014
1097df7
Longer delay for modal close button position
cshold Jun 2, 2014
3acd390
Cleaned up cart template and styles
cshold Jun 2, 2014
43f7580
Less specific selectors on buttons
cshold Jun 2, 2014
c1f9bf7
Basic color settings added
cshold Jun 2, 2014
0f06d17
Footer colors
cshold Jun 2, 2014
204cb4a
Social/payment icon colors
cshold Jun 2, 2014
82bc344
Cleaned social icons styles
cshold Jun 2, 2014
9936572
Keep logo floated
cshold Jun 2, 2014
17879fd
Consistent tab spaces. Escape twitter/fb meta tags
cshold Jun 3, 2014
4a88388
More indent fixes
cshold Jun 3, 2014
42e9d8b
Remember form fields on contact page if there is an error
cshold Jun 3, 2014
9850400
Hidden (accessible) labels
cshold Jun 3, 2014
73fb485
Organized address form. More hidden labels
cshold Jun 3, 2014
0f3285e
Autofocus login/register forms
cshold Jun 3, 2014
920e441
Max logo width
cshold Jun 3, 2014
3a46f64
Added ability to easily change collection-grid-item widths
cshold Jun 3, 2014
bea95cd
Frontpage empty state
cshold Jun 3, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion assets/ajaxify.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ var ajaxifyShopify = (function(module, $) {
// Touch check
if ($isTouch) {
$body.addClass('ajaxify-touch');
} else {
$body.addClass('ajaxify-notouch');
}

// Check if we can use .load
Expand Down Expand Up @@ -483,7 +485,7 @@ var ajaxifyShopify = (function(module, $) {
right: ( $w.width() - ( $modalContainer.offset().left + $modalContainer.outerWidth() ) - 15 ),
opacity: 1
});
}, 200);
}, 600);
};

hideModal = function (e) {
Expand Down
117 changes: 98 additions & 19 deletions assets/ajaxify.scss.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,43 @@
* - Styles for cart drawer, modal, and the flipped add to cart button
*/

// ==============================================================================
// #Breakpoint and Grid Variables (from timber.scss.liquid)
// ==============================================================================
$viewportIncrement: 1px;

$small: 480px;
$medium: 768px;
$large: 769px;

$postSmall: $small + $viewportIncrement;
$preMedium: $medium - $viewportIncrement;
$preLarge: $large - $viewportIncrement;

$gutter: 24px;

// ==============================================================================
// Dependency-free breakpoint mixin
// http://blog.grayghostvisuals.com/sass/sass-media-query-mixin/
// ==============================================================================
$min: min-width;
$max: max-width;
@mixin at-query ($constraint, $viewport1, $viewport2:null) {
@if $constraint == $min {
@media screen and ($min: $viewport1) {
@content;
}
} @else if $constraint == $max {
@media screen and ($max: $viewport1) {
@content;
}
} @else {
@media screen and ($min: $viewport1) and ($max: $viewport2) {
@content;
}
}
}

// ==============================================================================
// Sass Helpers
// ==============================================================================
Expand Down Expand Up @@ -266,8 +303,8 @@ form[action^="/cart/add"] {
@include perspective(1000px);
@include transform-style(preserve-3d);
@include transition(all 450ms cubic-bezier(0.57,.06,.05,.95));
padding-top: 30px;
padding-bottom: 30px;
padding-top: $gutter;
padding-bottom: $gutter;

.is-visible & {
@include transition(all 550ms cubic-bezier(0.57, 0.06, 0.05, 0.95));
Expand All @@ -276,6 +313,11 @@ form[action^="/cart/add"] {
form {
margin-bottom: 0;
}

@include at-query ($max, $medium) {
padding-top: 15px;
padding-bottom: 15px;
}
}

// Row and column spacing
Expand Down Expand Up @@ -314,14 +356,6 @@ form[action^="/cart/add"] {
.ajaxifyCart--row {
clear: both;
@include clearfix;

a {
text-decoration: none;

&.ajaxifyCart--remove {
text-decoration: underline;
}
}
}

.ajaxCart--product-image {
Expand Down Expand Up @@ -402,8 +436,11 @@ form[action^="/cart/add"] {
margin-bottom: 0;

input[type="text"] {
border: 1px solid rgba(0,0,0,0);
@include transition(all 0.1s ease-out);

.ajaxify-notouch & {
border: 1px solid rgba(0,0,0,0);
}
}

.ajaxifyCart--is-loading & {
Expand Down Expand Up @@ -455,16 +492,45 @@ form[action^="/cart/add"] {
left: 50%;
margin: -300px 0 0 -500px; // overridden with JS
width: 100%;
max-width: 1000px;
max-width: 760px;
max-height: 80%;
height: auto;
z-index: 99999999;
visibility: hidden;
overflow: auto;
@include transition('box-shadow 600ms cubic-bezier(0.47, 0.5, 0, 0.95) 400ms, margin-top 200ms ease-in-out');

// Medium-down screens
@include at-query ($max, $medium) {
max-width: 90%;
}

// Small screens
@include at-query ($max, $small) {
top: 0;
left: 0;
bottom: 0;
margin: 0!important;
max-height: none;
max-width: none;
}

.ajaxifyCart--content {
padding: 30px;
padding-left: $gutter;
padding-right: $gutter;

// Medium-down screens
@include at-query ($max, $medium) {
padding-left: 15px;
padding-right: 15px;
}

// Small screens
@include at-query ($max, $small) {
padding-bottom: 60px;
height: 100%;
}

}

&.is-visible {
Expand Down Expand Up @@ -499,6 +565,10 @@ form[action^="/cart/add"] {
@include transform(none);
}

.update-cart {
display: none!important;
}

}

#ajaxifyCart-overlay {
Expand All @@ -515,7 +585,7 @@ form[action^="/cart/add"] {
@include transition(opacity 450ms cubic-bezier(0.57,.06,.05,.95));
}

.is-visible ~ #ajaxifyCart-overlay {
#ajaxifyModal.is-visible ~ #ajaxifyCart-overlay {
opacity: 0.8;
visibility: visible;
@include transition(opacity 650ms cubic-bezier(0.57, 0.06, 0.05, 0.95));
Expand Down Expand Up @@ -555,7 +625,8 @@ form[action^="/cart/add"] {
#ajaxifyModal {
.cart-row:hover input[type="text"],
.ajaxifyCart--product:hover input[type="text"],
.ajaxify-touch input[type="text"] {
.ajaxify-touch input[type="text"],
.page-header {
border-color: $modalBorderColor;
}

Expand Down Expand Up @@ -596,13 +667,19 @@ form[action^="/cart/add"] {
&.is-visible {
@include transition(all 550ms cubic-bezier(0.47, 0, 0, 0.95));
}

.update-cart {
display: none!important;
}
}

// Drawer colors and general styles
#ajaxifyDrawer .ajaxifyCart--content {
margin: 0 auto;
opacity: 0;
overflow: hidden;
padding-top: $gutter;
padding-bottom: $gutter;
background-color: $drawerBackgroundColor;
color: color-control($drawerBackgroundColor);

Expand Down Expand Up @@ -632,7 +709,8 @@ form[action^="/cart/add"] {
#ajaxifyDrawer {
.cart-row:hover input[type="text"],
.ajaxifyCart--product:hover input[type="text"],
.ajaxify-touch input[type="text"] {
.ajaxify-touch input[type="text"],
.page-header {
border-color: $drawerBorderColor;
}

Expand Down Expand Up @@ -731,7 +809,7 @@ form[action^="/cart/add"] {
background-color: $ajaxifyGreyDark;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAYAAACprHcmAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkMzRUY2REVBNDY1QjExRTM4ODdCODU0OEQ4MDA1MjgwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkMzRUY2REVCNDY1QjExRTM4ODdCODU0OEQ4MDA1MjgwIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzNFRjZERTg0NjVCMTFFMzg4N0I4NTQ4RDgwMDUyODAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QzNFRjZERTk0NjVCMTFFMzg4N0I4NTQ4RDgwMDUyODAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7sdZ8fAAAAp0lEQVR42nSPQQ6CMBBFx4ZEj+DSY8BGt9SVwRP1QBDdULeygaN4BFzpn+Q3mZCW5DFk/uvQ2YUQfiIygYuUnzc4O7wW/QCxIEbmi8oNG23mgO03js0reDF4gCNry77mUpkpHvSgo7QHA7gnwW1+q8FKcbViTtbJB/Bl7Uty5BWe4MTa2aWTPJplbuDDmpYe04IzqBn4zbU8J2udHcUpI9oDmtd/AQYAX20mtnhTCxQAAAAASUVORK5CYII=);
z-index: 999999999;
@include transition('background-color 100ms ease-in-out, margin 100ms ease-in-out');
@include transition(all 100ms ease-in-out);

#ajaxifyModal.is-visible + & {
display: block;
Expand All @@ -741,8 +819,9 @@ form[action^="/cart/add"] {
background-color: lighten($ajaxifyGreyDark, 50%);
}

@media only screen and (max-width:972px) {
@include transform(translateY(-100%) translateX(-100%));
@include at-query ($max, 972px) {
background-color: transparent;
@include transform(translateY(32px) translateX(-32px));
}
}

Expand Down
14 changes: 14 additions & 0 deletions assets/collection-view-grid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/collection-view-list.svg
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/icons.eot
Binary file not shown.