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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the UI Toolkit to edx-platform #11880

Merged
merged 1 commit into from
Mar 22, 2016
Merged

Conversation

andy-armstrong
Copy link
Contributor

UITK-75

This adds the UI Toolkit to edx-platform, and then makes a single change to use the new HtmlUtils class. The intention is that this is a simpler PR to land before tomorrow's marathon, and that the original PR (https://github.com/edx/edx-platform/pull/11856) will be rebased on top of this.

In addition, the static path for the Pattern Library has been made /static/edx-pattern-library instead of just /static/pattern-library. This change was already made in the Pattern Library so it was made here too for consistency.

Sandbox

  • TBD

Testing

  • Unit, integration, acceptance tests as appropriate

Reviewers

If you've been tagged for review, please check your corresponding box once you've given the 馃憤.

FYI: @cahrens @dan-f @dsjen @bjacobel

Post-review

  • Squash commits

@AlasdairSwan
Copy link
Contributor

Looks good 馃憤

@robrap
Copy link
Contributor

robrap commented Mar 22, 2016

@andy-armstrong 馃憤 Thanks.

Did you have examples of how this gets added in places where RequireJS is not used? Are we saying RequireJS must be introduced and we'll need docs to that, or is there some shortcut that we are ok with?

@andy-armstrong
Copy link
Contributor Author

@robrap I haven't thought through the options for non-RequireJS pages. I'll merge this (once I have an updated UI Toolkit release to consume) and then I'll work on a separate PR solution.

@robrap
Copy link
Contributor

robrap commented Mar 22, 2016

Sounds good. Thanks.

andy-armstrong added a commit that referenced this pull request Mar 22, 2016
@andy-armstrong andy-armstrong merged commit c7336b3 into master Mar 22, 2016
@andy-armstrong andy-armstrong deleted the andya/add-ui-toolkit-only branch March 22, 2016 20:34
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

3 participants