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
00596d2f
Commit
00596d2f
authored
12 years ago
by
Kyle Fiedler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added courseware css back into the main template
parent
d1482e19
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
7 deletions
+17
-7
.gitignore
+2
-1
lms/envs/common.py
+2
-2
lms/static/sass/course.scss
+8
-1
lms/static/sass/course/_courseware_subnav.scss
+1
-2
lms/templates/courseware.html
+0
-1
lms/templates/main.html
+2
-0
lms/templates/staticbook.html
+2
-0
No files found.
.gitignore
View file @
00596d2f
...
...
@@ -23,4 +23,5 @@ reports/
*.egg-info
Gemfile.lock
.env/
lms/static/sass/*.css
cms/static/sass/*.css
This diff is collapsed.
Click to expand it.
lms/envs/common.py
View file @
00596d2f
...
...
@@ -303,7 +303,7 @@ PIPELINE_CSS = {
'output_filename'
:
'css/application.css'
,
},
'course'
:
{
'source_filenames'
:
[
'sass/
application
.scss'
,
'js/vendor/CodeMirror/codemirror.css'
,
'css/vendor/jquery.treeview.css'
],
'source_filenames'
:
[
'sass/
course
.scss'
,
'js/vendor/CodeMirror/codemirror.css'
,
'css/vendor/jquery.treeview.css'
],
'output_filename'
:
'css/course.css'
,
},
'ie-fixes'
:
{
...
...
@@ -312,7 +312,7 @@ PIPELINE_CSS = {
},
}
PIPELINE_ALWAYS_RECOMPILE
=
[
'sass/application.scss'
,
'sass/ie.scss'
]
PIPELINE_ALWAYS_RECOMPILE
=
[
'sass/application.scss'
,
'sass/ie.scss'
,
'sass/course.scss'
]
courseware_only_js
=
[
PROJECT_ROOT
/
'static/coffee/src/'
+
pth
+
'.coffee'
...
...
This diff is collapsed.
Click to expand it.
lms/static/sass/course.scss
View file @
00596d2f
...
...
@@ -10,13 +10,20 @@
// Course styles
@import
'course/courseware_subnav'
;
@import
'module/module-styles.scss'
;
// Courseware styles
@import
'course/old/base/variables'
;
@import
'course/old/base/extends'
;
@import
'course/old/base/functions'
;
@import
'course/old/courseware/courseware'
;
@import
'course/old/courseware/sidebar'
;
@import
'course/old/courseware/amplifier'
;
@import
'module/module-styles.scss'
;
@import
'course/old/courseware/problems'
;
@import
"course/old/info"
;
@import
"course/old/plugins/jquery-ui-1.8.16.custom"
,
"course/old/plugins/jquery.qtip.min"
;
@import
"course/old/textbook"
;
This diff is collapsed.
Click to expand it.
lms/static/sass/course/_courseware_subnav.scss
View file @
00596d2f
...
...
@@ -52,7 +52,6 @@ nav.course-material {
margin-top
:
30px
;
.courseware
{
background
:
rgb
(
240
,
240
,
240
);
height
:
600px
;
min-height
:
300px
;
}
}
This diff is collapsed.
Click to expand it.
lms/templates/courseware.html
View file @
00596d2f
...
...
@@ -23,7 +23,6 @@
<
%
static:js
group=
'courseware'
/>
<
%
static:css
group=
'course'
/>
<
%
include
file=
"mathjax_include.html"
/>
...
...
This diff is collapsed.
Click to expand it.
lms/templates/main.html
View file @
00596d2f
...
...
@@ -7,6 +7,8 @@
<link
rel=
"icon"
type=
"image/x-icon"
href=
"${static.url('images/favicon.ico')}"
/>
<
%
static:css
group=
'application'
/>
<
%
static:css
group=
'course'
/>
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
...
...
This diff is collapsed.
Click to expand it.
lms/templates/staticbook.html
View file @
00596d2f
...
...
@@ -56,6 +56,7 @@ $("#open_close_accordion a").click(function(){
<
%
include
file=
"course_navigation.html"
args=
"active_page='book'"
/>
<section
class=
"container"
>
<section
class=
"main-content"
>
<div
class=
"book-wrapper"
>
...
...
@@ -99,3 +100,4 @@ $("#open_close_accordion a").click(function(){
</section>
</div>
</section>
</section>
This diff is collapsed.
Click to expand it.
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