Skip to content

[stable22] Only add the vue exeption to actual button elements - #30010

Merged
st3iny merged 1 commit into
stable22from
backport/29905/stable22
Dec 7, 2021
Merged

[stable22] Only add the vue exeption to actual button elements#30010
st3iny merged 1 commit into
stable22from
backport/29905/stable22

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Dec 1, 2021•
edited by st3iny
Loading

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #29905

@backportbot-nextcloudbackportbot-nextcloudBot added the design Design, UI, UX, etc. label Dec 1, 2021
@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 22.2.4 milestone Dec 1, 2021
MichaIng
MichaIng previously requested changes Dec 1, 2021
View reviewed changes

@MichaIngMichaIng left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Some .button:not(.button-vue) cases are missing in this backport.

@st3iny
st3iny dismissed MichaIng’s stale reviewDecember 7, 2021 11:01

It's fine because the original change to this line wasn't backported in the first place. This line looks like the same as it is on master.

st3iny
st3iny approved these changes Dec 7, 2021
View reviewed changes

@st3inyst3iny left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Conflicts are irrelevant. See my other comment.

EDIT: Nvm, @MichaIng was right. I was on the wrong branch.

st3iny
st3iny requested changes Dec 7, 2021
View reviewed changes

@st3inyst3iny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Conflicts!

@marcoambrosini@st3iny
Only add the vue exeption to actual button elements
10056ff
Signed-off-by: marco <marcoambrosini@pm.me>
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@skjnldsvskjnldsv added the 3. to review Waiting for reviews label Dec 7, 2021
@st3iny
st3inyforce-pushed the backport/29905/stable22 branch from 1f4717b to 10056ffCompareDecember 7, 2021 11:12
st3iny
st3iny approved these changes Dec 7, 2021
View reviewed changes

@st3inyst3iny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I added the missing change and tested again.

@MichaIng

MichaIng commented Dec 7, 2021

Copy link
Copy Markdown
Member

The jsunit failures are unrelated. But someone with insights should have a look: Looks like a formal thing where a template has changed, now containing style="display: block;", while the check still expect the HTML without style="display: block;" attribute.

@GretaDGretaD mentioned this pull request Dec 7, 2021
Closed
@GretaD

GretaD commented Dec 7, 2021

Copy link
Copy Markdown
Contributor

@marcoambrosini please have a look at this one so we can merge it as people that are on NC v22 are reporting problems

@st3iny
st3iny merged commit 3d8a610 into stable22Dec 7, 2021
@st3iny
st3iny deleted the backport/29905/stable22 branch December 7, 2021 13:36
@skjnldsvskjnldsv mentioned this pull request Jan 7, 2022
Merged
9 tasks
This was referenced Jan 20, 2022
Merged
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@st3inyst3inyst3iny approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@MichaIngMichaIngMichaIng approved these changes
@ValdnetValdnetValdnet approved these changes
@GretaDGretaDAwaiting requested review from GretaD
@marcoambrosinimarcoambrosiniAwaiting requested review from marcoambrosini

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsdesignDesign, UI, UX, etc.

Projects

None yet

Milestone

Nextcloud 22.2.4

Development

Successfully merging this pull request may close these issues.

6 participants

@MichaIng@GretaD@st3iny@skjnldsv@Valdnet@marcoambrosini