Skip to content

fix(theming): select "no-background" option and fix layout order - #36931

Merged
skjnldsv merged 1 commit into
masterfrom
fix/theming-background
Mar 2, 2023
Merged

fix(theming): select "no-background" option and fix layout order#36931
skjnldsv merged 1 commit into
masterfrom
fix/theming-background

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Mar 1, 2023

Copy link
Copy Markdown
Member

Fix#35479

No backgroundCustom background
2023-03-01_09-452023-03-01_09-45_1
Shipped backgroundDefault background
2023-03-01_09-45_22023-03-01_09-45_3
  • Renamed "Remove background" to "No background" to better reflect that this is an option and not just an action
  • Make the "Remove background" reflect the user choice
  • Moved the "Remove background" option in the first row to better separate the shipped backgrounds
  • Added an icon on the "Custom background" option

@skjnldsvskjnldsv added this to the Nextcloud 26 milestone Mar 1, 2023
@skjnldsv
skjnldsv requested a review from a teamMarch 1, 2023 08:53
@skjnldsvskjnldsv self-assigned this Mar 1, 2023
@skjnldsv
skjnldsv requested review from Pytal, artonge and szaimen and removed request for a teamMarch 1, 2023 08:53
@skjnldsvskjnldsv added the technical debt 🧱 🤔🚀 label Mar 1, 2023
artonge
artonge reviewed Mar 1, 2023
View reviewed changes
Comment threadapps/theming/src/components/BackgroundSettings.vue
@click="removeBackground">
{{ t('theming', 'No background') }}
<Close v-if="!isBackgroundDisabled" :size="32" />
<Check :size="44" />

@artongeartongeMar 1, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason you used css instead v-else ?

@skjnldsvskjnldsvMar 1, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't recall 🤷
I think it was like that before, and I left it when I switched from icon-confirm to the Check vue component
This is not related tot his PR anyway :)

@skjnldsv
skjnldsv requested a review from artongeMarch 1, 2023 10:14
szaimen
szaimen approved these changes Mar 1, 2023
View reviewed changes

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works in my testing 🚀

@szaimen

szaimen commented Mar 1, 2023

Copy link
Copy Markdown
Contributor

But conflicts and jsunit fails...

@skjnldsv
fix(theming): select "no-background" option and fix layout order
162cc3c
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 2, 2023
@skjnldsv
skjnldsvforce-pushed the fix/theming-background branch from 92f8283 to 162cc3cCompareMarch 2, 2023 06:22
@skjnldsv

skjnldsv commented Mar 2, 2023

Copy link
Copy Markdown
MemberAuthor

and jsunit fails

I don't think it's related

@skjnldsv
skjnldsv merged commit e6aca96 into masterMar 2, 2023
@skjnldsv
skjnldsv deleted the fix/theming-background branch March 2, 2023 06:50
@blizzzblizzz mentioned this pull request Mar 2, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artongeartongeartonge approved these changes
@PytalPytalPytal approved these changes
@szaimenszaimenszaimen approved these changes

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: themingtechnical debt🧱 🤔🚀

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

Theming refactoring follow-ups

4 participants

@skjnldsv@szaimen@artonge@Pytal