From b6e90f4dffde79d038ee7dc8f62020f8ff5b4bd7 Mon Sep 17 00:00:00 2001
From: Michael Roytman <mroytman@edx.org>
Date: Fri, 20 Apr 2018 11:39:14 -0400
Subject: [PATCH] prevent loading both production and development CSS from the
studio-frontend container
---
cms/templates/asset_index.html | 6 ++++--
cms/templates/container.html | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 91abc8005c8..5777b86bdaf 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -13,8 +13,10 @@
<%namespace name='static' file='static_content.html'/>
<%block name="header_extras">
- <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
- <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/assets.min.css')}" />
+ % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
+ <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
+ <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/assets.min.css')}" />
+ % endif
</%block>
<%block name="content">
diff --git a/cms/templates/container.html b/cms/templates/container.html
index 885e0eb2ac1..2cb1a8759a4 100644
--- a/cms/templates/container.html
+++ b/cms/templates/container.html
@@ -35,8 +35,10 @@ from openedx.core.djangolib.markup import HTML, Text
</script>
<link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
% if ENABLE_IN_CONTEXT_IMAGE_SELECTION.is_enabled(xblock_locator.course_key):
- <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
- <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
+ % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
+ <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/common.min.css')}" />
+ <link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/editImageModal.min.css')}" />
+ % endif
% endif
</%block>
--
GitLab