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

improve markdown's ui theme #1363

Merged
merged 1 commit into from
Jan 24, 2022
Merged

Conversation

cossonleo
Copy link
Contributor

The PR add some style to markdwon ui to make the theme can be changed.
before:
2021-12-25_11-30_1
2021-12-25_11-30

after:
2021-12-25_11-31_1
2021-12-25_11-31

@@ -5234,7 +5234,8 @@ fn hover(cx: &mut Context) {

// skip if contents empty

let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
let contents =
ui::Markdown::new(contents, editor.syn_loader.clone()).style_group("hover");
Copy link
Member

Choose a reason for hiding this comment

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

Change looks good, but do we need these extra scopes? We can simplify and remove hover/completion suffix

Copy link
Contributor Author

@cossonleo cossonleo Dec 30, 2021

Choose a reason for hiding this comment

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

markup.raw.inlinemarkup.heading not only used in editor veiw but also used in popup ui. The two ui has own background. Some theme maybe conflict on these.

helix-term/src/ui/markdown.rs Outdated Show resolved Hide resolved
Copy link
Member

@archseer archseer left a comment

Choose a reason for hiding this comment

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

It looks good, but tree-sitter-llvm submodule change needs to be reverted

book/src/themes.md Outdated Show resolved Hide resolved
Copy link
Member

@archseer archseer left a comment

Choose a reason for hiding this comment

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

Looks good now 👍🏻 I will merge after releasing 0.6.1

@archseer
Copy link
Member

Going to merge after #1525 adds all the markup. scopes

@archseer
Copy link
Member

Can you rebase the PR? I did so locally but I can't push to your fork

@cossonleo
Copy link
Contributor Author

Can you rebase the PR? I did so locally but I can't push to your fork

Has rebased.
Please try again
@archseer

@archseer archseer merged commit d49e532 into helix-editor:master Jan 24, 2022
@cossonleo cossonleo deleted the markdown_theme branch January 24, 2022 07:13
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.

None yet

2 participants