Skip to content

Commit

Permalink
publish: Merge pull request #23 from tylertadej/aug26-pr
Browse files Browse the repository at this point in the history 
generated from commit 96c330e
  • Loading branch information
deploy.sh committed Aug 27, 2014
1 parent e1b3b4a commit 596b930
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 41 deletions.
Binary file renamed images/theme/9670c432.logo.png → images/theme/5dc8b896.logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html><html class="no-js" ng-app="methodApp"><head data-vn-meta-tags data-title="seo.metaTagTitle" data-description="seo.metaTagDescription" data-keywords="seo.metaTagKeywords" data-robots="seo.enableRobotsMetatags" data-to-append="seo.globallyAppendedMetatags"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Vanilla Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/764e6e14.vendor.css"><link rel="stylesheet" href="/styles/5f68ee24.main.css"><link rel="stylesheet" ng-href="{{ overridesCSS }}"><base href="/"></head><body role="document" data-ng-controller="MainCtrl"><!--[if lt IE 9]>
<!doctype html><html class="no-js" ng-app="methodApp"><head data-vn-meta-tags data-title="seo.metaTagTitle" data-description="seo.metaTagDescription" data-keywords="seo.metaTagKeywords" data-robots="seo.enableRobotsMetatags" data-to-append="seo.globallyAppendedMetatags"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Vanilla Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/764e6e14.vendor.css"><link rel="stylesheet" href="/styles/ad25f06d.main.css"><link rel="stylesheet" ng-href="{{ overridesCSS }}"><base href="/"></head><body role="document" data-ng-controller="MainCtrl"><!--[if lt IE 9]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a>
to improve your experience.</p>
<![endif]--><!--TODO Remove SnapJS from Vanilla--><div snap-content data-snap-ignore="true"><a id="top"></a> <!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div class="vn-showcase" role="main" autoscroll="false" ng-view=""></div><!-- Footer --><div ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/e5593c88.vendor.js"></script><script src="/scripts/314ed860.scripts.js"></script></body></html>
<![endif]--><!--TODO Remove SnapJS from Vanilla--><div snap-content data-snap-ignore="true"><a id="top"></a> <!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div class="vn-showcase" role="main" autoscroll="false" ng-view=""></div><!-- Footer --><div ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/acf7a741.vendor.js"></script><script src="/scripts/f36797d5.scripts.js"></script></body></html>
2 changes: 0 additions & 2 deletions scripts/314ed860.scripts.js
View file

This file was deleted.

20 changes: 20 additions & 0 deletions scripts/acf7a741.vendor.js
View file

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions scripts/e5593c88.vendor.js
View file

This file was deleted.

2 changes: 2 additions & 0 deletions scripts/f36797d5.scripts.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions settings/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ angular.module('app', ['ui.bootstrap','ui.tinymce','angular-ladda'])
//in local development environment (i.e. grunt serve)
environment = 'dev';
apiUrl = '/settings/themeSettings.json';
cssUrl = '/styles/5f68ee24.main.css';
cssUrl = '/styles/ad25f06d.main.css';
$scope.debug = true;
} else {
//in production
environment = 'prod';
var queryString = $location.search();
apiUrl = '/api/v1/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/settings';
cssUrl = '/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/styles/5f68ee24.main.css';
cssUrl = '/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/styles/ad25f06d.main.css';
}
$http.get(apiUrl)
.success(function(data) {
Expand Down
30 changes: 20 additions & 10 deletions styles/5f68ee24.main.css → styles/ad25f06d.main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8005,7 +8005,7 @@ button.close {
}

@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/base\/_helpers\.scss}line{font-family:\0000339}}
.btn-lg, .btn-group-lg > .btn, .pagination .active, .th-elist__submit, .th-hero-promo, .th-icon-group .ng-social-facebook .ng-social-text, .th-product-options__add-to-cart {
.btn-lg, .btn-group-lg > .btn, .pagination .active, .th-elist__submit, .th-hero-promo, .th-product-options__add-to-cart {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
Expand Down Expand Up @@ -8251,8 +8251,14 @@ label {
margin-top: 50px;
}
}
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/base\/_bootstrap-style\.scss}line{font-family:\00003173}}
.pagination .disabled > span,
.pagination .disabled > span:hover {
color: #333333;
cursor: default;
}

@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/base\/_bootstrap-style\.scss}line{font-family:\00003179}}
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/base\/_bootstrap-style\.scss}line{font-family:\00003185}}
.img-thumbnail:hover {
cursor: -webkit-zoom-in;
cursor: zoom-in;
Expand Down Expand Up @@ -8649,14 +8655,6 @@ If you create a new component stylesheet make sure it gets added to this list
.th-icon-group__icon--small {
margin-right: 10px;
}
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/th\/_icon-group\.scss}line{font-family:\0000316}}
.th-icon-group .ng-social-facebook {
margin-left: 0;
}
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/th\/_icon-group\.scss}line{font-family:\0000319}}
.th-icon-group .ng-social-facebook .ng-social-text {
padding-left: 4px;
}

