-
Notifications
You must be signed in to change notification settings - Fork 414
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
Cleaned up aside formatting #326
Conversation
👍🏻 presuming everything ends up looking the same |
Two visual changes:
|
margin-bottom: 1em; | ||
border-left: $aside_note_border; | ||
.aside, .Swift { | ||
padding: 0.4em 0.8em; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, the “before” is weirdly asymmetric on my local setup, and my change fixed it. Both of your screenshots look wrong to my eyes. Will investigate when I have a free minute….
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree that the "before" version isn't perfect, but better than what I generated from this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. What I’m saying is that they both look quite different on my machine, before as well as after, and I need to figure out why — maybe local changes….
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That looks quite nice! Maybe I'm generating this wrong? Seems unlikely though, since I ran rake rebuild_integration_fixtures
and the new CSS classes were being resolved.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Odds are good that it’s something about my hacked-up local setup. Investigating, and I’ll add a commit to the PR when I have it figured out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aha! Neither your mistake nor mine. Sometimes the aside content is inside a <p>
tag, and sometimes it isn’t. You were seeing a <p>
case, and I was seeing a bare text case. Just pushed a fix to make it consistent.
Other than the margin changes, 👍 thanks! PS: I caught this as I was rebuilding the integration fixtures, and I'm happy to do it again once this is ready to go! |
OK, I think this is ready to go. Take a look at the new output and see how it looks to you now, @jpsim. Do I need to have Xcode 6.x and 7.0 installed, as well as 7.1? I experimented with rebuilding the integration fixtures, but get errors about missing compilers for Swift 1.2 and 2.0. |
Looks good now! You can point the integration specs submodule to realm/jazzy-integration-specs@fff44b9 now.
Currently compilers for Swift 1.2 and Swift 2.0 are required to run the full test suite. |
ebffcaa
to
9981575
Compare
Repointed integration specs and merged. First time doing that, so please LMK if I did anything wrong. |
b7d7e0d
to
12e0912
Compare
Hurray! |
This addresses #325, at least in part.
I’m unsure how to update the integration specs. (My usual approach to git submodules is to hide until they go away.) Do I need to create a separate PR on the specs repo…? @jpsim, can you lend a hand with this if I make very sad puppy eyes?