Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-ora2
Commits
ec3819cf
Commit
ec3819cf
authored
Jul 10, 2014
by
gradyward
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes the Modal Height when used for OpenAssessment Editing
parent
86a5d3be
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
12 deletions
+37
-12
openassessment/xblock/static/css/openassessment.css
+12
-5
openassessment/xblock/static/js/openassessment.min.js
+0
-0
openassessment/xblock/static/js/src/oa_edit.js
+12
-0
openassessment/xblock/static/sass/oa/utilities/_developer.scss
+13
-7
No files found.
openassessment/xblock/static/css/openassessment.css
View file @
ec3819cf
...
@@ -2137,10 +2137,11 @@ hr.divider,
...
@@ -2137,10 +2137,11 @@ hr.divider,
border-bottom
:
none
;
}
border-bottom
:
none
;
}
#openassessment-editor
{
#openassessment-editor
{
margin-bottom
:
0
;
}
margin-bottom
:
0
;
height
:
100%
;
}
#openassessment-editor
.openassessment_editor_content_and_tabs
{
#openassessment-editor
.openassessment_editor_content_and_tabs
{
width
:
100%
;
width
:
100%
;
height
:
373px
;
}
height
:
Calc
(
100%
-
97px
)
;
}
#openassessment-editor
#openassessment_editor_header
{
#openassessment-editor
#openassessment_editor_header
{
background-color
:
#e5e5e5
;
background-color
:
#e5e5e5
;
width
:
100%
;
width
:
100%
;
...
@@ -2448,9 +2449,15 @@ hr.divider,
...
@@ -2448,9 +2449,15 @@ hr.divider,
border
:
0px
;
border
:
0px
;
clear
:
both
;
}
clear
:
both
;
}
.modal-content
{
.modal-lg.modal-window.confirm.openassessment_modal_window
{
height
:
470px
!important
;
height
:
80%
;
background-color
:
#e5e5e5
;
}
top
:
10%
;
}
.openassessment_full_height.edit-xblock-modal
,
.openassessment_full_height.xblock-editor
,
.openassessment_full_height.xblock.xblock-studio_view.xblock-initialized
,
[
class
*=
"view-"
]
.modal-lg.modal-editor
.openassessment_full_height.modal-content
{
height
:
100%
;
}
.openassessment
.self-assessment__display__header
,
.openassessment
.peer-assessment__display__header
,
.openassessment
.step__header
{
.openassessment
.self-assessment__display__header
,
.openassessment
.peer-assessment__display__header
,
.openassessment
.step__header
{
margin-bottom
:
0
!important
;
margin-bottom
:
0
!important
;
...
...
openassessment/xblock/static/js/openassessment.min.js
View file @
ec3819cf
This diff is collapsed.
Click to expand it.
openassessment/xblock/static/js/src/oa_edit.js
View file @
ec3819cf
...
@@ -19,6 +19,8 @@ OpenAssessment.StudioView = function(runtime, element, server) {
...
@@ -19,6 +19,8 @@ OpenAssessment.StudioView = function(runtime, element, server) {
var
liveElement
=
this
.
liveElement
;
var
liveElement
=
this
.
liveElement
;
this
.
fixModalHeight
();
// Instantiates JQuery selector variables which will allow manipulation and display controls.
// Instantiates JQuery selector variables which will allow manipulation and display controls.
this
.
settingsFieldSelectors
=
{
this
.
settingsFieldSelectors
=
{
promptBox
:
$
(
'#openassessment_prompt_editor'
,
liveElement
),
promptBox
:
$
(
'#openassessment_prompt_editor'
,
liveElement
),
...
@@ -90,6 +92,16 @@ OpenAssessment.StudioView = function(runtime, element, server) {
...
@@ -90,6 +92,16 @@ OpenAssessment.StudioView = function(runtime, element, server) {
OpenAssessment
.
StudioView
.
prototype
=
{
OpenAssessment
.
StudioView
.
prototype
=
{
/**
/**
Adjusts the modal's height, position and padding to be larger for OA editing only (Does not impact other modals)
*/
fixModalHeight
:
function
()
{
var
element
=
this
.
liveElement
;
element
.
toggleClass
(
'openassessment_full_height'
);
element
.
parentsUntil
(
'.modal-window'
).
toggleClass
(
'openassessment_full_height'
);
$
(
'.modal-window'
).
toggleClass
(
'openassessment_modal_window'
);
},
/**
Load the XBlock XML definition from the server and display it in the view.
Load the XBlock XML definition from the server and display it in the view.
**/
**/
load
:
function
()
{
load
:
function
()
{
...
...
openassessment/xblock/static/sass/oa/utilities/_developer.scss
View file @
ec3819cf
...
@@ -179,10 +179,11 @@
...
@@ -179,10 +179,11 @@
#openassessment-editor
{
#openassessment-editor
{
margin-bottom
:
0
;
margin-bottom
:
0
;
height
:
100%
;
.openassessment_editor_content_and_tabs
{
.openassessment_editor_content_and_tabs
{
width
:
100%
;
width
:
100%
;
height
:
373px
;
height
:
Calc
(
100%
-
97px
)
;
}
}
#openassessment_editor_header
{
#openassessment_editor_header
{
...
@@ -659,12 +660,17 @@
...
@@ -659,12 +660,17 @@
}
}
#openassessment_make_invisible
{
//For Both of these, we use high specificity to overload the previous styles
//without the important tag.
.modal-lg.modal-window.confirm.openassessment_modal_window
{
height
:
80%
;
top
:
10%
;
}
}
.modal-content
{
.openassessment_full_height.edit-xblock-modal
,
height
:
470px
!
important
;
.openassessment_full_height.xblock-editor
,
background-color
:
#e5e5e5
;
.openassessment_full_height.xblock.xblock-studio_view.xblock-initialized
,
[
class
*=
"view-"
]
.modal-lg.modal-editor
.openassessment_full_height.modal-content
{
height
:
100%
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment