From 8d3c6ce99cc76fe6eb3236670465c1f45d7e9912 Mon Sep 17 00:00:00 2001 From: jennbrewr Date: Thu, 12 Apr 2018 18:49:03 -0400 Subject: [PATCH 1/7] Removed conflict with colors in js file --- partials/partial-navbar.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partials/partial-navbar.htm b/partials/partial-navbar.htm index 9b8d80e..4aad0eb 100755 --- a/partials/partial-navbar.htm +++ b/partials/partial-navbar.htm @@ -52,7 +52,7 @@

[[item.name]]

-

[[ item.price | currency ]]

+

[[ item.price ]]

From aa2fc434fe470b126057536a49086d19a2816eb7 Mon Sep 17 00:00:00 2001 From: jennbrewr Date: Thu, 12 Apr 2018 18:53:35 -0400 Subject: [PATCH 2/7] Commented out description for categories partial as it was causing errors --- partials/partial-categories.htm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/partials/partial-categories.htm b/partials/partial-categories.htm index b787887..f8a9cba 100755 --- a/partials/partial-categories.htm +++ b/partials/partial-categories.htm @@ -1,6 +1,6 @@ ----- - -description: 'Retrieves category info and puts it into objects for angular.' - ---- + {% tree categories %} From 950c39bf84149686b147bf343e808ef00f90886c Mon Sep 17 00:00:00 2001 From: jennbrewr Date: Thu, 12 Apr 2018 18:54:01 -0400 Subject: [PATCH 3/7] Removed conflict with colors in js file --- resources/js/meyer.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/resources/js/meyer.js b/resources/js/meyer.js index 25470c7..ca4942a 100755 --- a/resources/js/meyer.js +++ b/resources/js/meyer.js @@ -24,25 +24,6 @@ angular $interpolateProvider.startSymbol('[['); $interpolateProvider.endSymbol(']]'); - // pass the theme colours from main.htm to Angular's theming provider - var lemonstandPrimary = $mdThemingProvider.extendPalette('cyan', { - '500': themePrimaryColor, - 'contrastDefaultColor': 'light' - }); - var lemonstandSecondary = $mdThemingProvider.extendPalette('amber', { - '500': themeSecondaryColor, - 'contrastDefaultColor': 'light' - }); - - // Register the new color palette map with the name neonRed - $mdThemingProvider.definePalette('lsPrimary', lemonstandPrimary); - $mdThemingProvider.definePalette('lsSecondary', lemonstandSecondary); - - // Use that theme for the primary intentions - $mdThemingProvider.theme('default') - .primaryPalette('lsPrimary') - .accentPalette('lsSecondary') - }) .run(function(ThemeService,$rootScope,$window,$timeout){ $rootScope.$ls = $window.localStorage; From 2205f2bcfbc6b491d2477c53588ea3c9a07a7d56 Mon Sep 17 00:00:00 2001 From: jennbrewr Date: Fri, 13 Jul 2018 11:09:50 -0400 Subject: [PATCH 4/7] added title text to theme.yaml --- theme.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/theme.yaml b/theme.yaml index 59d690c..a3ddf78 100755 --- a/theme.yaml +++ b/theme.yaml @@ -26,6 +26,7 @@ customFields: headerBackgroundColor: { type: color, title: 'Header/footer background color', default: '#FFFFFF', comment: 'Color used for the header and footer background.' } headerTextColor: { type: color, title: 'Header/footer text color', default: '#212121', comment: 'Color used for all header and footer text.' } storeTitle: { type: text, title: 'Title of your Store', default: Meyer } + bannerTitleText: { type: text, title: 'Banner Title Text', default: Meyer } bannerSentenceText: { type: text, title: 'Banner Sentence Text', default: 'A responsive LemonStand theme', comment: 'Text used for the homepage banner sentence.' } signUpText: { type: text, title: 'Newsletter sign up text', default: 'Sign up for our newsletter.', comment: 'An incentive for people to sign up for your newsletter.' } storeReturnPolicy: { type: text, title: 'Store return policy', default: 'Up to 30 days from purchase. Must not be opened or damaged.', comment: 'Let people know if they can return items after purchase.' } From d50438aa475dc0c51d0b462bf9a24391c5e23599 Mon Sep 17 00:00:00 2001 From: jennbrewr Date: Fri, 13 Jul 2018 11:13:44 -0400 Subject: [PATCH 5/7] Undid other changes --- partials/partial-navbar.htm | 2 +- resources/js/meyer.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/partials/partial-navbar.htm b/partials/partial-navbar.htm index 4aad0eb..9b8d80e 100755 --- a/partials/partial-navbar.htm +++ b/partials/partial-navbar.htm @@ -52,7 +52,7 @@

[[item.name]]

-

[[ item.price ]]

+

[[ item.price | currency ]]

diff --git a/resources/js/meyer.js b/resources/js/meyer.js index ca4942a..c40bd4f 100755 --- a/resources/js/meyer.js +++ b/resources/js/meyer.js @@ -24,6 +24,24 @@ angular $interpolateProvider.startSymbol('[['); $interpolateProvider.endSymbol(']]'); + // pass the theme colours from main.htm to Angular's theming provider + var lemonstandPrimary = $mdThemingProvider.extendPalette('cyan', { + '500': themePrimaryColor, + 'contrastDefaultColor': 'light' + }); + var lemonstandSecondary = $mdThemingProvider.extendPalette('amber', { + '500': themeSecondaryColor, + 'contrastDefaultColor': 'light' + }); + // Register the new color palette map with the name neonRed + $mdThemingProvider.definePalette('lsPrimary', lemonstandPrimary); + $mdThemingProvider.definePalette('lsSecondary', lemonstandSecondary); + // Use that theme for the primary intentions + $mdThemingProvider.theme('default') + .primaryPalette('lsPrimary') + .accentPalette('lsSecondary') + }) + }) .run(function(ThemeService,$rootScope,$window,$timeout){ $rootScope.$ls = $window.localStorage; From 827dc723ce47e0a0d73d07b689ed3ee40c6e2773 Mon Sep 17 00:00:00 2001 From: jennbrewr Date: Thu, 15 Nov 2018 10:52:20 -0500 Subject: [PATCH 6/7] added robots and sitemap --- pages/home/page-home.htm | 4 ++- pages/robots/page-robots.htm | 13 ++++++++++ pages/sitemap/page-sitemap.htm | 46 ++++++++++++++++++++++++++++++++++ templates/robots.htm | 4 +++ templates/xml.htm | 4 +++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 pages/robots/page-robots.htm create mode 100644 pages/sitemap/page-sitemap.htm create mode 100644 templates/robots.htm create mode 100644 templates/xml.htm diff --git a/pages/home/page-home.htm b/pages/home/page-home.htm index 195cf70..f8c536c 100755 --- a/pages/home/page-home.htm +++ b/pages/home/page-home.htm @@ -32,7 +32,9 @@