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

Merge pull request #8467 from edx/release-2015-06-10-conflict

Browse Source 
Release 2015 06 10 conflict
This commit is contained in:
Edward Zarecor
2015-06-11 10:16:48 -04:00
parent 3706949eab c12c5c926d
commit ac6e259388
16 changed files with 382 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lms/static/sass/multicourse/_courses.scss
View File

@@ -41,38 +41,78 @@ $facet-background-color: #007db8;
.courses {
@include rtl() { $layout-direction: "RTL"; }
@include span-columns(9);
@include media($bp-medium) {
@include span-columns(4);
}
@include media($bp-large) {
@include span-columns(8);
}
@include media($bp-huge) {
@include span-columns(9);
}
.courses-listing .courses-listing-item {
@include fill-parent();
margin: ($baseline*0.75) 0 ($baseline*1.5) 0;
max-height: $course-card-height;
}
/* Style grid settings if course discovery turned on */
&:not(.no-course-discovery) {
@include span-columns(9);
@include media($bp-medium) {
@include span-columns(8); // 4 of 8
@include omega(1n);
@include span-columns(4);
}
@include media($bp-large) {
@include span-columns(6); // 6 of 12
@include omega(2n);
@include span-columns(8);
}
@include media($bp-huge) {
@include span-columns(4); // 4 of 12
@include omega(3n);
@include span-columns(9);
}
.courses-listing .courses-listing-item {
@include media($bp-medium) {
@include span-columns(8); // 4 of 8
@include omega(1n);
}
@include media($bp-large) {
@include span-columns(6); // 6 of 12
@include omega(2n);
}
@include media($bp-huge) {
@include span-columns(4); // 4 of 12
@include omega(3n);
}
}
}
/* Style grid settings if course discovery turned off */
&.no-course-discovery{
@include span-columns(12);
@include media($bp-medium) {
@include span-columns(8);
}
@include media($bp-large) {
@include span-columns(12);
}
@include media($bp-huge) {
@include span-columns(12);
}
.courses-listing .courses-listing-item {
@include media($bp-medium) {
@include span-columns(4); // 4 of 8
@include omega(2n);
}
@include media($bp-large) {
@include span-columns(4); // 4 of 12
@include omega(3n);
}
@include media($bp-huge) {
@include span-columns(3); // 3 of 12
@include omega(4n);
}
}
}
}

18
lms/static/sass/shared/_footer-edx.scss
View File

@@ -80,12 +80,15 @@ footer#footer-edx-v3 {
}
}
.social-media-links,
.mobile-app-links {
@include clearfix();
position: relative;
width: 260px;
height: 42px;
}
.social-media-links {
@include clearfix();
margin-bottom: 30px;
}
@@ -119,17 +122,20 @@ footer#footer-edx-v3 {
}
.app-link {
@include float(left);
@include margin-right(10px);
position: relative;
display: inline-block;
position: absolute;
top: 0;
&:first-of-type {
@include left(0);
}
&:last-of-type {
@include margin-right(0);
@include right(0);
}
img {
height: 40px;
max-width: 200px;
}
}