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

ui: rework UI style handling, make UI and button style independent #442

Merged
merged 18 commits into from
Jul 10, 2022
Merged

ui: rework UI style handling, make UI and button style independent #442

merged 18 commits into from
Jul 10, 2022

Conversation

andi34
Copy link
Owner

@andi34 andi34 commented Jun 8, 2022 •
edited
Loading

Prerequisites checklist

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

  • New feature
    • allow to choose a button style independent of UI style
  • Other, please explain:
    • make general button styles available for all UI styles
    • move general definitions to its own partial (shutter, video preview, countdown)
    • add logo to cups button on classic theme
    • change take picture and take collage order on classic theme
    • apply UI and Button style on more places
    • remove highlight color from squared button background

What changes did you make? (Give an overview)

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

To-do: create classic rounded button style

@andi34 andi34 force-pushed the ui/rework-scss branch 2 times, most recently from f2ab21a to 3693101 Compare June 8, 2022 06:05
@andi34 andi34 force-pushed the ui/squared branch 2 times, most recently from 920f431 to ae8f0be Compare June 9, 2022 19:31
andi34
andi34 commented Jun 20, 2022
View reviewed changes
dependencies.php Outdated Show resolved Hide resolved
@andi34 andi34 force-pushed the ui/rework-scss branch 5 times, most recently from 9b2a07e to b4bbf50 Compare June 22, 2022 19:20
@andi34 andi34 force-pushed the ui/rework-scss branch 3 times, most recently from b4d2bb2 to a7d3267 Compare July 4, 2022 20:05
@andi34 andi34 changed the base branch from ui/squared to dev July 4, 2022 20:48
@andi34 andi34 changed the title Rework scss handling ui: rework UI style handling, make UI and button style independent Jul 4, 2022
andi34
andi34 commented Jul 5, 2022
View reviewed changes
admin/index.php Outdated Show resolved Hide resolved
andi34
andi34 commented Jul 5, 2022
View reviewed changes
admin/index.php Outdated Show resolved Hide resolved
andi34
andi34 commented Jul 5, 2022
View reviewed changes
src/js/gallery.js Outdated Show resolved Hide resolved
src/js/gallery.js Outdated Show resolved Hide resolved
src/sass/classic_admin.scss Outdated Show resolved Hide resolved
src/sass/classic_live_chromakeying.scss Show resolved Hide resolved
src/sass/manual.scss Outdated Show resolved Hide resolved
src/sass/manual.scss Outdated Show resolved Hide resolved
src/sass/partials/_gallery.scss Outdated Show resolved Hide resolved
andi34
andi34 commented Jul 6, 2022
View reviewed changes
admin/index.php Outdated Show resolved Hide resolved
admin/index.php Outdated Show resolved Hide resolved
lib/configsetup.inc.php Outdated Show resolved Hide resolved
src/sass/classic_live_chromakeying.scss Outdated Show resolved Hide resolved
@andi34 andi34 force-pushed the ui/rework-scss branch 3 times, most recently from 1070622 to 8be5804 Compare July 6, 2022 19:36
@andi34 andi34 force-pushed the ui/rework-scss branch 4 times, most recently from a40ef1b to 42964e7 Compare July 7, 2022 14:22
andi34 added 13 commits July 7, 2022 21:03
@andi34
Adapt dark UI style from Markus Rothgaenger
adbd9b9 
adjusted colors in more places

Change-Id: Id57fbb5555e5f3cefa4a1846fbef4f60ba570127
@andi34
sass: move more basic definitions
58fe4c5 
Change-Id: I9df6e6f26d8f8fd1b863e34319a6afbe59127a14
@andi34
UI(scss): move shutter animation style to it's own partial
1e0cbd9 
Change-Id: I0eb5f085134268d8424e7991393767ed0a8babcd
@andi34
UI(scss): move preview styles to it's own partial
23037eb 
Change-Id: Iec50688d1eea424fb4bf96cfd43f12249ebeca05
@andi34
UI(scss): move countdown related styles to it's own partial
eb6e8b6 
Change-Id: I6316aaf26aeb40121dd5da95f559391e2f497585
@andi34
UI(scss): reorganize button style definition
aac35a4 
Change-Id: Ic97eaf7c0af60d4e1137e0a8bace40d0b988f82e
@andi34
sass(chromakeying): move chroma related button styles to button partial
ac0f6ee 
Change-Id: I8054b6cdbfe18e690f67be6dd5c8bdd66e48cb22
@andi34
scss: apply classic style related button classes only on classic buttons
dc7c622 
Change-Id: I6f6a7bd87ae7c48390454c4dd27b33386d7b6cce
@andi34
UI: allow to choose a button style
e825a72 
Change-Id: Ie7a40523fe3d8672ef8e10e3c215fb9ca35e83a9
@andi34
template(classic): change take picture and take collage order
2ba1e70 
Change-Id: If74eda5d243de69c6775d84a4b73ecf5cfafb0f5
@andi34
template(classic): add icon for CUPS button
b9cc9ea 
Change-Id: Ibea269fc4542a91ab960cdec58b28c4d40afba7e
@andi34
scss: move button positions to it's general stylesheet
7935e29 
Change-Id: Ib78633e922fb3595434b2607122054040b7e5ec9
@andi34
sass: simpify more definitions
6ec1c20 
Change-Id: I8d861d7fd49f79c062b8be6230178e1e496205e7
@andi34
ui: rework UI style handling, make UI and button style independent
4082276 
Change-Id: I6a12c936f2fdea4d0571778fa5e9fb7a0fbc3587
andi34 added 4 commits July 10, 2022 21:23
@andi34
style(squared): use box-shadow instead of border
0f24b3f 
Change-Id: I2d39e129517ab7738d173f54113ed5a3d8d5b1d8
@andi34
manual: remove style class from panel class
dadbbe2 
Change-Id: Ib7b2834161c3aa55d05d0679b89672140feeb535
@andi34
gallery: allow to disable action button footer
52596cc 
Change-Id: I4c41b7db266e442fcecb10b137df6886e63e310a
@andi34
ui(gallery): no margin on close & reload button
b9986db 
Change-Id: I728a5d54467232d37f64000db7a8a9f2dab217aa
@andi34 andi34 merged commit 546e013 into dev Jul 10, 2022
@andi34 andi34 deleted the ui/rework-scss branch July 10, 2022 19:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@andi34