Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12230 from edx/schen/ECOM-4272

Browse Source 
ECOM-4272 Add the cosmetic changes to the program listing page
This commit is contained in:
Simon Chen
2016-04-22 17:01:02 -04:00
parent 77551089af f1e79c0b9b
commit 7791e7fc1d
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/static/js/spec/learner_dashboard/program_card_view_spec.js
View File

@@ -56,7 +56,7 @@ define([
expect($cards).toBeDefined(); expect($cards).toBeDefined();
expect($cards.find('.title').html().trim()).toEqual(program.name); expect($cards.find('.title').html().trim()).toEqual(program.name);
expect($cards.find('.category span').html().trim()).toEqual('XSeries Program'); expect($cards.find('.category span').html().trim()).toEqual('XSeries Program');
expect($cards.find('.organization').html().trim()).toEqual(program.organizations[0].display_name); expect($cards.find('.organization').html().trim()).toEqual(program.organizations[0].key);
expect($cards.find('.card-link').attr('href')).toEqual(program.marketing_url); expect($cards.find('.card-link').attr('href')).toEqual(program.marketing_url);
}); });

4
lms/static/sass/elements/_program-card.scss
View File

@@ -19,7 +19,7 @@
left: 0; left: 0;
border: 0; border: 0;
z-index: 1; z-index: 1;
opacity: 0.5; opacity: 0.8;
&:hover, &:hover,
&:focus{ &:focus{
opacity: 1; opacity: 1;
@@ -69,7 +69,7 @@
} }
.title{ .title{
font-size: em(24); font-size: em(24);
color: $gray-l1; color: $gray-d2;
margin-bottom: 10px; margin-bottom: 10px;
line-height: 1.2; line-height: 1.2;
} }

18
lms/static/sass/shared/_header.scss
View File

@@ -263,13 +263,16 @@ header.global {
list-style: none; list-style: none;
@include float(left); @include float(left);
.tab-nav-item{ .tab-nav-item{
display: inline; display: flex;
margin: 0px; margin: 0px;
text-transform: none;
@include float(left);
justify-content: center;
.tab-nav-link{ .tab-nav-link{
font-size: em(16); font-size: em(16);
color: $gray; color: $gray;
padding: 26px 15px; padding: 5px 25px 23px;
display: inline; display: inline-block;
&:hover, &:hover,
&:focus{ &:focus{
border-bottom: 4px solid $courseware-border-bottom-color; border-bottom: 4px solid $courseware-border-bottom-color;
@@ -393,13 +396,16 @@ header.global-new {
.nav-global { .nav-global {
@include float(left); @include float(left);
.tab-nav-item{ .tab-nav-item{
display: inline; display: flex;
margin: 0px; margin: 0px;
text-transform: none;
@include float(left);
justify-content: center;
.tab-nav-link{ .tab-nav-link{
font-size: em(16); font-size: em(16);
color: $gray; color: $gray;
display: inline; display: inline-block;
padding: 25px 15px; padding: 5px 25px 19px;
&:hover, &:hover,
&:focus{ &:focus{
border-bottom: 4px solid $courseware-border-bottom-color; border-bottom: 4px solid $courseware-border-bottom-color;

2
lms/templates/learner_dashboard/program_card.underscore
View File

@@ -14,7 +14,7 @@
<div class="meta-info"> <div class="meta-info">
<div class="organization"> <div class="organization">
<% _.each(organizations, function(org){ %> <% _.each(organizations, function(org){ %>
<%- gettext(org.display_name) %> <%- gettext(org.key) %>
<% }); %> <% }); %>
</div> </div>
<div class="category"> <div class="category">