From 4030ad4e097e150fd5e62b4add04888ad089565f Mon Sep 17 00:00:00 2001
From: Norwin Roosen <github@nroo.de>
Date: Mon, 10 Dec 2018 18:16:40 +0100
Subject: [PATCH] blockly: get rid of remaining misplaced margins

---
 src/assets/blockly.html        | 48 ++++------------------------------
 src/pages/Blockly/blockly.scss | 12 ++++++---
 2 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/src/assets/blockly.html b/src/assets/blockly.html
index 556f127..d73225b 100644
--- a/src/assets/blockly.html
+++ b/src/assets/blockly.html
@@ -15,12 +15,13 @@
     body {
       padding: 0px;
     }
+
     .hidden {
       display: none;
     }
 
     .blocks_panel_large, .blocks_panel_small, #content_blocks, .content_xml_large, .content_xml_small {
-      height: 98vh;          /* Standard */
+      height: 100vh;
     }
   </style>
 
@@ -28,45 +29,6 @@
   <script src="blockly/blockly/blockly_compressed.js"></script>
   <script src="blockly/blockly/blocks_compressed.js"></script>
   <script src="blockly/blockly/arduino_compressed.js"></script>
-  <!-- To use the uncompressed version comment out the above and comment in the ones below
-  <script src="../blockly/blockly_uncompressed.js"></script>
-  <script src="../blockly/blocks/logic.js"></script>
-  <script src="../blockly/blocks/loops.js"></script>
-  <script src="../blockly/blocks/math.js"></script>
-  <script src="../blockly/blocks/text.js"></script>
-  <script src="../blockly/blocks/lists.js"></script>
-  <script src="../blockly/blocks/colour.js"></script>
-  <script src="../blockly/blocks/variables.js"></script>
-  <script src="../blockly/blocks/procedures.js"></script>
-  <script src="../blockly/blocks/arduino/io.js"></script>
-  <script src="../blockly/blocks/arduino/map.js"></script>
-  <script src="../blockly/blocks/arduino/procedures.js"></script>
-  <script src="../blockly/blocks/arduino/serial.js"></script>
-  <script src="../blockly/blocks/arduino/servo.js"></script>
-  <script src="../blockly/blocks/arduino/spi.js"></script>
-  <script src="../blockly/blocks/arduino/stepper.js"></script>
-  <script src="../blockly/blocks/arduino/time.js"></script>
-  <script src="../blockly/blocks/arduino/tone.js"></script>
-  <script src="../blockly/blocks/arduino/variables.js"></script>
-  <script src="../blockly/blocks/arduino/sensebox.js"></script>
-  <script src="../blockly/generators/arduino.js"></script>
-  <script src="../blockly/generators/arduino/boards.js"></script>
-  <script src="../blockly/generators/arduino/io.js"></script>
-  <script src="../blockly/generators/arduino/lists.js"></script>
-  <script src="../blockly/generators/arduino/logic.js"></script>
-  <script src="../blockly/generators/arduino/loops.js"></script>
-  <script src="../blockly/generators/arduino/map.js"></script>
-  <script src="../blockly/generators/arduino/math.js"></script>
-  <script src="../blockly/generators/arduino/procedures.js"></script>
-  <script src="../blockly/generators/arduino/serial.js"></script>
-  <script src="../blockly/generators/arduino/servo.js"></script>
-  <script src="../blockly/generators/arduino/spi.js"></script>
-  <script src="../blockly/generators/arduino/stepper.js"></script>
-  <script src="../blockly/generators/arduino/text.js"></script>
-  <script src="../blockly/generators/arduino/time.js"></script>
-  <script src="../blockly/generators/arduino/tone.js"></script>
-  <script src="../blockly/generators/arduino/variables.js"></script>
-  <script src="../blockly/generators/arduino/sensebox.js"></script>-->
 
   <!-- Default language js files, user selection appended to head on load -->
   <script src="blockly/blockly/msg/js/en.js"></script>
@@ -182,12 +144,12 @@
       </div>
     </div>
     <!-- Blockly Panel -->
-    <div class="card-panel white" style="padding: 0">
+    <div style="padding: 0">
       <div id="blocks_panel" class="content blocks_panel_large">
         <div id="content_blocks" class="content z-depth-1"></div>
       </div>
     </div>
-      
+
       <div class="hidden">
         <ul class="collapsible z-depth-1" data-collapsible="accordion">
           <li>
@@ -354,7 +316,7 @@
   <script>
     window.addEventListener('load', function load(event) {
       window.removeEventListener('load', load, false);
-      Ardublockly.init();
+      Ardublockly.init({ blocklyPath: './blockly/blockly' });
       SenseboxExtension.init();
 
       window.addEventListener('message', function load(event) {
diff --git a/src/pages/Blockly/blockly.scss b/src/pages/Blockly/blockly.scss
index cf45cdb..f3a47ca 100644
--- a/src/pages/Blockly/blockly.scss
+++ b/src/pages/Blockly/blockly.scss
@@ -1,10 +1,16 @@
 page-blockly {
+    ion-fab {
+        margin-right: 25px;
+        ion-icon {
+            font-size: 35px !important;
+        }
+    }
+
     iframe {
-        height: 97%;
+        height: calc(100% - 4px);
         width: 100%;
         border: 0;
         margin: 0;
         padding: 0;
-        overflow-y: hidden;
-    } 
+    }
 }