Skip to content

Import the correct scss files for xmodule styling - #9818

Merged
singingwolfboy merged 3 commits into
sass-themingfrom
ned/fix-xmodule-scss
Sep 21, 2015
Merged

Import the correct scss files for xmodule styling#9818
singingwolfboy merged 3 commits into
sass-themingfrom
ned/fix-xmodule-scss

Conversation

@nedbat

@nedbat nedbat commented Sep 17, 2015

Copy link
Copy Markdown
Contributor

No description provided.

@nedbat

nedbat commented Sep 17, 2015

Copy link
Copy Markdown
Contributor Author

@singingwolfboy @talbs this fixes the error, but I don't know if it's right.

@singingwolfboy

Copy link
Copy Markdown
Contributor

jenkins run bokchoy
jenkins run lettuce

@talbs

talbs commented Sep 18, 2015

Copy link
Copy Markdown
Contributor

@singingwolfboy thanks for the in-person walkthrough. bat I've experimented a bit in simplifying the amount of sass imports needed to avoid the missing variable error found during compilation. Here's a PR with that adjustment - https://github.com/edx/edx-platform/pull/9834.

@nedbat, let me know if there's any specific reason you needed the other imports in your original solution. Happy to keep them, as they are good general utilities to include, if there's a specific need.

@nedbat

nedbat commented Sep 21, 2015

Copy link
Copy Markdown
Contributor Author

@talbs I included everything that was included at the top of courses.scss (or some file like that). I didn't try to whittle it down. I'm fine with your svelter fix.

Simplifying needed sass assets for xmodule sass compilation
@talbs

talbs commented Sep 21, 2015

Copy link
Copy Markdown
Contributor

Thanks for the 4-1-1, @nedbat. I just merged my sveltness into this branch. Feel free to rebase to squash that commit into your work. Once that's done and tests pass, you will have my gratitude and my 👍 .

@singingwolfboy

Copy link
Copy Markdown
Contributor

jenkins run quality

singingwolfboy added a commit that referenced this pull request Sep 21, 2015
Import the correct scss files for xmodule styling
@singingwolfboy
singingwolfboy merged commit 5711fd4 into sass-theming Sep 21, 2015
@singingwolfboy
singingwolfboy deleted the ned/fix-xmodule-scss branch September 21, 2015 13:58
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.

3 participants