htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced hr with enforced margin.

Browse Source
This commit is contained in:
Alexander Kastius
2016-09-01 17:49:59 +02:00
parent 1670839ecf
commit f170fee6a9
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/editor/evaluation.js.erb
View File

@ -154,7 +154,7 @@ CodeOceanEditorEvaluation = {
//TODO: Move Prompt Part in own component //TODO: Move Prompt Part in own component
showPrompt: function(msg) { showPrompt: function(msg) {
var label = $('#prompt .input-group-addon'); var label = $('#prompt .input-group-addon');
var prompt = $(this.prompt) var prompt = $(this.prompt);
label.text(msg.data || label.data('prompt')); label.text(msg.data || label.data('prompt'));
if (prompt.isPresent() && prompt.hasClass('hidden')) { if (prompt.isPresent() && prompt.hasClass('hidden')) {
prompt.removeClass('hidden'); prompt.removeClass('hidden');
@ -163,7 +163,7 @@ CodeOceanEditorEvaluation = {
}, },
hidePrompt: function() { hidePrompt: function() {
var prompt = $(this.prompt) var prompt = $(this.prompt);
if (prompt.isPresent() && !prompt.hasClass('hidden')) { if (prompt.isPresent() && !prompt.hasClass('hidden')) {
prompt.addClass('hidden'); prompt.addClass('hidden');
} }

4
app/assets/stylesheets/editor.css.scss
View File

@ -167,4 +167,8 @@ button i.fa-spin {
-webkit-transition: height 2s; -webkit-transition: height 2s;
transition: height 2s; transition: height 2s;
visibility: visible; visibility: visible;
}
.enforce-big-top-margin {
margin-top: 15px !important;
} }

8
app/views/exercises/_editor_output.html.slim
View File

@ -3,17 +3,15 @@ div id='output_sidebar_collapsed'
div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-output=t('exercises.implement.no_output') div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-output=t('exercises.implement.no_output')
.row .row
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_sidebar')) = render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_sidebar'))
hr div.enforce-big-top-margin
div
#turtlediv #turtlediv
canvas#turtlecanvas.hidden width=400 height=400 style='border-style:solid;border-width:thin' canvas#turtlecanvas.hidden width=400 height=400 style='border-style:solid;border-width:thin'
hr div.enforce-big-top-margin
div
#hint #hint
.panel.panel-warning .panel.panel-warning
.panel-heading = t('exercises.implement.hint') .panel-heading = t('exercises.implement.hint')
.panel-body .panel-body
div div.enforce-big-top-margin
#prompt.input-group.hidden #prompt.input-group.hidden
span.input-group-addon data-prompt=t('exercises.editor.input') = t('exercises.editor.input') span.input-group-addon data-prompt=t('exercises.editor.input') = t('exercises.editor.input')
input#prompt-input.form-control type='text' input#prompt-input.form-control type='text'