Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
1fce1dbe
Commit
1fce1dbe
authored
Jul 27, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure that django-pipelined css and js don't collide between the cms and lms
parent
395cf147
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
cms/envs/common.py
+4
-4
lms/envs/common.py
+8
-8
No files found.
cms/envs/common.py
View file @
1fce1dbe
...
...
@@ -243,7 +243,7 @@ with open(module_styles_path, 'w') as module_styles:
PIPELINE_CSS
=
{
'base-style'
:
{
'source_filenames'
:
[
'sass/base-style.scss'
],
'output_filename'
:
'css/base-style.css'
,
'output_filename'
:
'css/
cms-
base-style.css'
,
},
}
...
...
@@ -260,15 +260,15 @@ PIPELINE_JS = {
for
pth
in
glob2
.
glob
(
PROJECT_ROOT
/
'static/coffee/src/**/*.coffee'
)
],
'output_filename'
:
'js/application.js'
,
'output_filename'
:
'js/
cms-
application.js'
,
},
'module-js'
:
{
'source_filenames'
:
module_js_sources
,
'output_filename'
:
'js/modules.js'
,
'output_filename'
:
'js/
cms-
modules.js'
,
},
'spec'
:
{
'source_filenames'
:
[
pth
.
replace
(
PROJECT_ROOT
/
'static/'
,
''
)
for
pth
in
glob2
.
glob
(
PROJECT_ROOT
/
'static/coffee/spec/**/*.coffee'
)],
'output_filename'
:
'js/spec.js'
'output_filename'
:
'js/
cms-
spec.js'
}
}
...
...
lms/envs/common.py
View file @
1fce1dbe
...
...
@@ -301,15 +301,15 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
PIPELINE_CSS
=
{
'application'
:
{
'source_filenames'
:
[
'sass/application.scss'
],
'output_filename'
:
'css/application.css'
,
'output_filename'
:
'css/
lms-
application.css'
,
},
'course'
:
{
'source_filenames'
:
[
'sass/course.scss'
,
'js/vendor/CodeMirror/codemirror.css'
,
'css/vendor/jquery.treeview.css'
],
'output_filename'
:
'css/course.css'
,
'output_filename'
:
'css/
lms-
course.css'
,
},
'ie-fixes'
:
{
'source_filenames'
:
[
'sass/ie.scss'
],
'output_filename'
:
'css/ie.css'
,
'output_filename'
:
'css/
lms-
ie.css'
,
},
}
...
...
@@ -410,23 +410,23 @@ PIPELINE_JS = {
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
],
'output_filename'
:
'js/application.js'
'output_filename'
:
'js/
lms-
application.js'
},
'courseware'
:
{
'source_filenames'
:
[
pth
.
replace
(
PROJECT_ROOT
/
'static/'
,
''
)
for
pth
in
courseware_only_js
],
'output_filename'
:
'js/courseware.js'
'output_filename'
:
'js/
lms-
courseware.js'
},
'main_vendor'
:
{
'source_filenames'
:
main_vendor_js
,
'output_filename'
:
'js/main_vendor.js'
,
'output_filename'
:
'js/
lms-
main_vendor.js'
,
},
'module-js'
:
{
'source_filenames'
:
module_js_sources
,
'output_filename'
:
'js/modules.js'
,
'output_filename'
:
'js/
lms-
modules.js'
,
},
'spec'
:
{
'source_filenames'
:
[
pth
.
replace
(
PROJECT_ROOT
/
'static/'
,
''
)
for
pth
in
glob2
.
glob
(
PROJECT_ROOT
/
'static/coffee/spec/**/*.coffee'
)],
'output_filename'
:
'js/spec.js'
'output_filename'
:
'js/
lms-
spec.js'
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment