[wip]: pr for testing auto deployment to multi env #1723
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat: new header Created new header: -Responsive -Dark Mode -Language Switch (Not fully tested) -Accessible * feat(frontend/base): add internetnl branding check * fix: header css lint errors and added scroll option when expanded mobile menu doesnt fit vertically * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix * fix: header wijzigingen Wijzigingen: -Betere toegankelijkheid dmv rem waardes en aria attributes -Hover en active states van menu links en logo -Border bottom op header wanneer ie sticky is -transities voor in en uitklappen van subnav/mobile nav -mobile menu gemaakt volgens ontwerp * fix: header bug fix * fix: header color fix * fix: header animatie bug * fix: header variable names, feedback menno * fix: header small fix --------- Co-authored-by: Menno ter Laak <[email protected]>
* feat: new header Created new header: -Responsive -Dark Mode -Language Switch (Not fully tested) -Accessible * fix: button width and close menu with esc * Update global.css * feat: new footer * feat(frontend/base): add internetnl branding check * fix: header css lint errors and added scroll option when expanded mobile menu doesnt fit vertically * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix * fix: header wijzigingen Wijzigingen: -Betere toegankelijkheid dmv rem waardes en aria attributes -Hover en active states van menu links en logo -Border bottom op header wanneer ie sticky is -transities voor in en uitklappen van subnav/mobile nav -mobile menu gemaakt volgens ontwerp * fix: header bug fix * fix: header color fix * fix: header animatie bug * fix: footer changes * fix: header variable names, feedback menno * fix: footer variable changes and hover states * fix: footer padding * Update base.html --------- Signed-off-by: Khdulkadir <[email protected]> Co-authored-by: Menno ter Laak <[email protected]>
* feat: new header Created new header: -Responsive -Dark Mode -Language Switch (Not fully tested) -Accessible * fix: button width and close menu with esc * Update global.css * feat: new footer * feat: test section homepage * feat: waarom testen sectie * feat: hall of fame sectie * Update base.html * feat: about sectie * fix: about section image links * fix: made hall of fame dynamic * feature: nieuws sectie * fix: hall of fame li height * fix: nieuws sectie fix * feat: faq sectie * feat(frontend/base): add internetnl branding check * fix: header css lint errors and added scroll option when expanded mobile menu doesnt fit vertically * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix * fix: header wijzigingen Wijzigingen: -Betere toegankelijkheid dmv rem waardes en aria attributes -Hover en active states van menu links en logo -Border bottom op header wanneer ie sticky is -transities voor in en uitklappen van subnav/mobile nav -mobile menu gemaakt volgens ontwerp * fix: header bug fix * fix: header color fix * fix: header animatie bug * Create package-lock.json.bak * . * fix: explanation update * . * fix: explanation section add carrousel dots * fix: footer changes * fix: test section changes * fix: hall of fame changes * fix: news section * fix: faq changes * fix: faq changes * fix: faq * fix: header variable names, feedback menno * fix: footer variable changes and hover states * fix: explanation sectie hover en variables * fix: explanation padding * Update base.html * fix: hall of fame variables and lint * fix: about section hover and variables * fix: news section variables and hover * fix: faq variables and transition * feat: test site pagina * fix: test site pagina padding --------- Signed-off-by: Khdulkadir <[email protected]> Co-authored-by: Menno ter Laak <[email protected]>
* feat: new header Created new header: -Responsive -Dark Mode -Language Switch (Not fully tested) -Accessible * fix: button width and close menu with esc * Update global.css * feat: new footer * feat: test section homepage * feat: waarom testen sectie * feat: hall of fame sectie * Update base.html * feat: about sectie * fix: about section image links * fix: made hall of fame dynamic * feature: nieuws sectie * fix: hall of fame li height * fix: nieuws sectie fix * feat: faq sectie * feat(frontend/base): add internetnl branding check * fix: header css lint errors and added scroll option when expanded mobile menu doesnt fit vertically * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix * fix: header wijzigingen Wijzigingen: -Betere toegankelijkheid dmv rem waardes en aria attributes -Hover en active states van menu links en logo -Border bottom op header wanneer ie sticky is -transities voor in en uitklappen van subnav/mobile nav -mobile menu gemaakt volgens ontwerp * fix: header bug fix * fix: header color fix * fix: header animatie bug * Create package-lock.json.bak * . * fix: explanation update * . * fix: explanation section add carrousel dots * fix: footer changes * fix: test section changes * fix: hall of fame changes * fix: news section * fix: faq changes * fix: faq changes * fix: faq * fix: header variable names, feedback menno * fix: footer variable changes and hover states * fix: explanation sectie hover en variables * fix: explanation padding * Update base.html * fix: hall of fame variables and lint * fix: about section hover and variables * fix: news section variables and hover * fix: faq variables and transition * feat: test site pagina * fix: test site pagina padding * feat: test mail pagina * feat: test connection page * fix: grote refactor om herbruikbaarheid te verbeteren * fix: restructured css * fix: added skip link * fix: commented old code * fix: transition faq item * fix: select element appearance none * fix: updated faq bg --------- Signed-off-by: Khdulkadir <[email protected]> Co-authored-by: Menno ter Laak <[email protected]>
* feat: new header Created new header: -Responsive -Dark Mode -Language Switch (Not fully tested) -Accessible * fix: button width and close menu with esc * Update global.css * feat: new footer * feat: test section homepage * feat(frontend/base): add internetnl branding check * fix: header css lint errors and added scroll option when expanded mobile menu doesnt fit vertically * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix mobile menu * fix: header bug fix * fix: header wijzigingen Wijzigingen: -Betere toegankelijkheid dmv rem waardes en aria attributes -Hover en active states van menu links en logo -Border bottom op header wanneer ie sticky is -transities voor in en uitklappen van subnav/mobile nav -mobile menu gemaakt volgens ontwerp * fix: header bug fix * fix: header color fix * fix: header animatie bug * fix: footer changes * fix: test section changes * fix: header variable names, feedback menno * fix: footer variable changes and hover states * fix: test section padding * Update base.html --------- Signed-off-by: Khdulkadir <[email protected]> Co-authored-by: Menno ter Laak <[email protected]>
- Also fix live-tests
aequitas
force-pushed
the
bikkelhart-redesign-dev3
branch
from
1bf0b2d to
4762481
Compare
* fix: changed logo inline svg to img * fix: added close mobile nav on escape keypress * fix: added layers.css to fix specificity issues * fix: support for cascade layers geinstalleerd voor postcss * fix: refactoring cards * fix: small fixes * fix: small accessibility fixes * w3c html validator * lighthouse test * screenreader test * Update index.html * fix add node modules to ignore * fix remove cached node modules
* fix: changed logo inline svg to img * fix: added close mobile nav on escape keypress * fix: added layers.css to fix specificity issues * fix: support for cascade layers geinstalleerd voor postcss * fix: refactoring cards * fix: small fixes * fix: small accessibility fixes * w3c html validator * lighthouse test * screenreader test * Update index.html * fix add node modules to ignore * fix remove cached node modules * fix: kennisbank pagina first section * feature: kennisbank pagina --------- Signed-off-by: Khdulkadir <[email protected]>
* fix: changed logo inline svg to img * fix: added close mobile nav on escape keypress * fix: added layers.css to fix specificity issues * fix: support for cascade layers geinstalleerd voor postcss * fix: refactoring cards * fix: small fixes * fix: small accessibility fixes * w3c html validator * lighthouse test * screenreader test * Update index.html * fix add node modules to ignore * fix remove cached node modules * fix: kennisbank pagina first section * feature: kennisbank pagina * feature nieuws pagina --------- Signed-off-by: Khdulkadir <[email protected]>
* fix: changed logo inline svg to img * fix: added close mobile nav on escape keypress * fix: added layers.css to fix specificity issues * fix: support for cascade layers geinstalleerd voor postcss * fix: refactoring cards * fix: small fixes * fix: small accessibility fixes * w3c html validator * lighthouse test * screenreader test * Update index.html * fix add node modules to ignore * fix remove cached node modules * fix: kennisbank pagina first section * feature: kennisbank pagina * feature nieuws pagina * feature about pagina
aequitas
force-pushed
the
bikkelhart-redesign-dev3
branch
from
bf911e7 to
6a31a73
Compare
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
2 times, most recently
from
d6bc7dc to
805ef59
Compare
git remote add bikkelhart [email protected]:bikkelhart/internet-nl.git git fetch bikkelhart git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations git reset HEAD frontend/js/{functions.js,headroom.js} frontend/css/print.css interface/static/[email protected]_0x45028563.asc interface/templates/{base-probe,connection}.html git restore frontend/js/{functions.js,headroom.js} frontend/css/print.css interface/static/[email protected]_0x45028563.asc interface/templates/{base-probe,connection}.html sed -i "22i\ <script type=\"text/javascript\" src=\"{% static 'js/headroom-min.js' %}\"></script>" interface/templates/base.html sed -i 's@Score laden voor:@{% include "string.html" with name="base_probe_score_loading_newstring" %}@' interface/templates/base-probe.html sed -i "5i\ <script type=\"text/javascript\" src=\"{% static 'js/functions-min.js' %}\"></script>" interface/templates/connection.html git add interface/templates/*.html git rev-parse bikkelhart/bikkelhart-redesign
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
from
805ef59 to
f4639a2
Compare
Signed-off-by: Benjamin W. Broersma <[email protected]>
…sing a separate target/image makes config to complicated for the MB's saved.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
4 times, most recently
from
4360bab to
760d6b1
Compare
git fetch bikkelhart
git fetch internetnl
git merge -X theirs internetnl/main
git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
git checkout --no-overlay main -- interface/static/[email protected]_0x45028563.asc
convert -resize 48x48 interface/static/favicon.{png,ico}
git add interface/static/favicon.ico
git rm package{,-lock}.json
# manual merge of docker/Dockerfile, docker/compose.development.yaml, fix .gitignore, note: changed *.js copy and base template
git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
from
760d6b1 to
db3be51
Compare
git fetch bikkelhart
git merge -X theirs internetnl/main
git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
git checkout --no-overlay main -- interface/static/[email protected]_0x45028563.asc
convert -resize 48x48 interface/static/favicon.{png,ico}
git add interface/static/favicon.ico
git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
from
a59f746 to
4fcee28
Compare
git fetch bikkelhart
git merge -X theirs internetnl/main
git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
git checkout --no-overlay main -- interface/static/[email protected]_0x45028563.asc
convert -resize 48x48 interface/static/favicon.{png,ico}
git add interface/static/favicon.ico
git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
git fetch bikkelhart
git merge -X theirs internetnl/main
git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
git checkout --no-overlay main -- interface/static/[email protected]_0x45028563.asc interface/templates/statistics.html
convert -resize 48x48 interface/static/favicon.{png,ico}
git add interface/static/favicon.ico
git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
git fetch bikkelhart git merge -X theirs internetnl/main git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations git checkout --no-overlay main -- interface/static/[email protected]_0x45028563.asc interface/templates/statistics.html convert -resize 48x48 interface/static/favicon.{png,ico} git add interface/static/favicon.ico git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
from
3996fc3 to
68f3520
Compare
git fetch bikkelhart
git fetch internetnl
git merge -X theirs internetnl/main
git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
git checkout --no-overlay main -- interface/static/[email protected]_0x45028563.asc interface/templates/statistics.html
find translations -name 'main.po' -type f | xargs -L1 bash -c 'msgcat --no-wrap "$0" <(git show internetnl/main:"$0") | sponge "$0"'
convert -resize 48x48 interface/static/favicon.{png,ico}
git add interface/static/favicon.ico
git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
bwbroersma
force-pushed
the
bikkelhart-redesign-dev3
branch
from
68f3520 to
686a906
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.