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

Styleguide and vrt improvements #40

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,17 @@
"editor.tabSize": 2
},
"extensions": [
"xdebug.php-debug",
"bmewburn.vscode-intelephense-client",
"mrmlnc.vscode-apache",
"streetsidesoftware.code-spell-checker",
"EditorConfig.EditorConfig",
"ms-azuretools.vscode-docker",
"yzhang.markdown-all-in-one",
"bradlc.vscode-tailwindcss",
"github.vscode-github-actions"
]
"xdebug.php-debug",
"bmewburn.vscode-intelephense-client",
"mrmlnc.vscode-apache",
"streetsidesoftware.code-spell-checker",
"EditorConfig.EditorConfig",
"ms-azuretools.vscode-docker",
"yzhang.markdown-all-in-one",
"bradlc.vscode-tailwindcss",
"github.vscode-github-actions",
"GitHub.vscode-pull-request-github"
]
}
}
}
19 changes: 8 additions & 11 deletions .github/workflows/capture.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
name: Capture Theme Changes
run-name: Capturing visual reference 👓
on: []
on: [push]
permissions:
contents: write
jobs:
Capture-Reference:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Execute backstop reference
- name: Docker compose up
run: |
docker compose run backstop reference --config=/config.js
- name: Commit results
docker compose up
- name: Execute backstop reference
run: |
if [[ `git status --porcelain` ]]; then
git config --global user.name '${{ github.actor }}'
git config --global user.email '${{ github.actor }}@users.noreply.github.com'
git add --all .ops/output/vrt/*
git commit -am "Automated reference image capture by Github Actions"
git push
fi
docker compose exec backstop reference --config=/config.js
- uses: EndBug/add-and-commit@v9
with:
add: .ops/output/vrt
1 change: 1 addition & 0 deletions .ops/backstop.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ module.exports = {
.split(/\n/)
.forEach((line) => {
parts = line.split(',').map(str => str.trim());
console.log(line);
if (!parts || parts[0]?.startsWith('#') || !parts?.[1])
return;

Expand Down
Binary file added .ops/output/vrt/approved/Colors--desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .ops/output/vrt/approved/Colors--mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Header_Menus--desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Header_Menus--mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Home--desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Home--mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Long_Menus--desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Long_Menus--mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Menus--desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .ops/output/vrt/approved/Menus--mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion .ops/release/get-name.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# A script to make a memorable name from a 2 byte hex string.
# usage: get-name.sh ${git git rev-parse --short=2 HEAD}

readarray -t adjectives <<< '\
abecedarian
adorable
Expand Down Expand Up @@ -521,5 +524,4 @@ num=${1:-$(openssl rand -hex 2)}
adj=$((16#${num:0:2}));
nou=$((16#${num:2:4}));

echo $num;
echo "${adjectives[$adj]}-${nouns[$nou]}";
9 changes: 5 additions & 4 deletions .ops/urls.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Title Path
Header Menus, /, clickMenu.js
Home, /
Menus, /menus
Long Menus, /menus/long
Colors, /decanter_help/styleguide/colors
Header Menus, /, clickMenu.js
Home, /
Menus, /menus
Long Menus, /menus/long
2 changes: 1 addition & 1 deletion containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN\
&& util "reset-db" "mariadb -h db --user=root --password=root -e 'DROP DATABASE IF EXISTS app; CREATE DATABASE app'" \
&& util "reset-app" "rm -rf /var/www/html/files/config*;" \
&& util "fix-perms" "chown --quiet -R www-data:www-data /var/www/html;" \
&& util "install-app" "reset-db && reset-app && si && bd -y cim && fix-perms && uli;"
&& util "install-app" "reset-db && reset-app && si && bd -y cim && fix-perms && cr && uli;"


# Download backdrop and bee
Expand Down
Loading
Loading