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
05b9e6ca
Commit
05b9e6ca
authored
Sep 25, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Standardize more of css between lms and cms
parent
4381674e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
34 deletions
+24
-34
cms/envs/common.py
+6
-1
cms/static/sass/_base.scss
+4
-0
common/lib/xmodule/xmodule/css/sequence/display.scss
+1
-1
common/lib/xmodule/xmodule/css/video/display.scss
+4
-1
common/static/css/vendor/jquery.qtip.min.css
+0
-0
lms/envs/common.py
+9
-3
lms/static/sass/course/courseware/_courseware.scss
+0
-28
No files found.
cms/envs/common.py
View file @
05b9e6ca
...
@@ -215,7 +215,12 @@ module_js = remove_root(
...
@@ -215,7 +215,12 @@ module_js = remove_root(
PIPELINE_CSS
=
{
PIPELINE_CSS
=
{
'base-style'
:
{
'base-style'
:
{
'source_filenames'
:
[
'sass/base-style.scss'
],
'source_filenames'
:
[
'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.scss'
],
'output_filename'
:
'css/cms-base-style.css'
,
'output_filename'
:
'css/cms-base-style.css'
,
},
},
}
}
...
...
cms/static/sass/_base.scss
View file @
05b9e6ca
...
@@ -171,6 +171,10 @@ label {
...
@@ -171,6 +171,10 @@ label {
//
//
// -------------------------------------
// -------------------------------------
.xmodule_display
{
font-size
:
16px
;
}
input
.courseware-unit-search-input
{
input
.courseware-unit-search-input
{
position
:
absolute
;
position
:
absolute
;
right
:
0
;
right
:
0
;
...
...
common/lib/xmodule/xmodule/css/sequence/display.scss
View file @
05b9e6ca
...
@@ -356,7 +356,7 @@ nav.sequence-bottom {
...
@@ -356,7 +356,7 @@ nav.sequence-bottom {
}
}
}
}
div
.course-wrapper
section
.course-content
ol
.vert-mod
>
li
ul
.sequence-nav-buttons
{
.xmodule_VerticalModule
ol
.vert-mod
>
li
ul
.sequence-nav-buttons
{
list-style
:
none
!
important
;
list-style
:
none
!
important
;
}
}
...
...
common/lib/xmodule/xmodule/css/video/display.scss
View file @
05b9e6ca
&
{
margin-bottom
:
30px
;
}
div
.video
{
div
.video
{
@include
clearfix
();
@include
clearfix
();
background
:
#f3f3f3
;
background
:
#f3f3f3
;
...
@@ -5,7 +9,6 @@ div.video {
...
@@ -5,7 +9,6 @@ div.video {
margin
:
0
-12px
;
margin
:
0
-12px
;
padding
:
12px
;
padding
:
12px
;
border-radius
:
5px
;
border-radius
:
5px
;
font-size
:
16px
;
article
.video-wrapper
{
article
.video-wrapper
{
float
:
left
;
float
:
left
;
...
...
lms
/static/css/vendor/jquery.qtip.min.css
→
common
/static/css/vendor/jquery.qtip.min.css
View file @
05b9e6ca
File moved
lms/envs/common.py
View file @
05b9e6ca
...
@@ -442,9 +442,15 @@ PIPELINE_CSS = {
...
@@ -442,9 +442,15 @@ PIPELINE_CSS = {
'output_filename'
:
'css/lms-application.css'
,
'output_filename'
:
'css/lms-application.css'
,
},
},
'course'
:
{
'course'
:
{
'source_filenames'
:
[
'js/vendor/CodeMirror/codemirror.css'
,
'css/vendor/jquery.treeview.css'
,
'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css'
,
'css/vendor/jquery.qtip.min.css'
,
'sass/course.scss'
],
'source_filenames'
:
[
'output_filename'
:
'css/lms-course.css'
,
'js/vendor/CodeMirror/codemirror.css'
,
},
'css/vendor/jquery.treeview.css'
,
'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css'
,
'css/vendor/jquery.qtip.min.css'
,
'sass/course.scss'
],
'output_filename'
:
'css/lms-course.css'
,
},
'ie-fixes'
:
{
'ie-fixes'
:
{
'source_filenames'
:
[
'sass/ie.scss'
],
'source_filenames'
:
[
'sass/ie.scss'
],
'output_filename'
:
'css/lms-ie.css'
,
'output_filename'
:
'css/lms-ie.css'
,
...
...
lms/static/sass/course/courseware/_courseware.scss
View file @
05b9e6ca
...
@@ -163,25 +163,6 @@ div.course-wrapper {
...
@@ -163,25 +163,6 @@ div.course-wrapper {
font-family
:
Consolas
,
"Lucida Console"
,
Monaco
,
"Courier New"
,
Courier
,
monospace
;
font-family
:
Consolas
,
"Lucida Console"
,
Monaco
,
"Courier New"
,
Courier
,
monospace
;
}
}
div
.ui-slider
{
border
:
1px
solid
#aaa
;
background
:
#ddd
;
@include
box-shadow
(
inset
0
1px
0
#eee
);
@include
border-radius
(
0
);
a
.ui-slider-handle
{
@include
box-shadow
(
inset
0
1px
0
lighten
(
$pink
,
10%
));
background
:
$pink
url(../images/slider-bars.png)
center
center
no-repeat
;
border
:
1px
solid
darken
(
$pink
,
20%
);
cursor
:
pointer
;
&
:hover
,
&
:focus
{
background-color
:
lighten
(
$pink
,
10%
);
outline
:
none
;
}
}
}
div
.ui-tabs
{
div
.ui-tabs
{
border
:
0
;
border
:
0
;
@include
border-radius
(
0
);
@include
border-radius
(
0
);
...
@@ -234,12 +215,3 @@ div.course-wrapper {
...
@@ -234,12 +215,3 @@ div.course-wrapper {
}
}
}
}
}
}
.xmodule_VideoModule
{
margin-bottom
:
30px
;
}
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