Skip to content

Commit

Permalink
Merge remote-tracking branch 'local/starter-kit' into gh-pages
Browse files Browse the repository at this point in the history
# Conflicts:
#	#jekyll-theme-hydejack
#	_config.yml
  • Loading branch information
qwtel committed Sep 4, 2024
2 parents 20f7362 + a5ab454 commit 2d94bb4
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
_gh_pages
_site
_drafts
.ruby-version

# Numerous always-ignore extensions
*.diff
Expand Down Expand Up @@ -45,6 +44,7 @@ vendor
.jekyll-metadata
.jekyll-cache
*.gem
Gemfile.lock
_zip
/stats.json
/dist
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.2
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ sitemap: false
* this list will be replaced by the toc
{:toc .large-only}

## v9.1.7
Sep 04 2024
{:.heading.post-date}

* Fixed deprecation warnings
* Updated Ruby dependencies
* Fixed browser chrome (e.g. scrollbar) not matching dark mode

## v9.1.6
Feb 07 2022
{:.heading.post-date}
Expand Down
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ exclude:
- vendor
- Gemfile
- Gemfile.lock
- .ruby-lsp
include:
- .well-known
- LICENSE.md
Expand Down
1 change: 1 addition & 0 deletions _includes/my-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- Add HTML tags here to be included in the head -->
30 changes: 2 additions & 28 deletions _includes/table.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@ The table below shows what's included in each version:
| No Hydejack Branding | | &#x2714; |
| License | [GPL-3.0][lic] | [PRO] |
| Source | [GitHub][src] | Included |
| __Price__ | __Free__ | <span class="price"><del>$99</del> <strong class="new-price">$69</strong> <small>One-Time Payment</small></span> [^22] |
| __Price__ | __Free__ | __$99__ <small>One-Time Payment</small> [^22] |
|===============================+=====================+=====================|
| | [__Download__][kit] | [__Buy PRO__][buy]{:.gumroad-button data-gumroad-single-product="true"} |
{:.stretch-table.dl-table}

[^21]: Large screens (> 1664px width) only.

[^22]: Price now permanently reduced by <strong class="discount">30%</strong>! Use the offer code <strong class="code">QR0TW8M</strong> to apply this discount later.
{:.ppi}
If you're upgrading from Hydejack 8, find your upgrade discount code in the latest zip download.
[^22]: Discounts may apply, check [Gumroad][buy]{:data-gumroad-single-product="true"} for up-to-date pricing.

<script type="module">
document.querySelectorAll('a[href="#_search-input"]').forEach(el => {
Expand All @@ -40,28 +38,4 @@ The table below shows what's included in each version:
el.dataset.done = '';
}
});

document.querySelectorAll('.ppi').forEach(async el => {
if (!el.dataset.done) {
const { name, emoji, code, discount } = await window._ppiData;
if (!code) return;
el.querySelectorAll('.name').forEach(el => { el.innerText = name });
el.querySelectorAll('.emoji').forEach(el => { el.innerText = emoji; el.title = name });
el.querySelectorAll('.code').forEach(el => { el.innerText = code.toUpperCase() });
el.querySelectorAll('.discount').forEach(el => { el.innerText = `${discount * 100}%` });
el.dataset.done = '';
}
});

document.querySelectorAll('.price').forEach(async el => {
if (!el.dataset.done) {
const { name, emoji, code, discount } = await window._ppiData;
if (!code) return;
el.querySelectorAll('.name').forEach(el => { el.innerText = name });
el.querySelectorAll('.emoji').forEach(el => { el.innerText = emoji; el.title = name });
el.querySelectorAll('.code').forEach(el => { el.innerText = code.toUpperCase() });
el.querySelectorAll('.new-price').forEach(el => { el.innerText = `$${99 - discount * 100}` });
el.dataset.done = '';
}
});
</script>
2 changes: 1 addition & 1 deletion docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ author:
social:
email: [email protected]
rss: {{ site.url }}{{ site.baseurl }}/feed.xml # make sure you provide an absolute URL
download: https://github.com/hydecorp/hydejack/archive/v9.1.6.zip
download: https://github.com/hydecorp/hydejack/archive/v9.1.7.zip
~~~


Expand Down
4 changes: 2 additions & 2 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ You can now also [![Deploy to Netlify][dtn]][nfy]{:.no-mark-external} directly.
{:.note}

[hsc]: https://github.com/hydecorp/hydejack-starter-kit
[src]: https://github.com/hydecorp/hydejack-starter-kit/archive/v9.1.6.zip
[src]: https://github.com/hydecorp/hydejack-starter-kit/archive/v9.1.7.zip
[nfy]: https://app.netlify.com/start/deploy?repository=https://github.com/hydecorp/hydejack-starter-kit
[dtn]: https://www.netlify.com/img/deploy/button.svg

Expand Down Expand Up @@ -93,7 +93,7 @@ For existing sites, you can instead set the `remote_theme` key as follows:

```yml
# file: `_config.yml`
remote_theme: hydecorp/[email protected].6
remote_theme: hydecorp/[email protected].7
```
Make sure the `plugins` list contains `jekyll-include-cache` (create if it doesn't exist):
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ and you have to apply them again. Make sure you've made a backup before overwrit
When building on GitHub Pages, upgrading Hydejack is as simple as setting the `remote_theme` key in `_config.yml` to the desired version.

```yml
remote_theme: hydecorp/[email protected].6
remote_theme: hydecorp/[email protected].7
```
To use the latest version on the `v9` branch on each build, you can use `hydecorp/hydejack@v9`.
Expand Down

0 comments on commit 2d94bb4

Please sign in to comment.