Skip to content

Style and typography fixes, and code style adherence #270

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

Closed
wants to merge 7 commits into from
Closed

Style and typography fixes, and code style adherence #270

wants to merge 7 commits into from

Conversation

alimony
Copy link

@alimony alimony commented Feb 24, 2013

These are some style and typography fixes for the sections index, contributing, and About jQuery.

(I've decided I'm going to do these fixes section by section, opening a new pull request for each one.)

@gnarf
Copy link
Member

gnarf commented Feb 27, 2013

This seems to be stale, or at least it's telling me things can't be merged.

@alimony
Copy link
Author

alimony commented Feb 27, 2013

@gnarf37 Does it work now?

@gnarf
Copy link
Member

gnarf commented Feb 28, 2013

It does, though I'll let @ajpiano or @kswedberg or someone else review/land this one.

@ajpiano
Copy link
Member

ajpiano commented Mar 4, 2013

Thanks @alimony and sorry for the delay in reviewing these PRs. However, we shouldn't be using entities when we can just use the literal characters, and we don't want to switch to using to actual "fancy" apostrophes instead of a the easily-typed '. That means we should use — instead of — and not actually switch to ’ Do you think you can make those changes, @alimony ?

@ajpiano
Copy link
Member

ajpiano commented Mar 4, 2013

We also should make this clearer in the style guide

@alimony
Copy link
Author

alimony commented Mar 4, 2013

@ajpiano I've pushed some additional commits, decoding all entities and using straight apostrophes, as well as some other fixes.

I did a git rebase master on this branch after pulling all changes on master, but somehow a recent commit by @agcolom found its way here. Should I do something about that? Or: Should I in any way shuffle things around in these commits to make it more manageable?

/ Best regards, someone still not 100% comfortable with git :)

Markus Amalthea Magnuson added 7 commits March 5, 2013 00:16
* e.g., -> e.g.
* Github -> GitHub
* Fix unmatched <p> tag
* Always use curly apostrophe
* "just out of the reach" -> "just out of reach"
* Curly apostrophes
* Em dashes
* Proper capitalization of abbreviations (HTML etc.)
* Linkify jsbin.com
* Decode HTML entities, also using straight apostrophes.
* Remove trailing whitespace.
* Spaces to tabs.
* Spaces to tabs.
* More spaces around arguments.
* HTML style guide adherence.
@alimony
Copy link
Author

alimony commented Mar 4, 2013

I just accidentally forced pushed to this branch… let me know if anything needs to be done for it to apply.

@ajpiano ajpiano closed this in 1f48ad2 Mar 14, 2013
rmurphey added a commit to rmurphey/learn.jquery.com that referenced this pull request Mar 17, 2013
* master: (21 commits)
  0.2.7
  Remove remaining trailing whitespace from all pages. Fixes jquery#313.
  Style and typography fixes, and code style adherence in the JavaScript 101 section. Fixes jquery#312.
  0.2.6
  Correct comment in :input selector in Selecting Elements article. Fixes jquery#306.
  Expand the JavaScript 101 'Scope' article with more useful information and explanations. Fixes jquery#201.
  Added 0 to the list of falsy values in JavaScript 101 Conditional Code article. Fixes jquery#300. Fixes jquery#271
  Inserted missing word in the JavaScript 101 Arrays article. Fixes jquery#299.
  Fixed inconsistency in showLinkLocation example in Basic Plugin Creation article. Fixes jquery#307.
  Fix example and other style cleanup in Basic Plugin Creation article. Fixes jquery#310. Fixes jquery#311.
  Update list of reserved words in JavaScript. Fixes jquery#301.
  Style and typography fixes and code style adherence in the Events section. Fixes jquery#294.
  Style and typography fixes, and code style adherence in the Effects section. Fixes jquery#290.
  Style and typography fixes, and code style adherence in the Code Organization section. Fixes jquery#287.
  Remove double ampersands in README header. Fixes jquery#284.
  Code and prose style improvements to all articles in Ajax chapter. Fixes jquery#283.
  Style fixes on the About page. Fixes jquery#279.
  Style guide fixes for the index, contributing, and About jQuery articles. Fixes jquery#270
  relabel queue/dequeue content as advanced
  Added a missing 'i' in the for loop. Fixes jquery#280.
  ...

Conflicts:
	page/ajax/ajax-and-forms.md
	page/ajax/jquery-ajax-methods.md
	page/effects/custom-effects.md
	page/effects/intro-to-effects.md
	page/events/event-basics.md
	page/events/event-helpers.md
	page/events/introduction-to-custom-events.md
	page/events/triggering-event-handlers.md
arthurvr pushed a commit to arthurvr/learn.jquery.com that referenced this pull request Jan 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants