Skip to content

Upgrade: Font Awesome 4.2.0 - Take #2 - #6055

Merged
talbs merged 1 commit into
masterfrom
clrux/update-font-awesome-4.2.0-v2
Jan 6, 2015
Merged

Upgrade: Font Awesome 4.2.0 - Take #2#6055
talbs merged 1 commit into
masterfrom
clrux/update-font-awesome-4.2.0-v2

Conversation

@talbs

@talbs talbs commented Nov 25, 2014

Copy link
Copy Markdown
Contributor

This work updates our Font Awesome vendor files to the most recent version. This update required an expansive change in semantics and icon name references. A few notes:

  • On the Studio side, I've added a class of .icon to any font awesome reference for our own additional styling/tweaking.
  • Some icon names have changed or had to be replaced by similar icons
  • Reference templates, tests, as well as views have been updated

@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch 5 times, most recently from 1080b91 to 42bffd4 Compare November 25, 2014 20:56
@talbs

talbs commented Nov 26, 2014

Copy link
Copy Markdown
Contributor Author

@clrux, looks like the HTML class name changes caused some UI-related automated tests to fail (see - https://jenkins.testeng.edx.org/job/edx-all-tests-auto-pr/18673/). I won't have time to look through this until perhaps later today or this week, if its not too confusing or muddy water, feel free to try your hand or you can wait for me to try to tackle things.

@talbs talbs mentioned this pull request Dec 3, 2014
@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch 4 times, most recently from b92be3a to f81d577 Compare December 12, 2014 02:38
@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch 3 times, most recently from 8bc7055 to ed99e9e Compare December 22, 2014 16:58
@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch from ed99e9e to 2417173 Compare December 30, 2014 15:48
@talbs

talbs commented Dec 30, 2014

Copy link
Copy Markdown
Contributor Author

@andy-armstrong, I've just freshly rebased this branch/PR. Tests are running and there should still be one failure around the staff lock on the unit/container view in Studio. Mind taking a look once the results are in?

@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch from 507c8f2 to f602e9a Compare December 31, 2014 14:33
@talbs

talbs commented Dec 31, 2014

Copy link
Copy Markdown
Contributor Author

@marcotuts, can you review the FED changes here?

Also, @marcotuts and @frrrances, I'm getting a sandbox up and running shortly, would you mind proofing both Studio and LMS (navigating to most views) to make sure icons are rendering as expected?

@feanil, heads up on this vendor asset upgrade. I don't think there's anything greatly changing for prod environments, but if you smell anything funky let me know.


FYI, @clrux.

Comment thread cms/static/js/views/course_rerun.js Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

is "fa" a separate class here or is this a duplication typo? (double-checking.)

edit: I'm seeing 'fa' as a standalone class below. Is this serving the same role as the old 'icon' class?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@marcotuts fa is the Font Awesome class prefix. In this case, there's a duplicate. Good catch.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

actually it looks like @talbs is leaving the bare "fa" probably so we can target these icons specifically in case we need to...

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The new syntax requires two classes fa and fa-[icon-name] for the Font Awesome vendor styling to be rendered properly. I'm adding both for vendor support, but I'm leaving a class of icon in as well for our own app/edX-styling that's not font icon library dependent (think about if we switch down the road or something). Hope that clears things up.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

Comment thread cms/static/sass/views/_outline.scss Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

same note around bourbon's transform mixin applies here if we decide to use it.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See above.

@marcotuts

Copy link
Copy Markdown
Contributor

👍 - a quick run through on a sandbox would be good but otherwise this looks good to go! (proofing primarily for wiki styles and the icon-stack stuff)

@talbs

talbs commented Dec 31, 2014

Copy link
Copy Markdown
Contributor Author

@marcotuts, thanks for the review. I'll definitely address all of the good feedback and catches you noted. In the meantime a sandbox is up:

Please have at it, @frrrances and @marcotuts, when you can to review rendered UI. I'll do the same.

@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch 2 times, most recently from 876fa9f to e2762ed Compare January 3, 2015 15:01
@marcotuts

Copy link
Copy Markdown
Contributor

@talbs - couldn't find anything on a review of the sandbox! The couple items I stumbled across wehre also present on edx.org and don't need to impact this PR. (bugs filed for those)

@feanil

feanil commented Jan 6, 2015

Copy link
Copy Markdown
Contributor

👍 from an ops perspective. I don't think this will have any issues if it's already working correctly on sandboxes.

@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch from e2762ed to 55a9a28 Compare January 6, 2015 20:23
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
@talbs
talbs force-pushed the clrux/update-font-awesome-4.2.0-v2 branch from 55a9a28 to c5d2dd7 Compare January 6, 2015 20:24
@talbs

talbs commented Jan 6, 2015

Copy link
Copy Markdown
Contributor Author

Rebased from master and freshly pushed. Once tests pass, I'll try to merge this fella.

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.

5 participants