From 6f5134f711d78ae19c69615b2b75b030bba0ab30 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Wed, 7 Jan 2015 17:17:13 -0500 Subject: [PATCH] Move edx branding into edx-theme directory OPEN-307 --- .../templates/static_templates/about.html | 2 +- lms/djangoapps/branding/__init__.py | 2 +- lms/static/images/edx-logo-large-bw.png | Bin 5668 -> 0 bytes .../edx-background-banner-account.png | Bin .../{ => edx-theme}/edx-edge-logo-large.png | Bin .../images/{ => edx-theme}/edx-header-logo.png | Bin .../images/{ => edx-theme}/edx-logo-77x36.png | Bin .../images/{ => edx-theme}/edx-logo-bw.png | Bin lms/static/sass/base/_variables.scss | 6 +++--- lms/static/sass/multicourse/_edge.scss | 2 +- lms/templates/courseware/courses.html | 4 ++-- lms/templates/footer-edx-new.html | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 lms/static/images/edx-logo-large-bw.png rename lms/static/images/{ => edx-theme}/edx-background-banner-account.png (100%) rename lms/static/images/{ => edx-theme}/edx-edge-logo-large.png (100%) rename lms/static/images/{ => edx-theme}/edx-header-logo.png (100%) rename lms/static/images/{ => edx-theme}/edx-logo-77x36.png (100%) rename lms/static/images/{ => edx-theme}/edx-logo-bw.png (100%) diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/about.html b/common/test/test_microsites/test_microsite/templates/static_templates/about.html index a326281b6d..53148823ae 100644 --- a/common/test/test_microsites/test_microsite/templates/static_templates/about.html +++ b/common/test/test_microsites/test_microsite/templates/static_templates/about.html @@ -17,7 +17,7 @@
##
## ##

“${_('The mission of {edX} is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.').format(edX="edX")}”

##
diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py index a9d5742bb2..23735823bf 100644 --- a/lms/djangoapps/branding/__init__.py +++ b/lms/djangoapps/branding/__init__.py @@ -64,7 +64,7 @@ def get_logo_url(): university = microsite.get_value('university') if university is None and settings.FEATURES.get('IS_EDX_DOMAIN', False): - return '{static_url}images/edx-logo-77x36.png'.format( + return '{static_url}images/edx-theme/edx-logo-77x36.png'.format( static_url=settings.STATIC_URL ) elif university: diff --git a/lms/static/images/edx-logo-large-bw.png b/lms/static/images/edx-logo-large-bw.png deleted file mode 100644 index d888e1f4bb9138cf0cd92096a144e2f7ac88738f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5668 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 KMNUMnLSTZHsq9Ap diff --git a/lms/static/images/edx-background-banner-account.png b/lms/static/images/edx-theme/edx-background-banner-account.png similarity index 100% rename from lms/static/images/edx-background-banner-account.png rename to lms/static/images/edx-theme/edx-background-banner-account.png diff --git a/lms/static/images/edx-edge-logo-large.png b/lms/static/images/edx-theme/edx-edge-logo-large.png similarity index 100% rename from lms/static/images/edx-edge-logo-large.png rename to lms/static/images/edx-theme/edx-edge-logo-large.png diff --git a/lms/static/images/edx-header-logo.png b/lms/static/images/edx-theme/edx-header-logo.png similarity index 100% rename from lms/static/images/edx-header-logo.png rename to lms/static/images/edx-theme/edx-header-logo.png diff --git a/lms/static/images/edx-logo-77x36.png b/lms/static/images/edx-theme/edx-logo-77x36.png similarity index 100% rename from lms/static/images/edx-logo-77x36.png rename to lms/static/images/edx-theme/edx-logo-77x36.png diff --git a/lms/static/images/edx-logo-bw.png b/lms/static/images/edx-theme/edx-logo-bw.png similarity index 100% rename from lms/static/images/edx-logo-bw.png rename to lms/static/images/edx-theme/edx-logo-bw.png diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 5de045cf37..025591b4e6 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -411,9 +411,9 @@ $homepage__header--background: lighten($gray, 15%); // IMAGES: backgrounds $homepage-bg-image: none; -$login-banner-image: url(../images/edx-background-banner-account.png); -$register-banner-image: url(../images/edx-background-banner-account.png); -$passwordreset-banner-image: url(../images/edx-background-banner-account.png); +$login-banner-image: url(../images/edx-theme/edx-background-banner-account.png); +$register-banner-image: url(../images/edx-theme/edx-background-banner-account.png); +$passwordreset-banner-image: url(../images/edx-theme/edx-background-banner-account.png); $video-thumb-url: '../images/homepage-hero-video-thumb.jpg'; diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss index 150a2738f3..996825c7fd 100644 --- a/lms/static/sass/multicourse/_edge.scss +++ b/lms/static/sass/multicourse/_edge.scss @@ -175,7 +175,7 @@ $paleYellow: #fffcf1; width: 263px; height: 72px; margin: 150px auto 50px; - background: url(../images/edx-edge-logo-large.png) no-repeat; + background: url(../images/edx-theme/edx-edge-logo-large.png) no-repeat; text-indent: -9999px; overflow: hidden; } diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 5f8a0c80fe..700e27e561 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -19,8 +19,8 @@ course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore courses from {platform_name}.").format(platform_name=platform_name)) if settings.FEATURES.get('IS_EDX_DOMAIN', False): - # For some reason, `static.url('images/edx-logo-bw.png')` breaks template rendering. - default_image_url = settings.STATIC_URL + 'images/edx-logo-bw.png' + # For some reason, `static.url('images/edx-theme/edx-logo-bw.png')` breaks template rendering. + default_image_url = settings.STATIC_URL + 'images/edx-theme/edx-logo-bw.png' else: default_image_url = settings.STATIC_URL + 'images/logo-placeholder-large.png' diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html index ade89a574d..40ca1b8055 100644 --- a/lms/templates/footer-edx-new.html +++ b/lms/templates/footer-edx-new.html @@ -11,7 +11,7 @@

${_("About edX")}