Skip to content

Revert "Comprehensive Theming" #9954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
singingwolfboy wants to merge 1 commit into from
Closed

Revert "Comprehensive Theming" #9954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,13 @@ lms/static/certificates/css/
cms/static/css/

### Styling generated from templates
lms/static/sass/*.css
lms/static/sass/*.css.map
lms/static/certificates/sass/*.css
lms/static/themed_sass/
cms/static/css/
cms/static/sass/*.css
cms/static/sass/*.css.map
cms/static/themed_sass/
themes/**/css/*.css
lms/static/sass/lms-main.scss
lms/static/sass/lms-main-rtl.scss
lms/static/sass/lms-course.scss
lms/static/sass/lms-course-rtl.scss
lms/static/sass/lms-footer.scss
lms/static/sass/lms-footer-rtl.scss


### Logging artifacts
log/
Expand Down
5 changes: 1 addition & 4 deletions cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# Although this module itself may not use these imported variables, other dependent modules may.
from lms.envs.common import (
USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL, DOC_STORE_CONFIG, DATA_DIR, ALL_LANGUAGES, WIKI_ENABLED,
update_module_store_settings, ASSET_IGNORE_REGEX, COPYRIGHT_YEAR, PARENTAL_CONSENT_AGE_LIMIT, COMP_THEME_DIR,
update_module_store_settings, ASSET_IGNORE_REGEX, COPYRIGHT_YEAR, PARENTAL_CONSENT_AGE_LIMIT,
# The following PROFILE_IMAGE_* settings are included as they are
# indirectly accessed through the email opt-in API, which is
# technically accessible through the CMS via legacy URLs.
Expand Down Expand Up @@ -745,9 +745,6 @@
'static_replace',
'require',

# Theming
'openedx.core.djangoapps.theming',

# comment common
'django_comment_common',

Expand Down
5 changes: 0 additions & 5 deletions cms/static/sass/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// ====================

// Table of Contents
// * +Paths
// * +Grid
// * +Fonts
// * +Colors - Utility
Expand All @@ -16,10 +15,6 @@

$baseline: 20px;

// +Paths
// ====================
$static-path: '..' !default;

// +Grid
// ====================
$gw-column: ($baseline*3);
Expand Down
48 changes: 24 additions & 24 deletions cms/static/sass/assets/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,79 +3,79 @@
@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Open Sans';
src:
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
12 changes: 6 additions & 6 deletions cms/static/sass/assets/_graphics.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,41 @@
width: 7px;
height: 22px;
margin-left: ($baseline/2);
background: url('#{$static-path}/images/drag-handles.png') no-repeat;
background: url(../images/drag-handles.png) no-repeat;
cursor: move;
}

.large-advanced-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url('#{$static-path}/images/large-advanced-icon.png') center no-repeat;
background: url(../images/large-advanced-icon.png) center no-repeat;
}

.large-discussion-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url('#{$static-path}/images/large-discussion-icon.png') center no-repeat;
background: url(../images/large-discussion-icon.png) center no-repeat;
}

.large-html-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url('#{$static-path}/images/large-html-icon.png') center no-repeat;
background: url(../images/large-html-icon.png) center no-repeat;
}

.large-problem-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url('#{$static-path}/images/large-problem-icon.png') center no-repeat;
background: url(../images/large-problem-icon.png) center no-repeat;
}

.large-video-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url('#{$static-path}/images/large-video-icon.png') center no-repeat;
background: url(../images/large-video-icon.png) center no-repeat;
}
4 changes: 2 additions & 2 deletions cms/static/sass/elements/_controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,12 @@

// CASE: right to left layout
@include rtl {
background: transparent url("#{$static-path}/images/drag-handles.png") no-repeat left center;
background: transparent url("../images/drag-handles.png") no-repeat left center;
}

// CASE: left to right layout
@include ltr {
background: transparent url("#{$static-path}/images/drag-handles.png") no-repeat right center;
background: transparent url("../images/drag-handles.png") no-repeat right center;
}
}

Expand Down
10 changes: 5 additions & 5 deletions cms/static/sass/elements/_creative-commons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'CreativeCommons';
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot');
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url('#{$static-path}/fonts/CreativeCommons/cc.woff') format('woff'),
url('#{$static-path}/fonts/CreativeCommons/cc.ttf') format('truetype'),
url('#{$static-path}/fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
src: url('../fonts/CreativeCommons/cc.eot');
src: url('../fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url('../fonts/CreativeCommons/cc.woff') format('woff'),
url('../fonts/CreativeCommons/cc.ttf') format('truetype'),
url('../fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion cms/static/sass/elements/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ input.search {
@include box-sizing(border-box);
border: 1px solid $darkGrey;
border-radius: 20px;
background: url('#{$static-path}/images/search-icon.png') no-repeat 8px 7px #edf1f5;
background: url(../images/search-icon.png) no-repeat 8px 7px #edf1f5;
font-family: 'Open Sans', sans-serif;
color: $baseFontColor;
outline: 0;
Expand Down
2 changes: 1 addition & 1 deletion cms/static/sass/elements/_uploaded-assets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
}

&.is-locked {
background-image: url('#{$static-path}/images/bg-micro-stripes.png');
background-image: url('../images/bg-micro-stripes.png');
background-position: 0 0;
background-repeat: repeat;
}
Expand Down
2 changes: 1 addition & 1 deletion cms/static/sass/views/_assets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
}

&.is-locked {
background-image: url('#{$static-path}/images/bg-micro-stripes.png');
background-image: url('../images/bg-micro-stripes.png');
background-position: 0 0;
background-repeat: repeat;
}
Expand Down
6 changes: 3 additions & 3 deletions cms/static/sass/views/_static-pages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
}

.drag-handle {
background: url('#{$static-path}/images/drag-handles.png') center no-repeat #fff;
background: url(../images/drag-handles.png) center no-repeat #fff;
}
}

Expand All @@ -210,10 +210,10 @@
width: 35px;
height: 100%;
border: none;
background: url('#{$static-path}/images/drag-handles.png') center no-repeat #fff;
background: url(../images/drag-handles.png) center no-repeat #fff;

&:hover {
background: url('#{$static-path}/images/drag-handles.png') center no-repeat #fff;
background: url(../images/drag-handles.png) center no-repeat #fff;
}

&.is-fixed {
Expand Down
6 changes: 5 additions & 1 deletion cms/templates/widgets/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@

<div class="wrapper wrapper-l">
<h1 class="branding"><a href="/">
<img src="${static.url("images/header-logo.png")}" alt="${settings.STUDIO_NAME}" />
% if settings.FEATURES.get('IS_EDX_DOMAIN', False):
<img src="${static.url("images/edx-theme/edx-studio-logo.png")}" alt="${settings.STUDIO_NAME}" />
% else:
<img src="${static.url("images/default-theme/logo.png")}" alt="${settings.STUDIO_NAME}" />
% endif
</a></h1>

% if context_course:
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/edxmako/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# limitations under the License.
LOOKUP = {}

from .paths import add_lookup, lookup_template, clear_lookups, save_lookups
from .paths import add_lookup, lookup_template, clear_lookups
Loading