From b02c21dccb8ab0eeae4b98aa67a29bb31441016f Mon Sep 17 00:00:00 2001 From: Ola Date: Thu, 23 Jun 2022 16:16:00 +0200 Subject: [PATCH 1/5] Update url to database queries --- docs/guide/getting-started/alpaca-setup-guide.md | 2 +- docs/guide/introduction/alpaca-packages.md | 2 +- docs/guide/working-with-alpaca/main-content-elements.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/guide/getting-started/alpaca-setup-guide.md b/docs/guide/getting-started/alpaca-setup-guide.md index b52432c0d..ce39013c3 100644 --- a/docs/guide/getting-started/alpaca-setup-guide.md +++ b/docs/guide/getting-started/alpaca-setup-guide.md @@ -46,7 +46,7 @@ The guide is adjusted for Theme Alpaca `>= 2.26.0`. ``` [Learn about Frontools here](https://github.com/SnowdogApps/magento2-frontools) 4. Run db queries to add to your database all Alpaca CMS block & content - [Copy db queries from here](https://github.com/SnowdogApps/create-alpaca-theme/blob/master/templates/database/queries.sql) + [Copy db queries from here](https://github.com/SnowdogApps/create-alpaca-theme/blob/master/src/database/queries.sql) 5. Upgrade application, DB data and schema (_[learn more here](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-db-upgr.html#instgde-cli-db-upgr)_): ```shell diff --git a/docs/guide/introduction/alpaca-packages.md b/docs/guide/introduction/alpaca-packages.md index 079f1b154..11da42c46 100644 --- a/docs/guide/introduction/alpaca-packages.md +++ b/docs/guide/introduction/alpaca-packages.md @@ -5,7 +5,7 @@ Alpaca Theme is a part of [Alpaca Packages](https://github.com/SnowdogApps/magen [snowdog/module-menu](https://github.com/SnowdogApps/magento2-menu)
* Gives greater control over site navigation menus than native Magento 2 offers. Provides a drag-and-drop interface to build menus with links to categories, products, CMS pages, or custom URLs in the admin. -* Used for desktop, mobile and footer menus. Example content can be imported with [these database queries](https://github.com/SnowdogApps/create-alpaca-theme/blob/master/templates/database/queries.sql). +* Used for desktop, mobile and footer menus. Example content can be imported with [these database queries](https://github.com/SnowdogApps/create-alpaca-theme/blob/master/src/database/queries.sql). * You can modify the look of menu items by including Alpaca CSS classes in menu nodes configuration. For example: to create a column, add a menu node with type "wrapper" and classes `list__column list__column--hidden`. diff --git a/docs/guide/working-with-alpaca/main-content-elements.md b/docs/guide/working-with-alpaca/main-content-elements.md index 3a4f92c96..586e693ca 100644 --- a/docs/guide/working-with-alpaca/main-content-elements.md +++ b/docs/guide/working-with-alpaca/main-content-elements.md @@ -3,7 +3,7 @@ ## Header and Footer * To make them easy to customize and update we use [CMS blocks](https://docs.magento.com/user-guide/cms/blocks.html). -* Example content can be imported with [these database queries](https://github.com/SnowdogApps/create-alpaca-theme/blob/master/templates/database/queries.sql). +* Example content can be imported with [these database queries](https://github.com/SnowdogApps/create-alpaca-theme/blob/master/src/database/queries.sql). * See default structure [here](https://github.com/SnowdogApps/magento2-alpaca-theme/tree/master/Magento_Theme/layout/default.xml). ## Menu From 31628c6e4fcb15b8f5fd6166877a4925e44dfe1a Mon Sep 17 00:00:00 2001 From: Ola Date: Fri, 29 Jul 2022 18:46:46 +0200 Subject: [PATCH 2/5] Fix link --- docs/.vitepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js index 456e86d7a..35fd3718d 100644 --- a/docs/.vitepress/config.js +++ b/docs/.vitepress/config.js @@ -11,7 +11,7 @@ module.exports = { editLinkText: 'Edit this page on GitHub', lastUpdated: 'Last Updated', nav: [ - { text: 'Guide', link: '/guide', activeMatch: '^/$|^/guide/' }, + { text: 'Guide', link: '/guide/', activeMatch: '^/$|^/guide/' }, { text: "Contact", link: "https://snow.dog/contact" }, ], sidebar: { From 5b0f2e5a6fdadb3c6297f3f8da49fbca72b9b8b8 Mon Sep 17 00:00:00 2001 From: Henk Valk Date: Tue, 16 Aug 2022 17:43:11 +0200 Subject: [PATCH 3/5] Update alpaca-setup-guide.md Typo in Module name --- docs/guide/getting-started/alpaca-setup-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/getting-started/alpaca-setup-guide.md b/docs/guide/getting-started/alpaca-setup-guide.md index ce39013c3..5a6b4ab36 100644 --- a/docs/guide/getting-started/alpaca-setup-guide.md +++ b/docs/guide/getting-started/alpaca-setup-guide.md @@ -294,7 +294,7 @@ You can create also `README.md` and `CHANGELOG.md` files. ``` 5. Create Components - 1. Copy (`vendor/snowdog/theme-frontend-alpaca/Snwodog_Components`) files: + 1. Copy (`vendor/snowdog/theme-frontend-alpaca/Snowdog_Components`) files: * `.browserslistrc` * `.editorconfig` * `.eslintignore` From 856c93e84303965e927df117ae044374a78d3f85 Mon Sep 17 00:00:00 2001 From: Ola Date: Thu, 1 Sep 2022 19:18:06 +0200 Subject: [PATCH 4/5] Fix broken template --- Magento_Msrp/web/template/product/price/price_box.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Magento_Msrp/web/template/product/price/price_box.html b/Magento_Msrp/web/template/product/price/price_box.html index 7a4a6a4c4..30d2102c1 100644 --- a/Magento_Msrp/web/template/product/price/price_box.html +++ b/Magento_Msrp/web/template/product/price/price_box.html @@ -19,7 +19,7 @@ class="price-wrapper" data-price-amount="" data-price-type="" - html="getMsrpPriceUnsanitizedHtml($row()) + html="getMsrpPriceUnsanitizedHtml($row())" > From eea3818d97887a1cab23d1a0c2b9d40ca158bcd0 Mon Sep 17 00:00:00 2001 From: Ola Date: Thu, 1 Sep 2022 19:19:36 +0200 Subject: [PATCH 5/5] bump ver 2.28.1 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b0d66c3f..ced2bd48d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ USE GITHUB ISSUE/PULL REQUEST NUMBERS, NOT INTERNAL ONE ### Updated ## [Released] +## [2.28.1] - 2022-09-01 +### Fixed +- broken `Magento_Msrp/web/template/product/price/price_box.html` template (add missing quote) ## [2.28.0] - 2022-08-23 ### Added - some component variables (#567)