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

Merge pull request #13975 from edx/revert-13860-bjacobel/susy

Browse Source 
Revert "Update to UXPL 0.17 (grids compilation performance work)"
This commit is contained in:
Brian Jacobel
2016-11-10 18:31:41 -05:00
committed by GitHub
parent b4c61e87aa d39f7197c3
commit 492d417dca
21 changed files with 110 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/static/sass/elements-v2/_header.scss
View File

@@ -11,7 +11,7 @@
header.primary {
@include clearfix();
@include grid-container();
@include span(12);
@include float(none);
box-sizing: border-box;
max-width: $fg-max-width;
@@ -31,7 +31,7 @@
}
.wrapper-r {
@include span(4, before);
@include span(4 last);
@include text-align(right);
}

5
cms/static/sass/programs/_views.scss
View File

@@ -28,13 +28,8 @@
.app-header {
@include clearfix();
@include grid-row;
border-bottom: 1px solid palette(grayscale, base);
margin-bottom: 20px;
form {
@include span(12);
}
}
.course-container {

2
cms/templates/js/programs/program_details.underscore
View File

@@ -1,5 +1,5 @@
<header class="app-header">
<form class="layout layout-1q3q">
<form>
<div class="layout-col layout-col-b">
<div class="js-inline-edit field">
<span class="js-model-value copy copy-large emphasized"><%- name %></span>

2
cms/templates/program_authoring.html
View File

@@ -17,5 +17,5 @@
</%block>
<%block name="content">
<div class="js-program-admin program-app layout-1q3q layout" data-home-url="${studio_home_url}" data-lms-base-url="${lms_base_url}" data-programs-api-url="${programs_api_url}" data-auth-url="${programs_token_url}" data-username="${request.user.username}"></div>
<div class="js-program-admin program-app layout-1q3q layout-reversed" data-home-url="${studio_home_url}" data-lms-base-url="${lms_base_url}" data-programs-api-url="${programs_api_url}" data-auth-url="${programs_token_url}" data-username="${request.user.username}"></div>
</%block>

2
lms/static/certificates/sass/_components.scss
View File

@@ -228,7 +228,7 @@
}
.accomplishment-type-label {
@include span(10);
width: span(10);
margin: 0 auto;
font-weight: font-weight(semi-bold);
}

121
lms/static/certificates/sass/_layouts.scss
View File

@@ -11,15 +11,15 @@
// ------------------------------
%layout-wrapper {
margin-bottom: spacing-vertical(base);
padding: 0 5%;
padding: 0 (gutter()*2);
@media(min-width: $bp-screen-md) {
padding: 0 2.5%;
@include susy-breakpoint($bp-screen-md, $susy) {
padding: 0 gutter();
}
}
%layout {
@include grid-container();
@include container();
}
// app header
@@ -45,9 +45,8 @@
}
.header-app-title {
@include text-align(center);
@include span(12);
margin: 0;
@include text-align(center);
}
// banner
@@ -69,12 +68,12 @@
.banner-user {
@include text-align(center);
@media(min-width: $bp-screen-lg) {
@include susy-breakpoint($bp-screen-lg, $susy) {
@include text-align(left);
}
.wrapper-copy-and-actions {
@include grid-container();
@include container();
.message-copy {
margin-bottom: spacing-vertical(small);
@@ -92,7 +91,7 @@
// CASE: icon display only
&.icon-only {
@media(min-width: $bp-screen-md) {
@include susy-breakpoint($bp-screen-md, $susy) {
padding: spacing-vertical(x-small) spacing-horizontal(base);
.icon {
@@ -101,7 +100,7 @@
}
}
@media(min-width: $bp-screen-md) {
@include susy-breakpoint($bp-screen-md, $susy) {
display: inline-block;
vertical-align: middle;
width: auto;
@@ -127,16 +126,16 @@
.footer-app-copyright {
@media(min-width: $bp-screen-md) {
@include span(6, after);
@include susy-breakpoint($bp-screen-md, $susy) {
@include span(6 first);
margin-bottom: 0;
}
}
.footer-app-nav {
@media(min-width: $bp-screen-md) {
@include span(6, before);
@include susy-breakpoint($bp-screen-md, $susy) {
@include span(6 last);
}
.list {
@@ -145,7 +144,7 @@
display: block;
margin-bottom: spacing-vertical(x-small);
@media(min-width: $bp-screen-md) {
@include susy-breakpoint($bp-screen-md, $susy) {
display: inline-block;
vertical-align: middle;
@include margin-right(spacing-horizontal(base));
@@ -156,7 +155,7 @@
.list-legal {
@media(min-width: $bp-screen-md) {
@include susy-breakpoint($bp-screen-md, $susy) {
@include text-align(right);
}
}
@@ -187,46 +186,52 @@
top: -(spacing-vertical(base));
.accomplishment-course,
.accomplishment-recipient,
.accomplishment-type {
@include span(12);
.accomplishment-recipient {
width: span(12);
@include susy-breakpoint($bp-screen-lg, $susy) {
width: span(10);
}
}
.accomplishment-summary,
.accomplishment-statement-detail {
@include span(12);
width: span(12);
@include susy-breakpoint($bp-screen-lg, $susy) {
width: span(8);
}
}
}
.accomplishment-orgs {
@include grid-row;
.wrapper-orgs {
@include text-align(center);
}
.wrapper-organization {
@include span(6);
@include margin-right(spacing-horizontal(base));
display: inline-block;
vertical-align: middle;
width: span(6);
height: rem(100);
@include margin-right(spacing-horizontal(base));
margin-bottom: spacing-vertical(small);
&:last-child {
@include margin-right(0);
}
@media(min-width: $bp-screen-md) {
@include span(3);
@include susy-breakpoint($bp-screen-md, $susy) {
width: span(3);
}
@media(min-width: $bp-screen-lg) {
@include span(2);
@include susy-breakpoint($bp-screen-lg, $susy) {
width: span(2);
}
@media(min-width: $bp-screen-xl) {
@include span(2);
@include susy-breakpoint($bp-screen-xl, $susy) {
width: span(2);
}
}
@@ -254,18 +259,18 @@
.signatory {
display: inline-block;
vertical-align: middle;
@include span(12);
width: span(12);
@media(min-width: $bp-screen-md) {
@include span(4);
@include susy-breakpoint($bp-screen-md, $susy) {
width: span(4);
}
@media(min-width: $bp-screen-lg) {
@include span(3);
@include susy-breakpoint($bp-screen-lg, $susy) {
width: span(3);
}
@media(min-width: $bp-screen-xl) {
@include span(3);
@include susy-breakpoint($bp-screen-xl, $susy) {
width: span(3);
}
.signatory-signature {
@@ -281,32 +286,24 @@
@extend %layout-wrapper;
.accomplishment-metadata {
@extend %layout;
.accomplishment-metadata-title {
@include span(12);
}
@extend %layout;
}
.wrapper-metadata {
@extend %layout;
.wrapper-metadata .metadata {
@extend %divider-2;
margin-bottom: spacing-vertical(small);
border-bottom-color: palette(grayscale, x-back);
padding-bottom: spacing-vertical(small);
.metadata {
@extend %divider-2;
margin-bottom: spacing-vertical(small);
border-bottom-color: palette(grayscale, x-back);
padding-bottom: spacing-vertical(small);
&:last-child {
border-bottom: none;
padding-bottom: 0;
}
&:last-child {
border-bottom: none;
padding-bottom: 0;
}
@media(min-width: $bp-screen-md) {
@include span(4);
border-bottom: none;
padding-bottom: 0;
}
@include susy-breakpoint($bp-screen-md, $susy) {
@include gallery(4);
border-bottom: none;
padding-bottom: 0;
}
}
}
@@ -321,8 +318,8 @@
.accomplishment-brief {
margin-bottom: spacing-vertical(small);
@media(min-width: $bp-screen-md) {
@include span(6);
@include susy-breakpoint($bp-screen-md, $susy) {
@include gallery(6);
}
.accomplishment-type-symbol {
@@ -346,8 +343,8 @@
margin-bottom: 0;
}
@media(min-width: $bp-screen-md) {
@include span(6);
@include susy-breakpoint($bp-screen-md, $susy) {
@include gallery(6);
margin-bottom: 0;
}
}

6
lms/static/certificates/sass/_print.scss
View File

@@ -212,7 +212,7 @@
.accomplishment-statement {
@extend %print-rendering-section;
@include span(8);
width: span(8);
margin: 0 auto;
}
@@ -244,7 +244,7 @@
.accomplishment-signatories {
@extend %print-rendering-section;
@include span(12, before);
@include span(12 last);
.signatory-credentials {
font-size: 8pt;
@@ -271,7 +271,7 @@
&.has-many {
.signatory {
@include span(2);
@include gallery(2);
}
}
}

8
lms/static/certificates/sass/_views.scss
View File

@@ -26,15 +26,15 @@
.content-main {
margin-bottom: spacing-vertical(base);
@media(min-width: $bp-screen-md) {
@include span(9, after);
@include susy-breakpoint($bp-screen-md, $susy) {
@include span(9 of 12 first);
}
}
.content-secondary {
@media(min-width: $bp-screen-md) {
@include span(3, before);
@include susy-breakpoint($bp-screen-md, $susy) {
@include span(3 of 12 last);
}
}
}

3
lms/static/sass/discussion/_discussion.scss
View File

@@ -177,6 +177,7 @@ body.discussion {
.container .discussion-body {
@include clearfix();
display: block;
border: none;
background: transparent;
box-shadow: none;
@@ -294,7 +295,7 @@ body.discussion {
// inline discussion module
.discussion-module {
@extend .discussion-body;
display: block;
position: relative;
margin: $baseline 0;
padding: $baseline;

4
lms/static/sass/elements/_banners.scss
View File

@@ -22,7 +22,7 @@ $full-width-banner-margin: 20px;
background: $black;
opacity: 0.65;
@media(min-width: $bp-screen-md) {
@include susy-media($bp-screen-md) {
opacity: 0.4;
}
}
@@ -31,7 +31,7 @@ $full-width-banner-margin: 20px;
.banner-background-image {
height: $full-width-banner-img-height;
@media(min-width: $full-width-banner-img-width) {
@include susy-media($full-width-banner-img-width) {
height: auto;
width: 100%;
}

16
lms/static/sass/elements/_course-card.scss
View File

@@ -1,7 +1,5 @@
.course-card {
@include span(10);
@include pre(1);
@include post(1);
width: 85%;
margin: {
left: auto;
right: auto;
@@ -10,7 +8,9 @@
padding: $baseline/2 0;
.section {
@extend .grid-container;
@extend .grid-manual;
padding: $baseline/2 $baseline;
}
@@ -19,7 +19,7 @@
.header-img {
max-width: 100%;
@media(min-width: $bp-screen-sm) {
@include susy-media($bp-screen-sm) {
max-width: 191px;
}
}
@@ -28,7 +28,7 @@
.course-details {
@include float(right);
width: 100%;
@media(min-width: $bp-screen-sm) { width: calc(100% - 191px); }
@include susy-media($bp-screen-sm) { width: calc(100% - 191px); }
padding-left: $baseline*1.5;
.course-title {
@@ -131,17 +131,17 @@
.message {
margin-bottom: $baseline;
@media(min-width: $bp-screen-md) {
@include susy-media($bp-screen-md) {
margin-bottom: 0;
}
}
.upgrade-message,
.certificate-status {
border-top: 1px solid palette(grayscale, back);
padding-top: $baseline;
@media(min-width: $bp-screen-md) {
@include susy-media($bp-screen-md) {
display: flex;
align-items: center;
}

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

@@ -7,20 +7,17 @@
}
.program-card {
@include span(12);
@include span(12);
border: 1px solid $border-color-l3;
border-bottom: none;
margin-bottom: $baseline;
position: relative;
@media(min-width: $bp-screen-md) {
@include susy-media($bp-screen-md) {
@include span(6);
&:nth-child(2n) {
@include span(6, before);
}
&:nth-child(2n+1) {
@include span(6, after);
@include margin-right(0);
}
}
@@ -33,7 +30,7 @@
border: 0;
z-index: 1;
opacity: 0.8;
&:active,
&:hover,
&:focus {
@@ -45,9 +42,9 @@
overflow: hidden;
height: 166px;
@media(min-width: $bp-screen-sm) { height: 242px; }
@media(min-width: $bp-screen-md) { height: 116px; }
@media(min-width: $bp-screen-lg) { height: 145px; }
@include susy-media($bp-screen-sm) { height: 242px; }
@include susy-media($bp-screen-md) { height: 116px; }
@include susy-media($bp-screen-lg) { height: 145px; }
.banner-image {
@include left(50%);
@@ -65,9 +62,9 @@
position: relative;
margin-top: 156px;
@media(min-width: $bp-screen-sm) { margin-top: 232px; }
@media(min-width: $bp-screen-md) { margin-top: 106px; }
@media(min-width: $bp-screen-lg) { margin-top: 135px; }
@include susy-media($bp-screen-sm) { margin-top: 232px; }
@include susy-media($bp-screen-md) { margin-top: 106px; }
@include susy-media($bp-screen-lg) { margin-top: 135px; }
}
.meta-info {
@@ -79,13 +76,13 @@
}
.organization {
@include span(6, none);
@include span(6);
white-space: nowrap;
overflow: hidden;
}
.category {
@include span(6, none);
@include span(6);
@include text-align(right);
.category-text {
@@ -116,7 +113,7 @@
color: palette(grayscale, dark);
line-height: 1;
}
.secondary {
@extend %hide-until-focus;
}

2
lms/static/sass/shared-v2/_base.scss
View File

@@ -10,7 +10,7 @@
}
.content-wrapper {
@include span(12, none);
width: span(12);
margin: 0 auto;
@media print {

4
lms/static/sass/shared-v2/_footer.scss
View File

@@ -38,7 +38,7 @@
.colophon {
@include span(12);
@media(min-width: $bp-screen-sm) {
@include susy-media($bp-screen-sm) {
@include span(8);
}
@@ -168,7 +168,7 @@
@include text-align(right);
vertical-align: bottom;
@media(min-width: $bp-screen-sm) {
@include susy-media($bp-screen-sm) {
@include span(4);
@include margin-right(0);
}

1
lms/static/sass/shared-v2/_header.scss
View File

@@ -12,6 +12,7 @@
.wrapper-header {
@include clearfix();
box-sizing: border-box;
height: 74px;
margin: 0 auto;
padding: 10px 10px 0;
width: 100%;

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

@@ -16,6 +16,7 @@
margin: 0 auto;
padding: 18px ($baseline/2) 0;
max-width: grid-width(12);
width: 100%;
}
h1.logo {
@@ -323,6 +324,7 @@
.nav-courseware {
@include float(right);
margin-top: ($baseline/4);
list-style: none;
li, div {

2
lms/static/sass/views/_program-details.scss
View File

@@ -36,7 +36,7 @@
.breadcrumb-wrapper {
padding: $full-width-banner-margin;
@media(min-width: $bp-screen-xl) {
@include susy-media(1200px) {
padding-left: 0;
}
}

6
lms/static/sass/views/_program-list.scss
View File

@@ -3,10 +3,9 @@
}
.program-cards-container {
@include grid-container();
@include span(12);
@media(min-width: $bp-screen-md) {
@include susy-media($bp-screen-md) {
@include span(9);
}
}
@@ -16,7 +15,7 @@
@include float(right);
margin-bottom: $baseline;
@media(min-width: $bp-screen-md) {
@include susy-media($bp-screen-md) {
@include span(3);
}
@@ -67,7 +66,6 @@
}
.empty-programs-message {
@include span(12);
border: 3px solid $gray-l4;
background: $gray-l6;
padding: ($baseline*2) 0;

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

@@ -1,6 +1,6 @@
<header class="js-program-header program-header full-width-banner"></header>
<div class="program-details-content grid-container">
<div class="js-program-progress-view"></div>
<div class="js-course-list row"></div>
<div class="js-course-list"></div>
<aside class="js-course-sidebar"></aside>
</div>

6
lms/templates/learner_dashboard/program_header_view.underscore
View File

@@ -4,10 +4,10 @@
<source srcset="<%- programData.banner_image_urls.w726h242 %>" media="(min-width: <%- breakpoints.min.medium %>)">
<img class="banner-background-image" srcset="<%- programData.banner_image_urls.w348h116 %>" alt="">
</picture>
<div class="banner-content grid-container">
<h2 class="hd-1 title row"><%- programData.name %></h2>
<p class="hd-4 subtitle row"><%- programData.subtitle %></p>
<h2 class="hd-1 title"><%- programData.name %></h2>
<p class="hd-4 subtitle"><%- programData.subtitle %></p>
<% if (programData.organizations.length) { %>
<div class="org-wrapper">
<% _.each(programData.organizations, function(org) { %>

2
package.json
View File

@@ -5,7 +5,7 @@
"backbone": "~1.3.2",
"backbone-validation": "~0.11.5",
"coffee-script": "1.6.1",
"edx-pattern-library": "~0.17.0",
"edx-pattern-library": "0.16.6",
"edx-ui-toolkit": "1.5.0",
"jquery": "~2.2.0",
"jquery-migrate": "^1.4.1",