From fff03dc2c3bd75b971b769ca1cf163260765d64c Mon Sep 17 00:00:00 2001
From: yhallowiegeht <y_paul02@uni-muenster.de>
Date: Mon, 10 Dec 2018 17:37:47 +0100
Subject: [PATCH 1/2] blockly styling changes

---
 src/assets/blockly.html        | 8 +++++---
 src/pages/Blockly/blockly.html | 4 ++--
 src/pages/Blockly/blockly.scss | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/assets/blockly.html b/src/assets/blockly.html
index 11940bd..556f127 100644
--- a/src/assets/blockly.html
+++ b/src/assets/blockly.html
@@ -12,13 +12,15 @@
   <link rel="stylesheet" href="blockly/ardublockly/prettify/arduino.css">
   <link rel="stylesheet" href="blockly/ardublockly/ardublockly.css" media="screen,projection">
   <style>
+    body {
+      padding: 0px;
+    }
     .hidden {
       display: none;
     }
 
-    .resize {
-      height: 97%;
-      width: 97%;
+    .blocks_panel_large, .blocks_panel_small, #content_blocks, .content_xml_large, .content_xml_small {
+      height: 98vh;          /* Standard */
     }
   </style>
 
diff --git a/src/pages/Blockly/blockly.html b/src/pages/Blockly/blockly.html
index 1388eae..81dbc7b 100644
--- a/src/pages/Blockly/blockly.html
+++ b/src/pages/Blockly/blockly.html
@@ -13,10 +13,10 @@
   </ion-navbar>
 </ion-header>
 
-<ion-content padding>
+<ion-content>
   <!-- Real floating action button, fixed. It will not scroll with the content -->
   <ion-fab top right edge>
     <button ion-fab mini (click)="launchOtaWizard()" color ="light"><ion-icon name="wifi"></ion-icon></button>
   </ion-fab>
-  <iframe #blocklyFrame src='assets/blockly.html'></iframe>
+  <iframe #blocklyFrame scrolling="no" src='assets/blockly.html'></iframe>
 </ion-content>
diff --git a/src/pages/Blockly/blockly.scss b/src/pages/Blockly/blockly.scss
index f2d534d..75a7497 100644
--- a/src/pages/Blockly/blockly.scss
+++ b/src/pages/Blockly/blockly.scss
@@ -1,9 +1,10 @@
 page-blockly {
     iframe {
-        height: 100%;
+        height: 98%;
         width: 100%;
         border: 0;
         margin: 0;
         padding: 0;
+        overflow-y: hidden;
     } 
 }

From 4eab444b366c0340e2c7c201478f1f1c796fe4b8 Mon Sep 17 00:00:00 2001
From: yhallowiegeht <y_paul02@uni-muenster.de>
Date: Mon, 10 Dec 2018 17:44:44 +0100
Subject: [PATCH 2/2] assets

---
 src/assets/blockly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/blockly b/src/assets/blockly
index 60674aa..4dbba30 160000
--- a/src/assets/blockly
+++ b/src/assets/blockly
@@ -1 +1 @@
-Subproject commit 60674aa95849ab75e60c04d74ea29339b856473b
+Subproject commit 4dbba301f5a28484ab2693c8229a22bb3ad0a6e4