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

cleanup some pre css inheritance #5534

Merged
merged 1 commit into from Apr 22, 2014
Merged

cleanup some pre css inheritance #5534

merged 1 commit into from Apr 22, 2014

Conversation

minrk
Copy link
Member

@minrk minrk commented Apr 5, 2014

We had various overrides of the bootstrap defaults for font-size and line-height every time we made a pre tag, and then some overrides of our overrides when we wanted something slightly different.

This moves the most basic overrides to apply to all pre tags, reducing the number of downstream changes we need.

Should hopefully replace the CSS changes in #5488

We had various overrides of the bootstrap defaults for font-size and line-height every time we made a pre tag,
and then some overrides of our overrides when we wanted something slightly different.

This moves the most basic overrides to apply to all pre tags,
reducing the number of downstream changes we need.
@minrk minrk added this to the 2.1 milestone Apr 5, 2014
@minrk
Copy link
Member Author

minrk commented Apr 5, 2014

Related question (especially for @ellisonbg): Do we ever want pre tags to have line-height other than @code_line_height? If not, we should probably move @code_line_height to the base variables.less, and define the default line-height for pre as @code_line_height instead of inherit.

As far as I can find, all pre tags expect this line height (input, output, prompt, pager - any others?), so it makes more sense for these to be the pre defaults rather than setting them repeatedly all over the place. The same might go for @code_padding, but we seem to apply the padding sometimes to containers instead of pre, so maybe not for that one.

@fperez
Copy link
Member

fperez commented Apr 8, 2014

I just tested before and after this PR merge, and I'm actually OK for my PyCon talk: my CSS tweaks don't seem to be affected by any of this, so I'm not under any pressure to worry about it.

Feel free to review and merge at leisure, it won't bug me. Thanks though!!

minrk added a commit that referenced this pull request Apr 22, 2014
cleanup some `pre` css inheritance
@minrk minrk merged commit 25a8fa3 into ipython:master Apr 22, 2014
@minrk minrk deleted the pre-css branch April 22, 2014 22:19
minrk added a commit that referenced this pull request May 8, 2014
We had various overrides of the bootstrap defaults for font-size and line-height every time we made a pre tag, and then some overrides of our overrides when we wanted something slightly different.

This moves the most basic overrides to apply to all pre tags, reducing the number of downstream changes we need.

Should hopefully replace the CSS changes in #5488
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
cleanup some `pre` css inheritance
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