From 0192de00b2e2aa7551103d756d07fd49e55e12ee Mon Sep 17 00:00:00 2001 From: Aura Milena Alba <36944773+amalbas@users.noreply.github.com> Date: Wed, 12 Aug 2020 12:12:36 -0500 Subject: [PATCH] [BD-10] [DEPR-92] Remove scss files that use pattern library --- cms/envs/common.py | 12 - cms/static/sass/_base-v2.scss | 15 - cms/static/sass/_build-v2.scss | 29 -- cms/static/sass/_mixins-v2.scss | 76 ----- cms/static/sass/elements-v2/_controls.scss | 54 ---- cms/static/sass/elements-v2/_header.scss | 178 ----------- cms/static/sass/elements-v2/_navigation.scss | 23 -- cms/static/sass/elements-v2/_sock.scss | 144 --------- cms/static/sass/elements-v2/_tooltip.scss | 26 -- cms/static/sass/studio-main-v2-rtl.scss | 15 - cms/static/sass/studio-main-v2.scss | 15 - cms/templates/ux/reference/index.html | 5 - .../ux/reference/pattern-library/test.html | 22 -- lms/djangoapps/learner_dashboard/programs.py | 26 -- lms/envs/common.py | 24 -- lms/static/sass/_build-learner-dashboard.scss | 12 - lms/static/sass/_build-lms-v2.scss | 43 --- lms/static/sass/base-v2/_base.scss | 6 - lms/static/sass/base-v2/_build.scss | 26 -- lms/static/sass/base-v2/_extends.scss | 6 - lms/static/sass/discussion/_build.scss | 50 --- lms/static/sass/elements-v2/_buttons.scss | 46 --- lms/static/sass/elements-v2/_icons.scss | 34 -- lms/static/sass/elements-v2/_pagination.scss | 139 -------- .../sass/lms-learner-dashboard-rtl.scss | 13 - lms/static/sass/lms-learner-dashboard.scss | 13 - lms/static/sass/lms-main-v2-rtl.scss | 15 - lms/static/sass/lms-main-v2.scss | 15 - lms/static/sass/shared-v2/_base.scss | 26 -- lms/static/sass/shared-v2/_components.scss | 205 ------------ lms/static/sass/shared-v2/_footer.scss | 215 ------------- lms/static/sass/shared-v2/_header.scss | 164 ---------- lms/static/sass/shared-v2/_help-tab.scss | 106 ------- lms/static/sass/shared-v2/_layouts.scss | 86 ----- lms/static/sass/shared-v2/_modal.scss | 300 ------------------ lms/static/sass/shared-v2/_navigation.scss | 33 -- lms/static/sass/shared-v2/_variables.scss | 91 ------ lms/templates/ux/reference/index.html | 6 - .../pattern-library/course-skeleton.html | 97 ------ .../reference/pattern-library/unit-page.html | 46 --- openedx/core/djangoapps/debug/views.py | 4 +- 41 files changed, 1 insertion(+), 2460 deletions(-) delete mode 100644 cms/static/sass/_base-v2.scss delete mode 100644 cms/static/sass/_build-v2.scss delete mode 100644 cms/static/sass/_mixins-v2.scss delete mode 100644 cms/static/sass/elements-v2/_controls.scss delete mode 100644 cms/static/sass/elements-v2/_header.scss delete mode 100644 cms/static/sass/elements-v2/_navigation.scss delete mode 100644 cms/static/sass/elements-v2/_sock.scss delete mode 100644 cms/static/sass/elements-v2/_tooltip.scss delete mode 100644 cms/static/sass/studio-main-v2-rtl.scss delete mode 100644 cms/static/sass/studio-main-v2.scss delete mode 100644 cms/templates/ux/reference/pattern-library/test.html delete mode 100644 lms/static/sass/_build-learner-dashboard.scss delete mode 100644 lms/static/sass/_build-lms-v2.scss delete mode 100644 lms/static/sass/base-v2/_base.scss delete mode 100644 lms/static/sass/base-v2/_build.scss delete mode 100644 lms/static/sass/base-v2/_extends.scss delete mode 100644 lms/static/sass/discussion/_build.scss delete mode 100644 lms/static/sass/elements-v2/_buttons.scss delete mode 100644 lms/static/sass/elements-v2/_icons.scss delete mode 100644 lms/static/sass/elements-v2/_pagination.scss delete mode 100644 lms/static/sass/lms-learner-dashboard-rtl.scss delete mode 100644 lms/static/sass/lms-learner-dashboard.scss delete mode 100644 lms/static/sass/lms-main-v2-rtl.scss delete mode 100644 lms/static/sass/lms-main-v2.scss delete mode 100644 lms/static/sass/shared-v2/_base.scss delete mode 100644 lms/static/sass/shared-v2/_components.scss delete mode 100644 lms/static/sass/shared-v2/_footer.scss delete mode 100644 lms/static/sass/shared-v2/_header.scss delete mode 100644 lms/static/sass/shared-v2/_help-tab.scss delete mode 100644 lms/static/sass/shared-v2/_layouts.scss delete mode 100644 lms/static/sass/shared-v2/_modal.scss delete mode 100644 lms/static/sass/shared-v2/_navigation.scss delete mode 100644 lms/static/sass/shared-v2/_variables.scss delete mode 100644 lms/templates/ux/reference/pattern-library/course-skeleton.html delete mode 100644 lms/templates/ux/reference/pattern-library/unit-page.html diff --git a/cms/envs/common.py b/cms/envs/common.py index eaf44dee95..38567b4ee7 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1094,18 +1094,6 @@ PIPELINE['STYLESHEETS'] = { ], 'output_filename': 'css/studio-main-v1-rtl.css', }, - 'style-main-v2': { - 'source_filenames': [ - 'css/studio-main-v2.css', - ], - 'output_filename': 'css/studio-main-v2.css', - }, - 'style-main-v2-rtl': { - 'source_filenames': [ - 'css/studio-main-v2-rtl.css', - ], - 'output_filename': 'css/studio-main-v2-rtl.css', - }, 'style-xmodule-annotations': { 'source_filenames': [ 'css/vendor/ova/annotator.css', diff --git a/cms/static/sass/_base-v2.scss b/cms/static/sass/_base-v2.scss deleted file mode 100644 index 640d799fe5..0000000000 --- a/cms/static/sass/_base-v2.scss +++ /dev/null @@ -1,15 +0,0 @@ -// studio - base styling -// ==================== -html { - height: 102%; // force scrollbar to prevent jump when scroll appears, cannot use overflow because it breaks drag -} - -body { - min-width: $fg-min-width; - background: $uxpl-grayscale-x-back; - color: $gray-d3; -} - -footer.primary { - font-size: font-size(x-small); -} diff --git a/cms/static/sass/_build-v2.scss b/cms/static/sass/_build-v2.scss deleted file mode 100644 index 01ece489a7..0000000000 --- a/cms/static/sass/_build-v2.scss +++ /dev/null @@ -1,29 +0,0 @@ -// ------------------------------ -// Studio: Shared Build Compile -// Version 2 - introduces the Pattern Library - -// Base build -@import 'build'; - -// Configuration -@import 'config'; - -// Legacy variables -// -// Note: these should be replaced by Bootstrap theme variables -@import 'cms/theme/variables-v1'; - -// Utilities -@import 'mixins-v2'; -@import 'base-v2'; - -// Pattern Library styling -@import 'elements-v2/controls'; -@import 'elements-v2/header'; -@import 'elements-v2/navigation'; -@import 'elements/footer'; -@import 'elements-v2/sock'; -@import 'elements-v2/tooltip'; - -// Extra theme-specific rules -@import 'cms/theme/extras'; diff --git a/cms/static/sass/_mixins-v2.scss b/cms/static/sass/_mixins-v2.scss deleted file mode 100644 index 0dddb6e284..0000000000 --- a/cms/static/sass/_mixins-v2.scss +++ /dev/null @@ -1,76 +0,0 @@ -// pill button -%ui-btn-pill { - border-radius: ($baseline/5); -} - -.announcements-editor { - padding: 40px; - width: 60%; - - .announcement-content { - margin-bottom: 20px; - - textarea { - width: 100%; - min-height: 300px; - max-height: 300px; - overflow: auto; - } - } - - .announcement-active { - label { - margin-bottom: 15px; - } - } - - .save-announcement { - margin-bottom: 15px; - } -} - -.announcements-list { - display: table; - border-spacing: 2em; - - .announcement-label { - display: table-cell; - text-align: center; - } - - .announcement-item { - display: table-row; - - .announcement-content { - display: table-cell; - background-color: $color-draft; - align-content: center; - text-align: center; - padding: 22px 33px; - max-width: 300px; - } - - .announcement-active { - display: table-cell; - padding: 22px 2px; - text-align: center; - vertical-align: middle; - } - - a { - display: table-cell; - vertical-align: middle; - } - } - - a { - color: inherit; - text-decoration: inherit; - } - - a:disabled, - a[disabled] { - opacity: 0.5; - cursor: not-allowed; - } -} diff --git a/cms/static/sass/elements-v2/_controls.scss b/cms/static/sass/elements-v2/_controls.scss deleted file mode 100644 index a8ea745432..0000000000 --- a/cms/static/sass/elements-v2/_controls.scss +++ /dev/null @@ -1,54 +0,0 @@ -// +UI Dropdown Button - Extend -// ==================== -%ui-btn-dd { - @extend %ui-btn; - @extend %ui-btn-pill; - - padding: ($baseline/4) ($baseline/2); - border-width: 1px; - border-style: solid; - border-color: transparent; - text-align: center; - - &:hover, - &:active { - @extend %ui-fake-link; - - border-color: $gray-l3; - } - - &.current, - &.active, - &.is-selected { - box-shadow: inset 0 1px 2px 1px $shadow-l1; - border-color: $gray-l3; - } -} - -// +UI Nav Dropdown Button - Extend -// ==================== -%ui-btn-dd-nav-primary { - @extend %ui-btn-dd; - - background: $white; - border-color: $white; - color: $gray-d1; - - &:hover, - &:active { - background: $white; - color: $blue-s1; - } - - &.current, - &.active { - background: $white; - color: $gray-d4; - - &:hover, - &:active { - color: $blue-s1; - } - } -} - diff --git a/cms/static/sass/elements-v2/_header.scss b/cms/static/sass/elements-v2/_header.scss deleted file mode 100644 index 2798102bdc..0000000000 --- a/cms/static/sass/elements-v2/_header.scss +++ /dev/null @@ -1,178 +0,0 @@ -// studio - elements - global header -// ==================== - -.wrapper-header { - position: relative; - width: 100%; - box-shadow: 0 1px 2px 0 $shadow-l1; - margin: 0; - padding: 0 $baseline; - background: $white; - - header.primary { - @include clearfix(); - @include grid-container(); - @include float(none); - - box-sizing: border-box; - max-width: $fg-max-width; - min-width: $fg-min-width; - margin: 0 auto; - } - - // ==================== - - // basic layout - .wrapper-l, - .wrapper-r { - background: $white; - } - - .wrapper-l { - @include span(7); - } - - .wrapper-r { - @include span(4, before); - @include text-align(right); - } - - .branding, - .info-course, - .nav-course, - .nav-account, - .nav-pitch { - box-sizing: border-box; - display: inline-block; - vertical-align: middle; - } - - .user-language-selector { - width: 120px; - display: inline-block; - margin: 0 10px 0 5px; - vertical-align: sub; - - .language-selector { - width: 120px; - } - } - - .nav-account { - width: auto; - } - - // basic layout - nav items - .nav-dd { - .nav-item { - display: inline-block; - vertical-align: middle; - - &:last-child { - margin-right: 0; - } - - .title { - @extend %ui-btn-dd-nav-primary; - - @include transition(all $tmg-f2 ease-in-out 0s); - - line-height: 16px; - margin-top: 6px; - font-size: font-size(base); - font-weight: font-weight(semi-bold); - - .nav-sub .nav-item { - .icon { - display: inline-block; - vertical-align: middle; - margin-right: ($baseline/4); - } - } - } - } - - .nav-item a { - color: $gray-d1; - - &:hover, - &:focus { - color: $blue-s1; - } - } - } - - // ==================== - - // specific elements - branding - .branding { - padding: ($baseline*0.75) 0; - - .brand-link { - display: block; - - .brand-image { - max-height: ($baseline*2); - display: block; - } - } - } - - // ==================== - - // specific elements - account-based nav - .nav-account { - position: relative; - padding: ($baseline*0.75) 0; - - .nav-sub { - @include text-align(left); - } - - .nav-account-help { - .wrapper-nav-sub { - width: ($baseline*10); - } - } - - .nav-account-user { - .title { - display: inline-block; - max-width: 84%; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - } - - .settings-language-form { - margin-top: 4px; - - .language-selector { - width: 130px; - } - } - } -} -// ==================== - -// CASE: user signed in -.is-signedin { - .wrapper-l { - width: flex-grid(8, 12); - } - - .wrapper-r { - width: flex-grid(4, 12); - } - - .branding { - @include margin-right(2%); - } - - .nav-account { - top: ($baseline/4); - } -} - - diff --git a/cms/static/sass/elements-v2/_navigation.scss b/cms/static/sass/elements-v2/_navigation.scss deleted file mode 100644 index 80d7758f26..0000000000 --- a/cms/static/sass/elements-v2/_navigation.scss +++ /dev/null @@ -1,23 +0,0 @@ -// skip navigation -.nav-skip, -.transcript-skip { - @include left(0); - - font-size: font-size(small); - display: inline-block; - position: absolute; - top: -($baseline*30); - overflow: hidden; - background: $white; - border-bottom: 1px solid $gray-l4; - padding: ($baseline*0.75) ($baseline/2); - - &:focus, - &:active { - position: relative; - top: auto; - width: auto; - height: auto; - margin: 0; - } -} diff --git a/cms/static/sass/elements-v2/_sock.scss b/cms/static/sass/elements-v2/_sock.scss deleted file mode 100644 index 7c2acf86fe..0000000000 --- a/cms/static/sass/elements-v2/_sock.scss +++ /dev/null @@ -1,144 +0,0 @@ -// studio - elements - support sock -// ==================== - -.wrapper-sock { - @include clearfix(); - - position: relative; - margin: ($baseline*2) 0 0 0; - border-top: 1px solid $gray-l4; - width: 100%; - - .wrapper-inner { - @include linear-gradient($gray-d3 0%, $gray-d3 98%, $black 100%); - - display: none; - width: 100% !important; - border-bottom: 1px solid $white; - padding: 0 $baseline !important; - } - - // sock - actions - .list-cta { - @extend %ui-depth1; - - position: absolute; - top: -($baseline*0.75); - width: 100%; - margin: 0 auto; - text-align: center; - - .cta-show-sock { - @extend %ui-btn-pill; - - background: $uxpl-grayscale-x-back; - font-size: font-size(x-small); - padding: ($baseline/2) $baseline; - color: $gray-d3; - - .icon { - @include margin-right($baseline/4); - } - - &:hover { - background: $blue; - color: $white; - } - } - } - - // sock - additional help - .sock { - @include clearfix(); - @include span(12); - - max-width: $fg-max-width; - min-width: $fg-min-width; - margin: 0 auto; - padding: ($baseline*2) 0; - color: $gray-l3; - - // shared elements - .support, - .feedback { - box-sizing: border-box; - - .title { - color: $white; - margin-bottom: ($baseline/2); - } - - .copy { - margin: 0 0 $baseline 0; - } - - .list-actions { - list-style: none; - - .action-item { - @include float(left); - @include margin-right($baseline/2); - - margin-bottom: ($baseline/2); - - &:last-child { - @include margin-right(0); - } - - .action { - display: block; - - .icon { - vertical-align: middle; - - @include margin-right($baseline/4); - } - } - - .tip { - @extend .sr-only; - } - } - - .action-primary { - @extend %btn-brand; - @extend %btn-small; - } - } - } - - // studio support content - .support { - @include float(left); - @include span(8); - - margin-right: flex-gutter(); - - .action-item { - width: flexgrid(4, 8); - } - } - - // studio feedback content - .feedback { - @include float(left); - @include span(4); - - .action-item { - width: flexgrid(4, 4); - } - } - } - - // case: sock content is shown - &.is-shown { - border-color: $gray-d3; - - .list-cta .cta-show-sock { - background: $gray-d3; - border-color: $gray-d3; - color: $white; - font-size: font-size(small); - } - } -} diff --git a/cms/static/sass/elements-v2/_tooltip.scss b/cms/static/sass/elements-v2/_tooltip.scss deleted file mode 100644 index 790733dd26..0000000000 --- a/cms/static/sass/elements-v2/_tooltip.scss +++ /dev/null @@ -1,26 +0,0 @@ -.tooltip { - @include transition(opacity $tmg-f3 ease-out 0s); - - position: absolute; - top: 0; - left: 0; - padding: 0 10px; - border-radius: 3px; - background: $black-t4; - line-height: 26px; - font-size: font-size(x-small); - color: $white; - pointer-events: none; - opacity: 0; - - &::after { - font-size: font-size(x-large); - content: '▾'; - display: block; - position: absolute; - bottom: -14px; - left: 50%; - margin-left: -7px; - color: $black-t4; - } -} diff --git a/cms/static/sass/studio-main-v2-rtl.scss b/cms/static/sass/studio-main-v2-rtl.scss deleted file mode 100644 index 7096f6cd4e..0000000000 --- a/cms/static/sass/studio-main-v2-rtl.scss +++ /dev/null @@ -1,15 +0,0 @@ -// ------------------------------ -// Studio main styling -// Version 2 - introduces the Pattern Library - -// NOTE: This is the right-to-left (RTL) configured style compile. -// It should mirror main-ltr w/ the exception of bi-app references. - - -// Load the RTL version of the edX Pattern Library -$pattern-library-path: '../edx-pattern-library' !default; - -@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-rtl'; - -// Load the shared build -@import 'build-v2'; diff --git a/cms/static/sass/studio-main-v2.scss b/cms/static/sass/studio-main-v2.scss deleted file mode 100644 index 46d49d93ea..0000000000 --- a/cms/static/sass/studio-main-v2.scss +++ /dev/null @@ -1,15 +0,0 @@ -// ------------------------------ -// Studio main styling -// Version 2 - introduces the Pattern Library - -// NOTE: This is the left-to-right (LTR) configured style compile. -// It should mirror main-rtl w/ the exception of bi-app references. - - -// Load the LTR version of the edX Pattern Library -$pattern-library-path: '../edx-pattern-library' !default; - -@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-ltr'; - -// Load the shared build -@import 'build-v2'; diff --git a/cms/templates/ux/reference/index.html b/cms/templates/ux/reference/index.html index 78985c6050..e9adda7336 100644 --- a/cms/templates/ux/reference/index.html +++ b/cms/templates/ux/reference/index.html @@ -19,11 +19,6 @@
  • Course settings page
    • -

    Pattern Library

    - -

    Bootstrap

    -

    Pattern Library

    - -

    Bootstrap