From cc48361a153810275923b3f76bc8f3317b38a89d Mon Sep 17 00:00:00 2001
From: Sebastian Serth <Sebastian.Serth@student.hpi.de>
Date: Tue, 6 Nov 2018 15:22:27 +0100
Subject: [PATCH] Remove unused scrollbars in /implement

---
 app/assets/javascripts/editor/editor.js.erb  | 5 +++--
 app/assets/stylesheets/base.css.scss         | 2 ++
 app/views/exercises/_editor_output.html.slim | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
index 390b383e..fe5a62b9 100644
--- a/app/assets/javascripts/editor/editor.js.erb
+++ b/app/assets/javascripts/editor/editor.js.erb
@@ -189,8 +189,8 @@ configureEditors: function () {
   },
 
   resizeParentOfAceEditor: function (element){
-    // calculate needed size: window height - position of top of button-bar - 60 for bar itself and margins
-    var windowHeight = window.innerHeight - $('#editor-buttons').offset().top - 60;
+    // calculate needed size: window height - position of top of ACE editor - height of autosave label below editor - 5 for bar margins
+    var windowHeight = window.innerHeight - $(element).offset().top - $('#autosave-label').height() - 5;
     $(element).parent().height(windowHeight);
   },
 
@@ -609,6 +609,7 @@ configureEditors: function () {
     var toggle = $('a#toggle');
     toggle.text(toggle.text() == toggle.data('hide') ? toggle.data('show') : toggle.data('hide'));
     this.resizeAceEditors();
+    event.preventDefault();
   },
 
     /**
diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 53c46a2f..7d7ddf55 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -26,6 +26,7 @@ span.caret {
 .btn {
   -webkit-font-smoothing: antialiased;
   font-weight: 500;
+  font-size: 0.875rem;
 }
 
 .progress {
@@ -52,6 +53,7 @@ span.caret {
 
 .badge-pill {
   font-size: 100%;
+  font-weight: 500;
 }
 
 .container[data-controller] {
diff --git a/app/views/exercises/_editor_output.html.slim b/app/views/exercises/_editor_output.html.slim
index 0dcd3aba..801467e4 100644
--- a/app/views/exercises/_editor_output.html.slim
+++ b/app/views/exercises/_editor_output.html.slim
@@ -4,7 +4,7 @@ div.h-100 id='output_sidebar_uncollapsed' class='d-none col-sm-12 enforce-bottom
   .row
     = render('editor_button', classes: 'btn-block btn-primary btn', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_output_sidebar'))
 
-  div.position-absolute.d-flex.mb-1.w-100 style="overflow: scroll; left: 0; bottom: 0; height: calc(100% - 3rem);"
+  div.position-absolute.d-flex.mb-1.w-100 style="overflow: auto; left: 0; bottom: 0; height: calc(100% - 3rem);"
     div.w-100
       div.enforce-big-top-margin.d-none id='score_div'
         #results