Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

UI: squared design, action buttons inside gallery #440

Merged
merged 11 commits into from
Jul 4, 2022
Merged

UI: squared design, action buttons inside gallery #440

merged 11 commits into from
Jul 4, 2022

Conversation

andi34
Copy link
Owner

@andi34 andi34 commented Jun 5, 2022

Prerequisites checklist

What is the purpose of this pull request? (put an "x" next to an item)

  • Allow taking pictures from gallery
  • Other, please explain: new design

What changes did you make? (Give an overview)

Adapted new style by @Moarqi and adjusted for Photobooth integration to be optional available via admin panel.
Adapted changes for action buttons inside gallery, made available where needed.

Is there anything you'd like reviewers to focus on?

@andi34
Copy link
Owner Author

andi34 commented Jun 5, 2022

While on it, To-Do:

  • rounded edges inside gallery for modern theme
  • add color changes from @Moarqi and make squared the default theme for next release?

gallery.php Outdated Show resolved Hide resolved
template/gallery.template.php Outdated Show resolved Hide resolved
@andi34 andi34 force-pushed the ui/squared branch 3 times, most recently from 1857d5d to f3cc6b2 Compare June 8, 2022 05:12
src/sass/modern_admin.scss Outdated Show resolved Hide resolved
src/sass/modern_admin.scss Outdated Show resolved Hide resolved
andi34 added 11 commits July 4, 2022 22:42
Adapted changes by Markus Rothgaenger from https://github.com/Moarqi/photobooth

Optimized integration to only be visible on main page while be hidden on
standalone gallery and at livechroma.

Change-Id: I322f6575a8a93b9705d79e8b9650391b4a54eefb
Change-Id: I5f2164ea37b6d2d56480cf6c4752b5f684979e87
Change-Id: Icd52cb150abe80efed47f1ecf69bd678ca740fb1
Change-Id: Ifa029301b9526925b3f9ef122963155eb1ccda0a
Adapted changes from:
- mmrrqq@f762fc4
- mmrrqq@6f5c5c8

Changes by Andreas Blaesius:
- code rewritten to be optional available via admin panel
- adjusted scss files from custom_ to modern_squared
- use modern stylesheets via import function

Change-Id: I8836455b0ccb0bfe6bf3f95a34fab3083433b7a9
Change-Id: I9098dcb8a50e0ef3c8716876b0e9f058380c3989
Change-Id: I2a44a87d11ee485726104c6de0359574a8a5ebe9
Change-Id: I28cd5ef516eae4df07b087fb6d9467ad6b5782f1
Change-Id: If2a2ffb1e7fbaeac098dd819cd181f2dc6908e82
Change-Id: I2073a9b711c618d57b2888cc1a16427adfcec088
Change-Id: I297a5df4f611818d2a02e66623030d5b2f90d0b6
@andi34 andi34 merged commit b5fbd9f into dev Jul 4, 2022
@andi34 andi34 deleted the ui/squared branch July 4, 2022 20:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant