Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update quote style and remove bottom margin from paragraphs within them #1165

Merged
merged 7 commits into from
Jun 14, 2021

Conversation

cheywood
Copy link
Contributor

@cheywood cheywood commented May 12, 2021

@di72nn as you identified this was to do with padding on the bottom of paragraphs within the blockquote. Looks good for me for articles which were and weren't affected by the issue.

Fixes #1163
Closes #1141

@di72nn
Copy link
Member

di72nn commented May 12, 2021

Thanks!

I haven't tested it, but I believe it will also remove margins between multiple paragraphs in a quote. Have you checked that?

@cheywood
Copy link
Contributor Author

I was wondering about that too (... and to be honest I think it then slipped my mind 🤦 ). They also don't often occur in my feeds.

Do you happen to have a feed/article I could test this with?

@cheywood
Copy link
Contributor Author

I've just put up a fix, but have thus far only tested it with single paragraph quotes (which it works for)

@di72nn
Copy link
Member

di72nn commented May 12, 2021

@cheywood
Copy link
Contributor Author

Hrmm yeah the rest look ok but the towards data science article shows another problem which would be exacerbated if these PRs are merged. It looks like sometimes there's no spacing left after the blockquote. Time permitting I'll have a look.

This is similar to what wallabag web is doing and avoids cases where
two blockquotes would be joined without space, or a blockquote could end
up butted up against the following content.
@cheywood
Copy link
Contributor Author

I've had a go at that too. Blockquotes will be spaced out a little more, closer to wallabag web, which looks fine to me but may be subjective.

@di72nn
Copy link
Member

di72nn commented May 15, 2021

Thanks for your efforts!

The changes seem to cover most of the problems, except for p being not the last element in the quote (the blog.cryptographyengineering.com example).

However, I feel like the web UI does it somehow differently and trying to borrow that approach is a better way to go.

@cheywood
Copy link
Contributor Author

I agree, having more coverage ala the wallabag web stylesheet would avoid these issues, with the benefit of (arguably) improved style (including eg. the improved quote style that kicked this off). I think effectively tracking the web stylesheet is a good idea.

I can remove these PRs if you'd like.

@di72nn
Copy link
Member

di72nn commented May 15, 2021

I can remove these PRs if you'd like.

No, I don't think anything major is going to happen to styles in the app (at least anytime soon), so these PRs still make sense.

But for this fix we should try collapsing bottom margins (like in the web UI, if I understand correctly) instead of removing margins from p.

Brings in changes for wallabag#1143, removing all borders and padding between
blockquote and children, allowing for margin collapsing
@cheywood
Copy link
Contributor Author

Sure thing. Have made changes to allow for margin collapsing. As a result integrated #1143 changes as that helps in removing the border between the parent blockquote and its children (which was part of what was preventing the collapsing).

FYI won't be back in internet reception for half a week or so.

@cheywood cheywood mentioned this pull request May 16, 2021
@cheywood
Copy link
Contributor Author

By the way, sorry for the rushed approach to my changes on the margin issue, FWIW that's not normally my way

@di72nn
Copy link
Member

di72nn commented May 18, 2021

By the way, sorry for the rushed approach...

Don't worry, it's ok :-)

Looks nice, thanks again!

Can you please double-check the high-contrast-related part. It was changed in main.css, but not in dark.css and solarized.css (I know we don't use high-contrast with solarized, but I'd prefer to have it for consistency, if it doesn't contradict anything).

@di72nn
Copy link
Member

di72nn commented May 18, 2021

Oh, and about the border-left color: I don't have a strong preference either way, but we may use #ee6e73 (from the web UI) for both light and dark themes (not solarized), since we don't consistently use Android's accent colors anyway.

@cheywood cheywood changed the title Remove bottom margin from paragraphs in quote blocks Update quote style and remove bottom margin from paragraphs within them May 19, 2021
@cheywood
Copy link
Contributor Author

Oh, and about the border-left color: I don't have a strong preference either way, but we may use #ee6e73 (from the web UI) for both light and dark themes (not solarized), since we don't consistently use Android's accent colors anyway.

Nice, looks good, done.

@cheywood
Copy link
Contributor Author

By the way, sorry for the rushed approach...

Don't worry, it's ok :-)

Looks nice, thanks again!

Can you please double-check the high-contrast-related part. It was changed in main.css, but not in dark.css and solarized.css (I know we don't use high-contrast with solarized, but I'd prefer to have it for consistency, if it doesn't contradict anything).

Yeah, I think I'd excluded it from solarized as it wasn't used, and for dark who knows why I didn't. The more contrast the better, right? 🙂 Updated.

Copy link
Member

@di72nn di72nn left a comment

Choose a reason for hiding this comment

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

Squash on merge.

@di72nn
Copy link
Member

di72nn commented May 19, 2021

Everything looks good, thanks again!

@Strubbl Strubbl merged commit 3b59bcc into wallabag:master Jun 14, 2021
@di72nn di72nn added this to the 2.4.3 milestone Jun 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Quotes have some excessive space at the bottom Updated quote style
3 participants