Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modern images: captions, alternative formats, optional page bundles #206

Merged
merged 78 commits into from
Nov 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b9aa22e
Fixing line endings
rootwork Aug 24, 2021
cb04d9a
Adding image markup render override
rootwork Aug 25, 2021
8c0d8bf
Removing image captioning from JS
rootwork Aug 25, 2021
337b465
Changing CSS classes to match current style
rootwork Aug 25, 2021
3a3dbcb
Adding options for JPEG, GIF; formatting code with inline comments
rootwork Aug 25, 2021
9d02cb5
Attempt fix for JPEG options
rootwork Aug 25, 2021
b2ec1e4
Attempt fix for JPEG options
rootwork Aug 25, 2021
7dcb395
Attempt fix for JPEG options
rootwork Aug 25, 2021
e95e939
Simplifying image srcset swap
rootwork Aug 25, 2021
7f92ae9
Attempt fix for JPEG options
rootwork Aug 25, 2021
9ab30ef
Attempt fix for JPEG options
rootwork Aug 25, 2021
4b62430
Attempt fix for JPEG options
rootwork Aug 25, 2021
338e1ec
Attempt fix for JPEG options
rootwork Aug 25, 2021
4603481
Attempt fix for JPEG options
rootwork Aug 25, 2021
d7d802b
Attempt fix for JPEG options
rootwork Aug 25, 2021
5068460
Change caption to be based on image title text, not image alt text
rootwork Aug 25, 2021
6a06b52
Attempt fix for JPEG options
rootwork Aug 25, 2021
afebc13
Trying a simpler format for srcset swapping
rootwork Aug 25, 2021
76423b2
Attempting without imageConfig insert
rootwork Aug 25, 2021
5b4fbc2
Attempting to fix eval error
rootwork Aug 25, 2021
a738163
Attempting to fix eval error
rootwork Aug 25, 2021
20d0832
Attempting to fix eval error
rootwork Aug 25, 2021
63eb417
Attempting to fix eval error
rootwork Aug 25, 2021
d9945c0
Attempting to fix eval error
rootwork Aug 25, 2021
28cb2e2
Attempting to fix eval error
rootwork Aug 25, 2021
6470684
Attempting to fix eval error
rootwork Aug 25, 2021
8f3a01f
Attempting to fix eval error
rootwork Aug 25, 2021
6391326
Attempting to fix eval error
rootwork Aug 25, 2021
486ed4f
Attempting to fix eval error
rootwork Aug 25, 2021
a75df55
Attempting to fix eval error
rootwork Aug 25, 2021
63d3f8d
Cleanup
rootwork Aug 25, 2021
9e6866f
Cleanup
rootwork Aug 25, 2021
e6e2051
Correcting internal class name
rootwork Aug 25, 2021
24b9185
Attempting to fix some images not loading
rootwork Aug 25, 2021
27115d8
Attempting to fix some images not loading
rootwork Aug 25, 2021
f48793a
Attempting to fix some images not loading
rootwork Aug 25, 2021
dbb2e71
Attempting to fix some images not loading
rootwork Aug 25, 2021
3ffa282
Revert "Removing image captioning from JS"
rootwork Aug 25, 2021
3a3a818
Switching back to long version to compare
rootwork Aug 26, 2021
6fe195b
Correct replacement of :inline in img alt text
rootwork Aug 26, 2021
610d784
Editing imagePosition to work with figcaptions...
rootwork Aug 26, 2021
9897a54
Editing imagePosition to work with figcaptions...
rootwork Aug 26, 2021
4f0a32e
Editing imagePosition to work with figcaptions...
rootwork Aug 26, 2021
2254568
Correct isInline to match modifiers
rootwork Aug 26, 2021
8e60794
Moves img_alt styles to figcaption
rootwork Aug 26, 2021
52c80ae
Figcaption has no padding by default, so removing
rootwork Aug 26, 2021
a2c9f90
Floating entire figure, rather than image alone
rootwork Aug 26, 2021
37a3061
Inline also applies to entire figure
rootwork Aug 26, 2021
668d36f
Clarifying classes vs alignment
rootwork Aug 26, 2021
be5e748
Wrapping all post sections in classed divs
rootwork Aug 26, 2021
482cfaf
Adding featured image partial
rootwork Aug 26, 2021
2a64742
Adding featured image partial
rootwork Aug 26, 2021
3d37c3f
Adding features of rendered-image to featured image; adding featured …
rootwork Aug 26, 2021
d6f1ac5
Updating Sass for featured images
rootwork Aug 26, 2021
31ea41b
Enable scalable images to scale the entire figure, with caption
rootwork Aug 26, 2021
8f65e62
featured-image -> image-feature, to match name of variable
rootwork Aug 26, 2021
42b7889
Adding image thumbnail partial, updating styles
rootwork Aug 27, 2021
84d0bcf
Remove async from external images
rootwork Aug 27, 2021
b5274b7
Update opengraph partial to get full path to images
rootwork Aug 27, 2021
0b906ef
Give thumbnail images additional data from imageConfig
rootwork Aug 27, 2021
630ebb0
Adding modern image format options to thumbnail partial
rootwork Aug 27, 2021
f0fe23c
Aligning image-feature and image-thumbnail partials
rootwork Aug 27, 2021
4d5b0d2
Simplifying render-image loop
rootwork Aug 27, 2021
7c5e944
Adding switch for using/not using page bundles with images
rootwork Aug 27, 2021
6f7190c
Aligning post archetype and the one in exampleSite
rootwork Aug 28, 2021
6be4f01
Adding usePageBundles check to excerpt partial
rootwork Aug 28, 2021
571d2dc
Adding usePageBundles check and fileExists check to render-image hook
rootwork Aug 28, 2021
ac78206
Fixing line endings...?
rootwork Aug 28, 2021
651d3eb
Adding fileExists checks to thumbnails and featured images
rootwork Aug 29, 2021
07ed986
Adding error messages when images are not found
rootwork Aug 29, 2021
18304f7
Update docs with new image and site options
rootwork Aug 29, 2021
0c9741e
Fix errant /div
rootwork Aug 29, 2021
02cd65c
Correct display of bundle status when unset
rootwork Aug 29, 2021
cca5add
Clarifying use of usePageBundles in readme
rootwork Aug 29, 2021
82a0bf9
Adding translations of error text
rootwork Aug 30, 2021
1746628
Removing duplicate featureImage setting
rootwork Oct 21, 2021
6d8937e
Correcting link to example script
rootwork Oct 21, 2021
d1a1054
fix regression
onweru Nov 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
name: Azure Static Web Apps CI/CD
on:
push:
branches:
- Clarity
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- Clarity
jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_04F2B6C03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "public" # Built app content directory - optional
###### End of Repository/Build Configurations ######
close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_04F2B6C03 }}
action: "close"
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- Clarity
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- Clarity

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_04F2B6C03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "public" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AGREEABLE_WAVE_04F2B6C03 }}
action: "close"
90 changes: 45 additions & 45 deletions .github/workflows/azure-static-web-apps-jolly-flower-06110ad10.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
name: Azure Static Web Apps CI/CD
on:
push:
branches:
- Clarity
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- Clarity
jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_FLOWER_06110AD10 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "public" # Built app content directory - optional
###### End of Repository/Build Configurations ######
close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_FLOWER_06110AD10 }}
action: "close"
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- Clarity
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- Clarity

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_FLOWER_06110AD10 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "public" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_FLOWER_06110AD10 }}
action: "close"
90 changes: 45 additions & 45 deletions .github/workflows/azure-static-web-apps-lively-sky-064a5cc03.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
name: Azure Static Web Apps CI/CD
on:
push:
branches:
- Clarity
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- Clarity
jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_SKY_064A5CC03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/exampleSite" # App source code path
api_location: "" # Api source code path - optional
output_location: "public" # Built app content directory - optional
###### End of Repository/Build Configurations ######
close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_SKY_064A5CC03 }}
action: "close"
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- Clarity
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- Clarity

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_SKY_064A5CC03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/exampleSite" # App source code path
api_location: "" # Api source code path - optional
output_location: "public" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_SKY_064A5CC03 }}
action: "close"
38 changes: 19 additions & 19 deletions .vscode/clarity.code-snippets
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"Add Hugo Notice": {
"scope": "markdown",
"prefix": "note",
"body": [
"{{% notice ${1|note,info,tip,warning|} ${2:title} %}}",
"$3",
"{{% /notice %}}"
],
"description": "create note"
},
"Add Hugo Reference": {
"scope": "markdown",
"prefix": "ref",
"body": [
"{{< ref \"$1\" >}}"
],
"description": "create local ref link"
},
{
"Add Hugo Notice": {
"scope": "markdown",
"prefix": "note",
"body": [
"{{% notice ${1|note,info,tip,warning|} ${2:title} %}}",
"$3",
"{{% /notice %}}"
],
"description": "create note"
},
"Add Hugo Reference": {
"scope": "markdown",
"prefix": "ref",
"body": [
"{{< ref \"$1\" >}}"
],
"description": "create local ref link"
},
}
Loading