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

Cleaned up aside formatting #326

Merged
merged 6 commits into from
Oct 30, 2015
Merged

Conversation

pcantrell
Copy link
Collaborator

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?

@segiddins
Copy link
Collaborator

👍🏻 presuming everything ends up looking the same

@pcantrell
Copy link
Collaborator Author

Two visual changes:

  1. Label comes out as “SEE ALSO” instead of “SEEALSO”
  2. Tidied up ugly asymmetrical margins.

margin-bottom: 1em;
border-left: $aside_note_border;
.aside, .Swift {
padding: 0.4em 0.8em;
Copy link
Collaborator

Choose a reason for hiding this comment

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

why the change from px to em? I prefer the spacing from before.

before
image

after
image

Copy link
Collaborator Author

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….

Copy link
Collaborator

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.

Copy link
Collaborator Author

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….

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Here’s what I see after the change:
screen shot 2015-10-28 at 6 26 19 pm
Note the symmetry above & below. Clearly not what you’re getting!

Copy link
Collaborator

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.

Copy link
Collaborator Author

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.

Copy link
Collaborator Author

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.

@jpsim
Copy link
Collaborator

jpsim commented Oct 28, 2015

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!

@pcantrell
Copy link
Collaborator Author

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.

@jpsim
Copy link
Collaborator

jpsim commented Oct 29, 2015

Looks good now! You can point the integration specs submodule to realm/jazzy-integration-specs@fff44b9 now.

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.

Currently compilers for Swift 1.2 and Swift 2.0 are required to run the full test suite.

@pcantrell pcantrell force-pushed the aside-formatting-cleanup branch from ebffcaa to 9981575 Compare October 29, 2015 16:42
@pcantrell
Copy link
Collaborator Author

Repointed integration specs and merged. First time doing that, so please LMK if I did anything wrong.

@pcantrell pcantrell force-pushed the aside-formatting-cleanup branch from b7d7e0d to 12e0912 Compare October 29, 2015 21:50
@pcantrell pcantrell mentioned this pull request Oct 30, 2015
@jpsim
Copy link
Collaborator

jpsim commented Oct 30, 2015

Hurray!

jpsim added a commit that referenced this pull request Oct 30, 2015
@jpsim jpsim merged commit 587f402 into realm:master Oct 30, 2015
@jpsim jpsim mentioned this pull request Nov 24, 2015
@pigeondotdev pigeondotdev modified the milestone: The Past Nov 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants