diff --git a/cms/envs/common.py b/cms/envs/common.py
index 0919834a9b64..7a36bfab3d96 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -843,6 +843,7 @@
# Public domain name of Studio (should be resolvable from the end-user's browser)
CMS_BASE = 'localhost:18010'
+CMS_ROOT_URL = "https://localhost:18010"
LOG_DIR = '/edx/var/log/edx'
diff --git a/cms/envs/production.py b/cms/envs/production.py
index ad7667772f9a..da5642b53c6c 100644
--- a/cms/envs/production.py
+++ b/cms/envs/production.py
@@ -163,6 +163,7 @@ def get_env_setting(setting):
CMS_BASE = ENV_TOKENS.get('CMS_BASE')
LMS_BASE = ENV_TOKENS.get('LMS_BASE')
LMS_ROOT_URL = ENV_TOKENS.get('LMS_ROOT_URL')
+CMS_ROOT_URL = ENV_TOKENS.get('CMS_ROOT_URL')
LMS_INTERNAL_ROOT_URL = ENV_TOKENS.get('LMS_INTERNAL_ROOT_URL', LMS_ROOT_URL)
ENTERPRISE_API_URL = ENV_TOKENS.get('ENTERPRISE_API_URL', LMS_INTERNAL_ROOT_URL + '/enterprise/api/v1/')
ENTERPRISE_CONSENT_API_URL = ENV_TOKENS.get('ENTERPRISE_CONSENT_API_URL', LMS_INTERNAL_ROOT_URL + '/consent/api/v1/')
diff --git a/cms/envs/test.py b/cms/envs/test.py
index 49db50608858..6a7c17b001fe 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -136,6 +136,9 @@
LMS_ROOT_URL = f"http://{LMS_BASE}"
FEATURES['PREVIEW_LMS_BASE'] = "preview.localhost"
+CMS_BASE = "localhost:8001"
+CMS_ROOT_URL = f"http://{CMS_BASE}"
+
COURSE_AUTHORING_MICROFRONTEND_URL = "http://course-authoring-mfe"
DISCUSSIONS_MICROFRONTEND_URL = "http://discussions-mfe"
diff --git a/cms/static/sass/course-unit-mfe-iframe-bundle.scss b/cms/static/sass/course-unit-mfe-iframe-bundle.scss
index bc0c3901b147..1f813fac253d 100644
--- a/cms/static/sass/course-unit-mfe-iframe-bundle.scss
+++ b/cms/static/sass/course-unit-mfe-iframe-bundle.scss
@@ -200,7 +200,7 @@ body {
}
}
- .modal-window.modal-editor {
+ .modal-window.modal-editor, &.xblock-iframe-content {
background-color: $white;
border-radius: 6px;
@@ -381,6 +381,37 @@ body {
.modal-lg.modal-window.confirm.openassessment_modal_window {
height: 635px;
}
+
+ // Additions for the xblock editor on the Library Authoring
+ &.xblock-iframe-content {
+ // Reset the max-height to allow the settings list to grow
+ .wrapper-comp-settings .list-input.settings-list {
+ max-height: unset;
+ }
+
+ // For Google Docs and Google Calendar xblock editor
+ .google-edit-wrapper .xblock-inputs {
+ position: unset;
+ overflow-y: unset;
+ }
+
+ .xblock-actions {
+ padding: ($baseline*0.75) 2% ($baseline/2) 2%;
+ position: sticky;
+ bottom: 0;
+
+ .action-item {
+ @extend %t-action3;
+
+ display: inline-block;
+ margin-right: ($baseline*0.75);
+
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+ }
+ }
}
.view-container .content-primary {
diff --git a/common/templates/xblock_v2/xblock_iframe.html b/common/templates/xblock_v2/xblock_iframe.html
index 07d81b962a65..57ff4684ddbd 100644
--- a/common/templates/xblock_v2/xblock_iframe.html
+++ b/common/templates/xblock_v2/xblock_iframe.html
@@ -1,6 +1,7 @@
-
+
+
@@ -81,8 +82,11 @@
href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-
-
+
+
+
+
+