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.

Sign up for GitHub

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

Jump to bottom

Add preformatted block #825

Merged
merged 2 commits into from
May 18, 2017
Merged

Add preformatted block #825

merged 2 commits into from
May 18, 2017

Conversation

ellatrix
Copy link
Member

@ellatrix ellatrix commented May 17, 2017 •
edited
Loading

See #516.

@ellatrix
Copy link
Member Author

This block is meant for preformatted text, not code. Feel free to change or remove the content added.

@ellatrix ellatrix requested a review from jasmussen May 17, 2017 16:08
@mtias mtias added the [Feature] Blocks Overall functionality of blocks label May 17, 2017
@ellatrix
Copy link
Member Author

See #826 for code block.

@jasmussen
Copy link
Contributor

Nice!

I think we should zero out the margin on the pre. The margin will then be implied by the block padding instead. Otherwise works exactly as I would have expected. Very cool!

@jasmussen
Copy link
Contributor

Did some polish here.

One thing is missing from the stylesheet, and that's the new code font size variable that I introduced for the code block in 215881c. So once we have both merged, we should add font-size: $text-editor-font-size; to this pre block.

aduth
aduth approved these changes May 18, 2017
View reviewed changes
Copy link
Member

@aduth aduth left a comment

Choose a reason for hiding this comment

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

Conflicts, but otherwise looks good 👍

@ellatrix ellatrix merged commit 258f24f into master May 18, 2017
@ellatrix ellatrix deleted the add/preformatted-block branch May 18, 2017 15:42
@naiba4 naiba4 mentioned this pull request May 7, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduth aduth aduth approved these changes

@jasmussen jasmussen Awaiting requested review from jasmussen

Assignees
No one assigned
Labels
[Feature] Blocks Overall functionality of blocks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ellatrix @jasmussen @aduth @mtias