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
504f33cf
Commit
504f33cf
authored
Aug 04, 2016
by
Renzo Lucioni
Committed by
GitHub
Aug 04, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13162 from edx/renzo/sass-fixes
Fix program listing and detail page styling
parents
465f8296
765792c6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
13 deletions
+12
-13
lms/static/sass/elements/_course-card.scss
+3
-3
lms/static/sass/elements/_program-card.scss
+3
-3
lms/static/sass/shared-v2/_variables.scss
+1
-1
lms/static/sass/views/_program-list.scss
+1
-2
lms/templates/learner_dashboard/certificate_status.underscore
+1
-1
lms/templates/learner_dashboard/course_enroll.underscore
+1
-1
lms/templates/learner_dashboard/empty_programs_list.underscore
+1
-1
lms/templates/learner_dashboard/explore_new_programs.underscore
+1
-1
No files found.
lms/static/sass/elements/_course-card.scss
View file @
504f33cf
...
@@ -100,13 +100,13 @@
...
@@ -100,13 +100,13 @@
.cta-primary
{
.cta-primary
{
display
:
inline-block
;
display
:
inline-block
;
background-color
:
palette
(
success
,
back
);
background-color
:
palette
(
success
,
text
);
border-color
:
palette
(
success
,
accen
t
);
border-color
:
palette
(
success
,
tex
t
);
&
:active
,
&
:active
,
&
:focus
,
&
:focus
,
&
:hover
{
&
:hover
{
background-color
:
palette
(
success
,
back
);
background-color
:
palette
(
success
,
accent
);
border-color
:
palette
(
success
,
accent
);
border-color
:
palette
(
success
,
accent
);
}
}
}
}
...
...
lms/static/sass/elements/_program-card.scss
View file @
504f33cf
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
.progress
{
.progress
{
height
:
5px
;
height
:
5px
;
background
:
palette
(
grayscale
,
x-
back
);
background
:
palette
(
grayscale
,
back
);
.bar
{
.bar
{
@include
float
(
left
);
@include
float
(
left
);
...
@@ -154,11 +154,11 @@
...
@@ -154,11 +154,11 @@
position
:
relative
;
position
:
relative
;
&
.complete
{
&
.complete
{
background
:
palette
(
success
,
back
);
background
:
palette
(
success
,
accent
);
}
}
&
.in-progress
{
&
.in-progress
{
background
:
palette
(
warning
,
back
);
background
:
palette
(
warning
,
accent
);
}
}
}
}
}
}
...
...
lms/static/sass/shared-v2/_variables.scss
View file @
504f33cf
// LMS variables
// LMS variables
$lms-gray
:
palette
(
grayscale
,
base
);
$lms-gray
:
palette
(
grayscale
,
base
);
$lms-background-color
:
palette
(
grayscale
,
x-back
);
// Why is the Pattern Library default background different?
$lms-background-color
:
rgb
(
252
,
252
,
252
);
// Correct shade of grey not available in the Pattern Library
$lms-container-background-color
:
$white
;
$lms-container-background-color
:
$white
;
$lms-border-color
:
palette
(
grayscale
,
back
);
$lms-border-color
:
palette
(
grayscale
,
back
);
$lms-label-color
:
palette
(
grayscale
,
black
);
$lms-label-color
:
palette
(
grayscale
,
black
);
...
...
lms/static/sass/views/_program-list.scss
View file @
504f33cf
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
.aside
{
.aside
{
padding
:
$baseline
;
padding
:
$baseline
;
margin-bottom
:
$baseline
;
margin-bottom
:
$baseline
;
background-color
:
$body-bg
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
border
:
1px
solid
$border-color-l3
;
border
:
1px
solid
$border-color-l3
;
}
}
...
@@ -30,7 +29,7 @@
...
@@ -30,7 +29,7 @@
.program-advertise
{
.program-advertise
{
clear
:
both
;
clear
:
both
;
.
btn-neutral
{
.
new-programs-btn
{
width
:
100%
;
width
:
100%
;
text-align
:
center
;
text-align
:
center
;
padding
:
10px
;
padding
:
10px
;
...
...
lms/templates/learner_dashboard/certificate_status.underscore
View file @
504f33cf
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
<a href="<%- certificate_url %>" class="btn-brand cta-secondary">
<a href="<%- certificate_url %>" class="btn-brand cta-secondary">
<% // safe-lint: disable=underscore-not-escaped %>
<% // safe-lint: disable=underscore-not-escaped %>
<span class="certificate-icon blue-certificate-icon" aria-hidden="true"><%= certificateSvg %></span>
<span class="certificate-icon blue-certificate-icon" aria-hidden="true"><%= certificateSvg %></span>
<%- gettext('View
/Share
Certificate') %>
<%- gettext('View Certificate') %>
</a>
</a>
</div>
</div>
lms/templates/learner_dashboard/course_enroll.underscore
View file @
504f33cf
<% if (is_enrolled) { %>
<% if (is_enrolled) { %>
<div class="enrollment-info"><%- gettext('enrolled') %></div>
<div class="enrollment-info"><%- gettext('enrolled') %></div>
<% if (is_enrollment_open || is_course_ended) { %>
<% if (is_enrollment_open || is_course_ended) { %>
<a href="<%- course_url %>" class="btn
-neutral btn
view-course-link">
<a href="<%- course_url %>" class="btn view-course-link">
<% if (is_enrollment_open) { %>
<% if (is_enrollment_open) { %>
<%- gettext('View Course') %>
<%- gettext('View Course') %>
<% } else if (is_course_ended) { %>
<% } else if (is_course_ended) { %>
...
...
lms/templates/learner_dashboard/empty_programs_list.underscore
View file @
504f33cf
<section class="empty-programs-message">
<section class="empty-programs-message">
<h2 class="hd-3"><%- gettext('You are not enrolled in any programs yet.') %></h2>
<h2 class="hd-3"><%- gettext('You are not enrolled in any programs yet.') %></h2>
<a class="btn-
neutral
" href="<%- marketingUrl %>">
<a class="btn-
brand
" href="<%- marketingUrl %>">
<span class="icon fa fa-search" aria-hidden="true"></span>
<span class="icon fa fa-search" aria-hidden="true"></span>
<span><%- gettext('Explore Programs') %></span>
<span><%- gettext('Explore Programs') %></span>
</a>
</a>
...
...
lms/templates/learner_dashboard/explore_new_programs.underscore
View file @
504f33cf
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<%- gettext('Browse recently launched courses and see what\'s new in your favorite subjects') %>
<%- gettext('Browse recently launched courses and see what\'s new in your favorite subjects') %>
</div>
</div>
<div class="ad-link">
<div class="ad-link">
<a href="<%- marketingUrl %>" class="btn
-neutral
">
<a href="<%- marketingUrl %>" class="btn
new-programs-btn
">
<span class="icon fa fa-search" aria-hidden="true"></span>
<span class="icon fa fa-search" aria-hidden="true"></span>
<span><%- gettext('Explore New Programs') %></span>
<span><%- gettext('Explore New Programs') %></span>
</a>
</a>
...
...
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