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

Comprehensive theming

Browse Source 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
This commit is contained in:
David Baumgold
2015-05-14 16:07:09 -04:00
parent 034570b31a
commit 6ebf2515f4
95 changed files with 1436 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/envs/common.py
View File

@@ -36,7 +36,7 @@ import lms.envs.common
# 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,
update_module_store_settings, ASSET_IGNORE_REGEX, COPYRIGHT_YEAR, PARENTAL_CONSENT_AGE_LIMIT, COMP_THEME_DIR,
# 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.
@@ -754,6 +754,9 @@ INSTALLED_APPS = (
'static_replace',
'require',
# Theming
'openedx.core.djangoapps.theming',
# comment common
'django_comment_common',

5
cms/static/sass/_variables.scss
View File

@@ -11,6 +11,7 @@
// * +Timing
// * +Archetype UI
// * +Specific UI
// * +Paths
// * +Deprecated
$baseline: 20px;
@@ -213,6 +214,10 @@ $ui-link-color-focus: $blue-s1;
$ui-notification-height: ($baseline*10);
$ui-update-color: $blue-l4;
// +Paths
// ====================
$static-path: '..' !default;
// +Deprecated
// ====================
// do not use, future clean up will use updated styles

48
cms/static/sass/assets/_fonts.scss
View File

@@ -3,9 +3,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 300;
font-style: normal;
}
@@ -13,9 +13,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 300;
font-style: italic;
}
@@ -23,9 +23,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 400;
font-style: normal;
}
@@ -33,9 +33,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 400;
font-style: italic;
}
@@ -43,9 +43,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 600;
font-style: normal;
}
@@ -53,9 +53,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 600;
font-style: italic;
}
@@ -63,9 +63,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 700;
font-style: normal;
}
@@ -73,9 +73,9 @@
@font-face {
font-family: 'Open Sans';
src:
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');
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');
font-weight: 700;
font-style: italic;
}

12
cms/static/sass/assets/_graphics.scss
View File

@@ -7,7 +7,7 @@
width: 7px;
height: 22px;
margin-left: ($baseline/2);
background: url(../images/drag-handles.png) no-repeat;
background: url($static-path + '/images/drag-handles.png') no-repeat;
cursor: move;
}
@@ -15,33 +15,33 @@
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url(../images/large-advanced-icon.png) center no-repeat;
background: url($static-path + '/images/large-advanced-icon.png') center no-repeat;
}
.large-discussion-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url(../images/large-discussion-icon.png) center no-repeat;
background: url($static-path + '/images/large-discussion-icon.png') center no-repeat;
}
.large-html-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url(../images/large-html-icon.png) center no-repeat;
background: url($static-path + '/images/large-html-icon.png') center no-repeat;
}
.large-problem-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url(../images/large-problem-icon.png) center no-repeat;
background: url($static-path + '/images/large-problem-icon.png') center no-repeat;
}
.large-video-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url(../images/large-video-icon.png) center no-repeat;
background: url($static-path + '/images/large-video-icon.png') center no-repeat;
}

4
cms/static/sass/elements/_controls.scss
View File

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

10
cms/static/sass/elements/_creative-commons.scss
View File

@@ -1,10 +1,10 @@
@font-face {
font-family: 'CreativeCommons';
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');
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');
font-weight: normal;
font-style: normal;
}

2
cms/static/sass/elements/_forms.scss
View File

@@ -456,7 +456,7 @@ input.search {
@include box-sizing(border-box);
border: 1px solid $darkGrey;
border-radius: 20px;
background: url(../images/search-icon.png) no-repeat 8px 7px #edf1f5;
background: url($static-path + '/images/search-icon.png') no-repeat 8px 7px #edf1f5;
font-family: 'Open Sans', sans-serif;
color: $baseFontColor;
outline: 0;

2
cms/static/sass/elements/_uploaded-assets.scss
View File

@@ -100,7 +100,7 @@
}
&.is-locked {
background-image: url('../images/bg-micro-stripes.png');
background-image: url($static-path + '/images/bg-micro-stripes.png');
background-position: 0 0;
background-repeat: repeat;
}

2
cms/static/sass/views/_assets.scss
View File

@@ -299,7 +299,7 @@
}
&.is-locked {
background-image: url('../images/bg-micro-stripes.png');
background-image: url($static-path + '/images/bg-micro-stripes.png');
background-position: 0 0;
background-repeat: repeat;
}

6
cms/static/sass/views/_static-pages.scss
View File

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

6
cms/templates/widgets/header.html
View File

@@ -12,11 +12,7 @@
<div class="wrapper wrapper-l">
<h1 class="branding"><a href="/">
% 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
<img src="${static.url("images/header-logo.png")}" alt="${settings.STUDIO_NAME}" />
</a></h1>
% if context_course: