publish: Merge branch 'release/1.0.8'

generated from commit f449821
volusion-angular-themes · Mar 3, 2015 · a89ac29 · a89ac29
1 parent 41b3904
commit a89ac29
Show file tree

Hide file tree

Showing 95 changed files with 7,140 additions and 13,545 deletions.
diff --git a/404.html b/404.html
@@ -1,4 +1,11 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="prerender-status-code" content="404"><title>Page Not Found :(</title><style>::-moz-selection {
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="prerender-status-code" content="404">
+	<title>Page Not Found :(</title>
+	<style>
+		::-moz-selection {
 			background: #b3d4fc;
 			text-shadow: none;
 		}
@@ -130,4 +137,22 @@
 		input::-moz-focus-inner {
 			padding: 0;
 			border: 0;
-		}</style></head><body><div class="container"><h1>Not found <span>:(</span></h1><p>Sorry, but the page you were trying to view does not exist.</p><p>It looks like this was the result of either:</p><ul><li>a mistyped address</li><li>an out-of-date link</li></ul><script>var GOOG_FIXURL_LANG = (navigator.language || '').slice(0, 2), GOOG_FIXURL_SITE = location.host;</script><script src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script></div></body></html>
+		}
+	</style>
+</head>
+<body>
+	<div class="container">
+		<h1>Not found <span>:(</span></h1>
+		<p>Sorry, but the page you were trying to view does not exist.</p>
+		<p>It looks like this was the result of either:</p>
+		<ul>
+			<li>a mistyped address</li>
+			<li>an out-of-date link</li>
+		</ul>
+		<script>
+			var GOOG_FIXURL_LANG = (navigator.language || '').slice(0, 2), GOOG_FIXURL_SITE = location.host;
+		</script>
+		<script src="//linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
+	</div>
+</body>
+</html>
diff --git a/fonts/roboto-light.svg b/fonts/roboto-light.svg
diff --git a/fonts/roboto-lightitalic.svg b/fonts/roboto-lightitalic.svg
diff --git a/fonts/roboto-thin.svg b/fonts/roboto-thin.svg
diff --git a/fonts/roboto-thinitalic.svg b/fonts/roboto-thinitalic.svg
diff --git a/images/demo/colors.png b/images/demo/colors.png
diff --git a/images/demo/menu-img.png b/images/demo/menu-img.png
diff --git a/images/demo/shirt1.jpg b/images/demo/shirt1.jpg
diff --git a/images/demo/shirt2.jpg b/images/demo/shirt2.jpg
diff --git a/images/demo/shirt3.jpg b/images/demo/shirt3.jpg
diff --git a/images/demo/shirt4.jpg b/images/demo/shirt4.jpg
diff --git a/images/generated/sprites/icons-s9458fc1b1a.png b/images/generated/sprites/icons-s9458fc1b1a.png
diff --git a/images/generated/sprites/icons.png b/images/generated/sprites/icons.png
diff --git a/images/generated/sprites/social-sac0e374d9a.png b/images/generated/sprites/social-sac0e374d9a.png
diff --git a/images/generated/sprites/social.png b/images/generated/sprites/social.png
diff --git a/images/homepage/slider/slide1.jpg b/images/homepage/slider/slide1.jpg
diff --git a/images/homepage/slider/slide2.jpg b/images/homepage/slider/slide2.jpg
diff --git a/images/homepage/slider/slide3.jpg b/images/homepage/slider/slide3.jpg
diff --git a/images/homepage/slider/slide4.jpg b/images/homepage/slider/slide4.jpg
diff --git a/images/homepage/slider/slide5.jpg b/images/homepage/slider/slide5.jpg
diff --git a/images/homepage/tile1.jpg b/images/homepage/tile1.jpg
diff --git a/images/homepage/tile2.jpg b/images/homepage/tile2.jpg
diff --git a/images/homepage/tile3.jpg b/images/homepage/tile3.jpg
diff --git a/images/homepage/tile4.jpg b/images/homepage/tile4.jpg
diff --git a/images/homepage/tile5.jpg b/images/homepage/tile5.jpg
diff --git a/images/homepage/tile6.jpg b/images/homepage/tile6.jpg
diff --git a/images/marketing-assets/screenshot1-large.png b/images/marketing-assets/screenshot1-large.png
diff --git a/images/marketing-assets/screenshot2-large.png b/images/marketing-assets/screenshot2-large.png
diff --git a/images/marketing-assets/screenshot3-large.png b/images/marketing-assets/screenshot3-large.png
diff --git a/images/marketing-assets/screenshot4-large.png b/images/marketing-assets/screenshot4-large.png
diff --git a/images/marketing-assets/screenshot5-large.png b/images/marketing-assets/screenshot5-large.png
diff --git a/images/marketing-assets/screenshot6-large.png b/images/marketing-assets/screenshot6-large.png
diff --git a/images/sprites/creditcards-b.png b/images/sprites/creditcards-b.png
diff --git a/images/sprites/creditcards.gif b/images/sprites/creditcards.gif
diff --git a/images/sprites/icons/cart-bag.png b/images/sprites/icons/cart-bag.png
diff --git a/images/sprites/icons/heart.png b/images/sprites/icons/heart.png
diff --git a/images/sprites/icons/new.png b/images/sprites/icons/new.png
diff --git a/images/sprites/icons/sale.png b/images/sprites/icons/sale.png
diff --git a/images/sprites/icons/zoom.png b/images/sprites/icons/zoom.png
diff --git a/images/sprites/social/facebook.png b/images/sprites/social/facebook.png
diff --git a/images/sprites/social/google.png b/images/sprites/social/google.png
diff --git a/images/sprites/social/instagram.png b/images/sprites/social/instagram.png
diff --git a/images/sprites/social/pinterest.png b/images/sprites/social/pinterest.png
diff --git a/images/sprites/social/tumblr.png b/images/sprites/social/tumblr.png
diff --git a/images/sprites/social/twitter.png b/images/sprites/social/twitter.png
diff --git a/images/sprites/social/vimeo.png b/images/sprites/social/vimeo.png
diff --git a/images/sprites/social/youtube.png b/images/sprites/social/youtube.png
diff --git a/images/theme/dropdown-arrow.png b/images/theme/dropdown-arrow.png
diff --git a/images/theme/grid-layout.png b/images/theme/grid-layout.png
diff --git a/images/theme/logo-mobile.png b/images/theme/logo-mobile.png
diff --git a/images/theme/menu-arrow.png b/images/theme/menu-arrow.png
diff --git a/images/theme/method-large.jpg b/images/theme/method-large.jpg
diff --git a/images/theme/method-thumbnail.jpg b/images/theme/method-thumbnail.jpg
diff --git a/images/theme/sw-1-lg.png b/images/theme/sw-1-lg.png
diff --git a/images/theme/sw-1-sm.png b/images/theme/sw-1-sm.png
diff --git a/images/theme/sw-2-lg.png b/images/theme/sw-2-lg.png
diff --git a/images/theme/sw-2-sm.png b/images/theme/sw-2-sm.png
diff --git a/images/theme/sw-3-lg.png b/images/theme/sw-3-lg.png
diff --git a/images/theme/sw-3-sm.png b/images/theme/sw-3-sm.png
diff --git a/images/theme/sw-4-lg.png b/images/theme/sw-4-lg.png
diff --git a/images/theme/sw-4-sm.png b/images/theme/sw-4-sm.png
diff --git a/images/theme/sw-5-lg.png b/images/theme/sw-5-lg.png
diff --git a/images/theme/sw-5-sm.png b/images/theme/sw-5-sm.png
diff --git a/images/theme/sw-6-lg.png b/images/theme/sw-6-lg.png
diff --git a/images/us-flag.png b/images/us-flag.png
diff --git a/images/worldwide-flag.png b/images/worldwide-flag.png
diff --git a/index.html b/index.html
@@ -1,4 +1,53 @@
-<!doctype html><html class="no-js" ng-app="methodApp" data-ng-strict-di><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" data-social-page-title="social.pageTitle" data-social-page-url="social.pageUrl" data-social-image-url="social.imageUrl"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Method Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/ea310966.vendor.css"><link rel="stylesheet" href="/styles/b187030a.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" data-ng-strict-di>
+<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"
+	data-social-page-title="social.pageTitle" data-social-page-url="social.pageUrl"
+	data-social-image-url="social.imageUrl">
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="fragment" content="!" />
+	<title>Volusion AngularJS Method Theme</title>
+	<meta name="description" content="">
+	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
+	<link rel="stylesheet" href="/styles/18da469e.vendor.css">
+	<link rel="stylesheet" href="/styles/4b733acf.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]--><div data-snap-drawers><!-- Mobile Menu --><div id="mobile-menu" data-ng-include=" 'views/partials/mobile-menu.html' "></div><!-- Checkout --><div id="shopping-cart" data-ng-include=" 'views/partials/shopping-card.html' "></div></div><div snap-content data-snap-ignore="true"><!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div id="main-content-area" role="main" autoscroll="" ng-view=""></div><!-- Footer --><div id="footer" ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/aeb0d522.vendor.js"></script><script src="/scripts/e61e73ab.scripts.js"></script></body></html>
+	<![endif]-->
+
+	<div data-snap-drawers>
+
+		<!-- Mobile Menu -->
+		<div id="mobile-menu" data-ng-include=" 'views/partials/mobile-menu.html' "></div>
+
+		<!-- Checkout -->
+		<div id="shopping-cart" data-ng-include=" 'views/partials/shopping-cart.html' "></div>
+
+	</div>
+
+	<div snap-content data-snap-ignore="true">
+
+		<!-- Header -->
+		<div id="header" ng-include=" 'views/partials/header.html' "></div>
+
+		<!-- Main Content -->
+		<div id="main-content-area" role="main" ui-view="" ></div>
+
+		<!-- Footer -->
+		<div id="footer" ng-include=" 'views/partials/footer.html' "></div>
+
+	</div>
+
+	<script src="scripts/a4dee9ea.vendor.js"></script>
+
+	<script src="/scripts/7cc5e0fd.scripts.js"></script>
+
+</body>
+</html>
diff --git a/scripts/7cc5e0fd.scripts.js b/scripts/7cc5e0fd.scripts.js
diff --git a/scripts/a4dee9ea.vendor.js b/scripts/a4dee9ea.vendor.js
diff --git a/scripts/aeb0d522.vendor.js b/scripts/aeb0d522.vendor.js
diff --git a/scripts/e61e73ab.scripts.js b/scripts/e61e73ab.scripts.js
diff --git a/settings/app.js b/settings/app.js
@@ -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/b187030a.main.css';
+				cssUrl =  '/styles/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/b187030a.main.css';
+				cssUrl =  '/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/styles/main.css';
 			}
 			$http.get(apiUrl)
 				.success(function(data) {

diff --git a/settings/themeInfo.json b/settings/themeInfo.json
@@ -1,14 +1,15 @@
 {
 	"name": "Method",
-	"version": "1.0.7",
-	"source": "https://github.com/volusion-angular-themes/method/archive/v1.0.7.zip",
+	"version": "1.0.8",
+	"source": "https://github.com/volusion-angular-themes/method/archive/v1.0.8.zip",
 	"author": {
 		"name": "John Smith",
 		"email": "[email protected]",
 		"website": "http://www.envato.com"
 	},
-	"marketing": {
-		"description": "Method is an awesome theme. Let me tell you all about it. <img src=\"http://www.themelexus.com/guides/opencart/shopping/features.jpg\"> Yes I just mixed in some images too.",
+	"marketing": {   app/index.html
+
+	  "description": "Method is an awesome theme. Let me tell you all about it. <img src=\"http://www.themelexus.com/guides/opencart/shopping/features.jpg\"> Yes I just mixed in some images too.",
 		"images": [
 			{
 				"small": "",

diff --git a/styles/18da469e.vendor.css b/styles/18da469e.vendor.css