Skip to content
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

fix: advanced editor styling on library authoring [FC-0076] #36146

Merged
merged 9 commits into from
Jan 30, 2025
Merged

fix: advanced editor styling on library authoring [FC-0076] #36146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aa0acf7
fix: advanced editor styling on library authoring
rpenido Jan 21, 2025
db53e68
fix: add CMS_ROOT_URL
rpenido Jan 22, 2025
f6659f3
fix: issues with multiple scroll bars
rpenido Jan 23, 2025
c7f5325
fix: include fix for google-calendar
rpenido Jan 24, 2025
f92d488
fix: add CMS_ROOT_URL to common and production env
rpenido Jan 29, 2025
19d59f6
Merge branch 'master' into rpenido/fal-4012-fix-advanced-editor-styling
rpenido Jan 29, 2025
6a2721a
fix: double scrollbars on chrome
rpenido Jan 29, 2025
8463317
Merge branch 'master' into rpenido/fal-4012-fix-advanced-editor-styling
ChrisChV Jan 30, 2025
9d12159
Merge branch 'master' into rpenido/fal-4012-fix-advanced-editor-styling
ChrisChV Jan 30, 2025
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
18 changes: 17 additions & 1 deletion cms/static/sass/course-unit-mfe-iframe-bundle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ body {
}
}

.modal-window.modal-editor {
.modal-window.modal-editor, &.xblock-iframe-content {
background-color: $white;
border-radius: 6px;

Expand Down Expand Up @@ -381,6 +381,22 @@ body {
.modal-lg.modal-window.confirm.openassessment_modal_window {
height: 635px;
}

// Additions for the xblock editor on the Library Authoring
&.xblock-iframe-content .xblock-actions {
padding: ($baseline*0.75) 2% ($baseline/2) 2%;

.action-item {
@extend %t-action3;

display: inline-block;
margin-right: ($baseline*0.75);

&:last-child {
margin-right: 0;
}
}
}
}

.view-container .content-primary {
Expand Down
21 changes: 13 additions & 8 deletions common/templates/xblock_v2/xblock_iframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,11 @@
href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<!-- Capa Problem Editing requires CodeMirror -->
<link rel="stylesheet" href="{{ lms_root_url }}/static/js/vendor/CodeMirror/codemirror.css">
<!-- Built-in XBlocks (and some plugins) depends on LMS CSS -->
<link rel="stylesheet" href="{{ lms_root_url }}/static/css/lms-course.css">
Comment on lines -84 to -85
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the editor iframe, the lms-course.css caused some issues.

I didn't find where this was used to check the results, but the Unit Outline and the Course View seem okay.

We can't add this conditionally if needed.

<!-- Additional CSS for the XBlock Editor on the Library Authoring -->
<link rel="stylesheet" href="{{ cms_root_url }}/static/studio/css/vendor/normalize.css">
<link rel="stylesheet" href="{{ cms_root_url }}/static/studio/css/studio-main-v1.css" />
<link rel="stylesheet" href="{{ cms_root_url }}/static/studio/css/course-unit-mfe-iframe-bundle.css" />

<!-- Configure and load MathJax -->
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
Expand Down Expand Up @@ -156,11 +159,13 @@
<!-- The default stylesheet will set the body min-height to 100% (a common strategy to allow for background
images to fill the viewport), but this has the undesireable side-effect of causing an infinite loop via the onResize
event listeners below, in certain situations. Resetting it to the default "auto" skirts the problem.-->
<body style="min-height: auto; background-color: white;">
<!-- fragment body -->
{{ fragment.body_html | safe }}
<!-- fragment foot -->
{{ fragment.foot_html | safe }}
<body style="min-height: auto; background-color: white;" class="view-container">
<div class="wrapper xblock-iframe-content">
<!-- fragment body -->
{{ fragment.body_html | safe }}
<!-- fragment foot -->
{{ fragment.foot_html | safe }}
</div>
<script>
/**
* Map of all URL handlers for this block and its children, keyed by usage
Expand Down Expand Up @@ -216,7 +221,7 @@
return url;
},
notify: (eventName, data) => {
/**
/**
* Used in `studio_view` to notify events and errors
**/
window.parent.postMessage({
Expand Down
2 changes: 2 additions & 0 deletions openedx/core/djangoapps/xblock/rest_api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,12 @@ def embed_block_view(request, usage_key: UsageKeyV2, view_name: str):
# for key in itertools.chain([block.scope_ids.usage_id], getattr(block, 'children', []))
# }
lms_root_url = configuration_helpers.get_value('LMS_ROOT_URL', settings.LMS_ROOT_URL)
cms_root_url = configuration_helpers.get_value('CMS_ROOT_URL', settings.CMS_ROOT_URL)
rpenido marked this conversation as resolved.
Show resolved Hide resolved
context = {
'fragment': fragment,
'handler_urls_json': json.dumps(handler_urls),
'lms_root_url': lms_root_url,
'cms_root_url': cms_root_url,
'view_name': view_name,
'is_development': settings.DEBUG,
}
Expand Down
Loading