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
93e3ab7b
Commit
93e3ab7b
authored
Aug 16, 2012
by
kimth
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #440 from MITx/feature/kfiedler/courseware-style
BUG SMASH
parents
9d35d850
c3fe069f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
60 deletions
+54
-60
common/lib/xmodule/xmodule/css/capa/display.scss
+52
-58
common/lib/xmodule/xmodule/css/video/display.scss
+2
-2
No files found.
common/lib/xmodule/xmodule/css/capa/display.scss
View file @
93e3ab7b
h2
{
margin-top
:
0
;
margin-bottom
:
15px
;
width
:
flex-grid
(
2
,
9
);
padding-right
:
flex-gutter
(
9
);
border-right
:
1px
dashed
#ddd
;
@include
box-sizing
(
border-box
);
display
:
table-cell
;
vertical-align
:
top
;
&
.problem-header
{
margin-top
:
0
;
margin-bottom
:
15px
;
width
:
flex-grid
(
2
,
9
);
padding-right
:
flex-gutter
(
9
);
border-right
:
1px
dashed
#ddd
;
@include
box-sizing
(
border-box
);
display
:
table-cell
;
vertical-align
:
top
;
&
.problem-header
{
section
.staff
{
margin-top
:
30px
;
font-size
:
80%
;
}
}
}
@media
screen
and
(
max-width
:
1120px
)
{
@media
screen
and
(
max-width
:
1120px
)
{
display
:
block
;
width
:
auto
;
border-right
:
0
;
}
}
@media
print
{
@media
print
{
display
:
block
;
width
:
auto
;
border-right
:
0
;
}
}
}
section
.problem
{
display
:
table-cell
;
width
:
flex-grid
(
7
,
9
);
padding-left
:
flex-gutter
(
9
);
display
:
table-cell
;
width
:
flex-grid
(
7
,
9
);
padding-left
:
flex-gutter
(
9
);
@media
screen
and
(
max-width
:
1120px
)
{
@media
screen
and
(
max-width
:
1120px
)
{
display
:
block
;
width
:
auto
;
padding
:
0
;
}
}
@media
print
{
@media
print
{
display
:
block
;
width
:
auto
;
padding
:
0
;
...
...
@@ -47,11 +47,11 @@ padding-left: flex-gutter(9);
canvas
,
img
{
page-break-inside
:
avoid
;
}
}
}
div
{
div
{
p
.status
{
text-indent
:
-9999px
;
margin
:
-1px
0
0
10px
;
...
...
@@ -186,68 +186,62 @@ div {
top
:
6px
;
}
}
}
}
ul
{
ul
{
list-style
:
disc
outside
none
;
margin-bottom
:
lh
();
margin-left
:
.75em
;
margin-left
:
.75rem
;
}
}
ol
{
ol
{
list-style
:
decimal
outside
none
;
margin-bottom
:
lh
();
margin-left
:
.75em
;
margin-left
:
.75rem
;
}
}
dl
{
dl
{
line-height
:
1
.4em
;
}
}
dl
dt
{
dl
dt
{
font-weight
:
bold
;
}
}
dl
dd
{
dl
dd
{
margin-bottom
:
0
;
}
}
dd
{
dd
{
margin-left
:
.5em
;
margin-left
:
.5rem
;
}
}
li
{
li
{
line-height
:
1
.4em
;
margin-bottom
:
lh
(
.5
);
&
:last-child
{
margin-bottom
:
0
;
}
}
}
p
{
p
{
margin-bottom
:
lh
();
}
}
table
{
table
{
margin-bottom
:
lh
();
width
:
100%
;
// border: 1px solid #ddd;
border-collapse
:
collapse
;
table-layout
:
auto
;
th
{
// border-bottom: 2px solid #ccc;
font-weight
:
bold
;
text-align
:
left
;
}
td
{
// border: 1px solid #ddd;
}
caption
,
th
,
td
{
padding
:
.25em
.75em
.25em
0
;
padding
:
.25rem
.75rem
.25rem
0
;
...
...
@@ -265,9 +259,9 @@ table {
vertical-align
:
middle
;
}
}
}
hr
{
hr
{
background
:
#ddd
;
border
:
none
;
clear
:
both
;
...
...
@@ -276,23 +270,23 @@ hr {
height
:
1px
;
margin
:
0
0
.75rem
;
width
:
100%
;
}
}
.hidden
{
.hidden
{
display
:
none
;
visibility
:
hidden
;
}
}
#{
$all-text-inputs
}
{
#{
$all-text-inputs
}
{
display
:
inline
;
width
:
auto
;
}
}
// this supports a deprecated element and should be removed once the center tag is removed
center
{
// this supports a deprecated element and should be removed once the center tag is removed
center
{
display
:
block
;
margin
:
lh
()
0
;
border
:
1px
solid
#ccc
;
padding
:
lh
();
}
}
}
common/lib/xmodule/xmodule/css/video/display.scss
View file @
93e3ab7b
...
...
@@ -171,7 +171,7 @@ div.video {
position
:
relative
;
@include
transition
();
-webkit-font-smoothing
:
antialiased
;
width
:
11
0
px
;
width
:
11
6
px
;
h3
{
color
:
#999
;
...
...
@@ -209,7 +209,7 @@ div.video {
display
:
none
;
opacity
:
0
;
position
:
absolute
;
width
:
1
25
px
;
width
:
1
33
px
;
z-index
:
10
;
li
{
...
...
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