@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/th\/_link-list\.scss}line{font-family:\000033}}
.th-linklist {
Expand Down Expand Up @@ -8788,6 +8786,18 @@ If you create a new component stylesheet make sure it gets added to this list
text-align: center;
}
}
@media only screen and (min-width: 768px) and (max-width: 991px) {
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/th\/_product-tile\.scss}line{font-family:\0000346}}
.th-product-tile__block .col-sm-6:nth-of-type(2n+3) {
clear: both;
}
}
@media only screen and (min-width: 992px) {
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/th\/_product-tile\.scss}line{font-family:\0000351}}
.th-product-tile__block .col-md-4:nth-of-type(3n+4) {
clear: both;
}
}

@media only screen and (min-width: 992px) {
@media -sass-debug-info{filename{font-family:file\:\/\/\/home\/travis\/build\/volusion-angular-themes\/vanilla\/app\/styles\/th\/_product-view\.scss}line{font-family:\000031}}
Expand Down
2 changes: 1 addition & 1 deletion views/category.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="container"><div class="th-product-tile"><div class="row th-product-tile__heading"><div class="col-xs-12 text-center" ng-class="{ 'isMobileAndHidden': true == !isMobileAndHidden }"><h1 class="ng-binding">{{ category.name }}</h1><ul class="list-inline" data-ng-if="category.subCategories.length"><li data-ng-repeat="subCategory in category.subCategories"><a class="" data-ng-href="{{subCategory.url}}">{{ subCategory.name }}</a></li></ul></div></div><div class="row th-product-tile__block"><div class="-product-tile-animation col-xs-12 col-sm-6 col-md-4" data-ng-repeat="product in products track by $index"><span class="th-product__sale" data-ng-show="product.isOnSale"></span> <span class="th-product__new" data-ng-show="product.isNew"></span> <a href="{{ product.url }}" class="th-product-tile__image-link"><img data-ng-src="{{ getImagePath(product.imageCollections) }}" alt="" class="img-responsive th-product-tile__image"></a><div class="th-product-name--medium"><a href="p/{{ product.slug }}">{{ product.name }}</a></div><div class="th-product-price" data-ng-show="product.pricing.regularPrice > 0"><div class="th-product-price--medium">{{product.pricing.regularPrice | currency}}</div></div></div></div><div vn-paginator cursor="cursor" current-page="currentPage" query-fn="queryProducts()"></div></div><!-- /th-product-tile --></div>
<div class="container"><div class="th-product-tile"><div class="row th-product-tile__heading"><div class="col-xs-12 text-center" ng-class="{ 'isMobileAndHidden': true == !isMobileAndHidden }"><h1 class="ng-binding">{{ category.name }}</h1><ul class="list-inline" data-ng-if="category.subCategories.length"><li data-ng-repeat="subCategory in category.subCategories"><a class="" data-ng-href="{{subCategory.url}}">{{ subCategory.name }}</a></li></ul></div></div><div class="row th-product-tile__block"><div class="-product-tile-animation col-xs-12 col-sm-6 col-md-4" data-ng-repeat="product in products track by product.id"><span class="th-product__sale" data-ng-show="product.isOnSale"></span> <span class="th-product__new" data-ng-show="product.isNew"></span> <a href="{{ product.url }}" class="th-product-tile__image-link"><img data-ng-src="{{ getImagePath(product.imageCollections) }}" alt="" class="img-responsive th-product-tile__image"></a><div class="th-product-name--medium"><a href="{{ product.url }}">{{ product.name }}</a></div><div class="th-product-price" data-ng-show="product.pricing.regularPrice > 0"><div class="th-product-price--medium">{{product.pricing.regularPrice | currency}}</div></div></div></div><div vn-paginator cursor="cursor" current-page="currentPage" query-fn="queryProducts()"></div></div><!-- /th-product-tile --></div>
2 changes: 1 addition & 1 deletion views/partials/paginator.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div data-ng-show="cursor.totalPages > 1"><div class="row"><div class="col-xs-12 text-center"><ul class="pagination"><li data-ng-class="{disabled: cursor.currentPage == 1}"><a href data-ng-click="prevPage()">&laquo;</a></li><li class="disabled"><span>Page {{ cursor.currentPage }} of {{ cursor.totalPages }}</span></li><li data-ng-class="{disabled: cursor.currentPage == cursor.totalPages}"><a href data-ng-click="nextPage()">&raquo;</a></li></ul></div></div></div>
<div data-ng-show="cursor.totalPages > 1"><div class="row"><div class="col-xs-12 text-center"><ul class="pagination"><li data-ng-class="{disabled: cursor.currentPage == 1}"><a href data-ng-click="prevPage()"><span class="glyphicon glyphicon-arrow-left"></span></a></li><li class="disabled"><span>Page {{ cursor.currentPage }} of {{ cursor.totalPages }}</span></li><li data-ng-class="{disabled: cursor.currentPage == cursor.totalPages}"><a href data-ng-click="nextPage()"><span class="glyphicon glyphicon-arrow-right"></span></a></li></ul></div></div></div>
2 changes: 1 addition & 1 deletion views/product.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="container" itemscope itemtype="http://schema.org/Product"><div class="clearfix"><div class="row"><!-- PRODUCT IMAGE AND ALT VIEWS --><div class="col-xs-12 col-md-6 text-center th-product-view"><div class="clearfix col-xs-12"><img data-ng-src="{{ product.image.medium }}" class="img-responsive th-product-view__main-img" alt="{{product.name}}"></div><span data-ng-click="product.image=image" ng-repeat="image in currentImageCollection | filter: '!youtube.com'" class="col-xs-4 th-product-view__thumbnails"><img data-ng-src="{{ image.medium }}" class="img-responsive img-thumbnail" alt=""></span></div><!-- /col-xs-12 col-md-6 --><div class="col-xs-12 col-md-6 th-product-view"><div class="th-product-name--large" itemprop="name" data-ng-bind="product.name"></div><div class="th-product-price--large" itemscope itemtype="http://schema.org/Offer"><span itemprop="price" data-ng-bind="product.pricing.regularPrice | currency"></span></div><div class="th-product-options"><div data-vn-product-option data-ng-repeat="option in product.options" data-option="option" data-product="product" data-save-to="cartItem.options"></div><label for="qty" class="th-product-options__label">Qty</label><div class="form-group"><div data-vn-block="th-qty-counter" class="input-group"><span class="input-group-btn"><button data-vn-element="btn" class="btn btn-default" data-ng-click="decrementQty()" data-ng-disabled="cartItem.qty <= 0">-</button></span> <input data-vn-element="input" class="form-control text-center" data-ng-model="cartItem.qty" placeholder="1"> <span class="input-group-btn"><button data-vn-element="btn" class="btn btn-default" data-ng-click="incrementQty()">+</button></span></div></div><!--TODO Determine is popover tooltips should be added to Vanilla--><button type="button" class="btn btn-primary th-product-options__add-to-cart" data-ng-click="addToCart()" data-ng-disabled="cartItem.qty === 0" data-analytics-category="element click" data-analytics-label="Add to Cart" data-analytics-location="body-product" data-analytics-description="Add to Cart Button"><span data-ng-if="cartItem.qty" data-translate="product.addToCart"></span> <span data-ng-if="!cartItem.qty" data-translate="product.outOfStock"></span></button></div><!-- /product-options --><div class="th-product-description"><div data-ng-show="product.descriptions.detail"><div class="th-product-description__title" data-translate="product.description"></div><p><span itemprop="description" data-ng-bind-html="product.descriptions.detail | legacyLinkify | html"></span></p></div><div data-ng-show="product.descriptions.features"><div class="th-product-description__title" data-translate="product.features"></div><p><span itemprop="features" data-ng-bind-html="product.descriptions.features | legacyLinkify | html"></span></p></div><div data-ng-show="product.descriptions.techSpecs"><div class="th-product-description__title" data-translate="product.techSpecs"></div><p><span itemprop="tech specs" data-ng-bind-html="product.descriptions.techSpecs | legacyLinkify | html"></span></p></div><div data-ng-show="product.descriptions.extendedInfo"><div class="th-product-description__title" data-translate="product.extendedInfo"></div><p><span itemprop="extended info" data-ng-bind-html="product.descriptions.extendedInfo | legacyLinkify | html"></span></p></div><!-- Social Share Buttons --><div class="th-product-description__title">Share</div><ul ng-social-buttons data-title="product.name" class="th-icon-group"><li class="ng-social-facebook">Facebook</li><li class="ng-social-twitter">Twitter</li><li class="ng-social-pinterest">Pinterest</li></ul></div></div></div><!-- RELATED PRODUCTS & ACCESSORIES --><div class="row" data-ng-if="relatedProducts.length > 0 || accessories.length > 0"><div class="col-xs-12"><div class="th-product-tile"><div data-tabset><div data-tab data-ng-if="relatedProducts.length > 0" data-active="tabs.relatedProducts.active"><div data-tab-heading data-translate="product.related">Related</div><div class="clearfix"><div class="col-xs-12 col-sm-3" data-ng-repeat="product in relatedProducts | filter: '!' + product.id" data-ng-include=" 'views/partials/product-tile.html' "></div></div></div></div></div></div></div></div></div>
<div class="container" itemscope itemtype="http://schema.org/Product"><div class="clearfix"><div class="row"><!-- PRODUCT IMAGE AND ALT VIEWS --><div class="col-xs-12 col-md-6 text-center th-product-view"><div class="clearfix col-xs-12"><img data-ng-src="{{ product.image.medium }}" class="img-responsive th-product-view__main-img" alt="{{product.name}}"></div><span data-ng-click="product.image=image" ng-repeat="image in currentImageCollection | filter: '!youtube.com'" class="col-xs-4 th-product-view__thumbnails"><img data-ng-src="{{ image.medium }}" class="img-responsive img-thumbnail" alt=""></span></div><!-- /col-xs-12 col-md-6 --><div class="col-xs-12 col-md-6 th-product-view"><div class="th-product-name--large" itemprop="name" data-ng-bind="product.name"></div><div class="th-product-price--large" itemscope itemtype="http://schema.org/Offer"><span itemprop="price" data-ng-bind="product.pricing.regularPrice | currency"></span></div><div class="th-product-options"><div data-vn-product-option data-ng-repeat="option in product.options" data-option="option" data-product="product" data-save-to="cartItem.options"></div><label for="qty" class="th-product-options__label">Qty</label><div class="form-group"><div data-vn-block="th-qty-counter" class="input-group"><span class="input-group-btn"><button data-vn-element="btn" class="btn btn-default" data-ng-click="decrementQty()" data-ng-disabled="cartItem.qty <= 0">-</button></span> <input data-vn-element="input" class="form-control text-center" data-ng-model="cartItem.qty" placeholder="1"> <span class="input-group-btn"><button data-vn-element="btn" class="btn btn-default" data-ng-click="incrementQty()">+</button></span></div></div><!--TODO Determine is popover tooltips should be added to Vanilla--><button type="button" class="btn btn-primary th-product-options__add-to-cart" data-ng-click="addToCart()" data-ng-disabled="cartItem.qty === 0" data-analytics-category="element click" data-analytics-label="Add to Cart" data-analytics-location="body-product" data-analytics-description="Add to Cart Button"><span data-ng-if="cartItem.qty" data-translate="product.addToCart"></span> <span data-ng-if="!cartItem.qty" data-translate="product.outOfStock"></span></button></div><!-- /product-options --><div class="th-product-description"><div data-ng-show="product.descriptions.detail"><div class="th-product-description__title" data-translate="product.description"></div><p><span itemprop="description" data-ng-bind-html="product.descriptions.detail | legacyLinkify | html"></span></p></div><div data-ng-show="product.descriptions.features"><div class="th-product-description__title" data-translate="product.features"></div><p><span itemprop="features" data-ng-bind-html="product.descriptions.features | legacyLinkify | html"></span></p></div><div data-ng-show="product.descriptions.techSpecs"><div class="th-product-description__title" data-translate="product.techSpecs"></div><p><span itemprop="tech specs" data-ng-bind-html="product.descriptions.techSpecs | legacyLinkify | html"></span></p></div><div data-ng-show="product.descriptions.extendedInfo"><div class="th-product-description__title" data-translate="product.extendedInfo"></div><p><span itemprop="extended info" data-ng-bind-html="product.descriptions.extendedInfo | legacyLinkify | html"></span></p></div><!-- Social Icons --><div class="th-product-description__title">Share</div><!--<div class="th-icon-group" data-ng-include=" 'views/partials/social-sharing.html' "></div>--><script type="text/javascript" src="http://w.sharethis.com/button/buttons.js"></script><!--<script type="text/javascript">stLight.options({publisher: "1b7dd8df-7478-4045-b3e3-88d4ba9c7878", doNotHash: false, doNotCopy: false, hashAddressBar: false});</script>--><style>.stMainServices {height:22px !important;}</style><span class="st_facebook_hcount" displaytext="Facebook"></span> <span class="st_twitter_hcount" displaytext="Tweet"></span> <span class="st_pinterest_hcount" displaytext="Pinterest"></span></div></div></div><!-- RELATED PRODUCTS & ACCESSORIES --><div class="row" data-ng-if="relatedProducts.length > 0 || accessories.length > 0"><div class="col-xs-12"><div class="th-product-tile"><div data-tabset><div data-tab data-ng-if="relatedProducts.length > 0" data-active="tabs.relatedProducts.active"><div data-tab-heading data-translate="product.related">Related</div><div class="clearfix"><div class="col-xs-12 col-sm-3" data-ng-repeat="product in relatedProducts | filter: '!' + product.id" data-ng-include=" 'views/partials/product-tile.html' "></div></div></div></div></div></div></div></div></div>
Loading

0 comments on commit 596b930

Please sign in to comment.