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
b08a8f7e
Commit
b08a8f7e
authored
Jul 28, 2015
by
Chris Rodriguez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style simplification to sync up styles
parent
d98354d0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
24 deletions
+18
-24
lms/static/sass/base/_base.scss
+8
-18
lms/static/sass/course/base/_base.scss
+5
-1
lms/static/sass/course/courseware/_courseware.scss
+0
-5
lms/static/sass/views/_homepage.scss
+5
-0
No files found.
lms/static/sass/base/_base.scss
View file @
b08a8f7e
...
@@ -10,7 +10,6 @@ html, body {
...
@@ -10,7 +10,6 @@ html, body {
font-size
:
1em
;
font-size
:
1em
;
font-style
:
normal
;
font-style
:
normal
;
line-height
:
1em
;
line-height
:
1em
;
//-webkit-font-smoothing: antialiased;
}
}
html
{
html
{
...
@@ -33,7 +32,6 @@ h1 {
...
@@ -33,7 +32,6 @@ h1 {
letter-spacing
:
1px
;
letter-spacing
:
1px
;
margin-bottom
:
(
$baseline
*
1
.5
);
margin-bottom
:
(
$baseline
*
1
.5
);
text-align
:
center
;
text-align
:
center
;
//text-transform: uppercase;
}
}
h2
{
h2
{
...
@@ -50,14 +48,13 @@ p + h2, ul + h2, ol + h2 {
...
@@ -50,14 +48,13 @@ p + h2, ul + h2, ol + h2 {
}
}
p
{
p
{
color
:
$base-font-color
;
color
:
inherit
;
font
:
normal
1em
/
1
.6em
$serif
;
margin
:
0
;
margin
:
0
;
}
}
span
{
span
{
font
:
normal
1em
/
1
.6em
$sans-serif
;
font
:
inherit
;
color
:
$base-font-color
;
color
:
inherit
;
}
}
/* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */
/* Fix for CodeMirror: prevent top-level span from affecting deeply-embedded span in CodeMirror */
...
@@ -79,9 +76,10 @@ p + p, ul + p, ol + p {
...
@@ -79,9 +76,10 @@ p + p, ul + p, ol + p {
}
}
p
{
p
{
a
:link
,
a
:visited
{
a
,
a
:visited
{
color
:
$link-color
;
color
:
$link-color
;
font
:
normal
1em
/
1em
$serif
;
font
:
inherit
;
font-weight
:
inherit
;
text-decoration
:
none
;
text-decoration
:
none
;
@include
transition
(
all
0
.1s
linear
0s
);
@include
transition
(
all
0
.1s
linear
0s
);
...
@@ -92,9 +90,9 @@ p {
...
@@ -92,9 +90,9 @@ p {
}
}
}
}
a
:link
,
a
:visited
{
a
,
a
:visited
{
color
:
$link-color
;
color
:
$link-color
;
font
:
normal
1em
/
1em
$sans-serif
;
font
:
inherit
;
text-decoration
:
none
;
text-decoration
:
none
;
@include
transition
(
all
0
.1s
linear
0s
);
@include
transition
(
all
0
.1s
linear
0s
);
...
@@ -109,14 +107,6 @@ a:link, a:visited {
...
@@ -109,14 +107,6 @@ a:link, a:visited {
}
}
}
}
a
:focus
{
/**
* Add general focus styling here
* for example:
* outline: 3px groove $black;
**/
}
.content-wrapper
{
.content-wrapper
{
width
:
flex-grid
(
12
);
width
:
flex-grid
(
12
);
margin
:
0
auto
;
margin
:
0
auto
;
...
...
lms/static/sass/course/base/_base.scss
View file @
b08a8f7e
...
@@ -43,7 +43,7 @@ body {
...
@@ -43,7 +43,7 @@ body {
//background-image: $course-bg-image;
//background-image: $course-bg-image;
}
}
body
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
p
,
p
a
:link
,
p
a
:visited
,
a
,
label
{
body
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
p
,
label
{
@include
text-align
(
left
);
@include
text-align
(
left
);
font-family
:
$sans-serif
;
font-family
:
$sans-serif
;
}
}
...
@@ -52,6 +52,10 @@ table {
...
@@ -52,6 +52,10 @@ table {
table-layout
:
fixed
;
table-layout
:
fixed
;
}
}
.xblock
table
{
table-layout
:
auto
}
a
{
a
{
&
:hover
,
&
:focus
{
&
:hover
,
&
:focus
{
color
:
$pink
;
color
:
$pink
;
...
...
lms/static/sass/course/courseware/_courseware.scss
View file @
b08a8f7e
...
@@ -105,11 +105,6 @@ div.course-wrapper {
...
@@ -105,11 +105,6 @@ div.course-wrapper {
p
{
p
{
margin-bottom
:
lh
();
margin-bottom
:
lh
();
&
:empty
{
display
:
none
;
margin-bottom
:
0
;
}
}
}
.sequential-status-message
{
.sequential-status-message
{
...
...
lms/static/sass/views/_homepage.scss
View file @
b08a8f7e
...
@@ -72,6 +72,11 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
...
@@ -72,6 +72,11 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
.course-info
{
.course-info
{
height
:
$course-info-height
;
height
:
$course-info-height
;
font-family
:
$sans-serif
;
h2
{
font-family
:
$sans-serif
;
}
.course-organization
,
.course-code
,
.course-date
{
.course-organization
,
.course-code
,
.course-date
{
@extend
%t-icon6
;
@extend
%t-icon6
;
...
...
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