Skip to content

Studio: Revised CSS Architecture (resolves STUD-806) #1189

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.

Sign up for GitHub

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

Merged
talbs merged 2 commits into from
Oct 29, 2013
Merged

Studio: Revised CSS Architecture (resolves STUD-806) #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95dd217
Studio: revises CSS reference/pipeline architecture for better organi…
talbs Oct 1, 2013
b759414
Studio: adds in specific older IE support area into Sass/CSS architec…
talbs Oct 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,29 @@
from rooted_paths import rooted_glob

PIPELINE_CSS = {
'base-style': {
'style-vendor': {

@talbs talbs Oct 1, 2013

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.

CONTEXT: new CSS naming convention - vendor, app (specific to product), externals/other prods (like xmodule)

'source_filenames': [
'css/vendor/normalize.css',
'css/vendor/font-awesome.css',
'js/vendor/CodeMirror/codemirror.css',
'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
'css/vendor/jquery.qtip.min.css',
'sass/base-style.css',
'xmodule/modules.css',
'xmodule/descriptor.css',
'js/vendor/markitup/skins/simple/style.css',

@cpennington cpennington Oct 3, 2013

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.

There's something odd here. xmodule/* is referenced here, and also inside of the old base-style.scss file. Looks like the ones referenced here were old and wrong?

'js/vendor/markitup/sets/wiki/style.css',
],
'output_filename': 'css/cms-base-style.css',
'output_filename': 'css/cms-style-vendor.css',
},
'style-app': {
'source_filenames': [
'sass/style-app.css',
],
'output_filename': 'css/cms-style-app.css',
},
'style-xmodule': {
'source_filenames': [
'sass/style-xmodule.css',
],
'output_filename': 'css/cms-style-xmodule.css',
},
}

Expand Down
196 changes: 0 additions & 196 deletions cms/static/css/ie.css
View file
Open in desktop

This file was deleted.

Binary file removed cms/static/fonts/vendor/FontAwesome.otf
View file
Open in desktop
Binary file not shown.
Binary file removed cms/static/fonts/vendor/fontawesome-webfont.eot
View file
Open in desktop
Binary file not shown.
Loading