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 13 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
15 changes: 5 additions & 10 deletions assets/ajaxify.scss.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,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 +394,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);

:not(body.ajaxify-touch) & {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this won't work with IE8, assuming that's ok for Timber?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, just sets the border as transparent to get ready for a CSS transition so it can be ignored for IE8.

border: 1px solid rgba(0,0,0,0);
}
}

.ajaxifyCart--is-loading & {
Expand Down Expand Up @@ -742,7 +737,7 @@ form[action^="/cart/add"] {
}

@media only screen and (max-width:972px) {
@include transform(translateY(-100%) translateX(-100%));
@include transform(translateY(150%) translateX(-150%));
}
}

Expand Down
35 changes: 33 additions & 2 deletions assets/shop.js.liquid
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
$(function() {
window.timber = window.timber || {};
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mpiotrowicz @richgilbank

Looks like I lost the line comment after my update, but appreciate the notes. Rich, I assume this is what you meant by splitting the methods up?

Cached elements are more aptly named. Will consider moving other selectors up there too, though I sometimes prefer keeping the relevant ones with their methods.. just preference there.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments are still in the conversation view under "Show outdated diff", but yep, that's what I meant!
🐓💨


timber.cache = {
html: $('html'),
body: $('body')
}

timber.init = function () {
timber.cache.html.removeClass('no-js').addClass('js');

// Run on load
timber.productImageSwitch();
}

$('html').removeClass('no-js').addClass('js');
timber.productImageSwitch = function () {
var mainImage = $('#productPhoto img'),
thumbImages = $('#productThumbs a'),
newImage;

if (!thumbImages.length) {
return;
}

// Switch the main image with one of the thumbnails
// Note: this does not change the variant selected, just the image
thumbImages.on('click', function(e) {
e.preventDefault();
newImage = $(this).attr('href');
mainImage.attr({ src: newImage });
});
}

// Initialize Timber's JS on docready
$(function() {
window.timber.init();
});