opensensemap/blockly-app
1
0
Fork 0
mirror of https://github.com/sensebox/blockly-app synced 2025-04-19 16:07:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'development_yannick'

Browse source
This commit is contained in:
Norwin 2018-12-10 17:51:30 +01:00
commit 7562d00263
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/blockly

@ -1 +1 @@
Subproject commit 60674aa95849ab75e60c04d74ea29339b856473b Subproject commit 4dbba301f5a28484ab2693c8229a22bb3ad0a6e4

8
src/assets/blockly.html
View file

@ -12,13 +12,15 @@
<link rel="stylesheet" href="blockly/ardublockly/prettify/arduino.css"> <link rel="stylesheet" href="blockly/ardublockly/prettify/arduino.css">
<link rel="stylesheet" href="blockly/ardublockly/ardublockly.css" media="screen,projection"> <link rel="stylesheet" href="blockly/ardublockly/ardublockly.css" media="screen,projection">
<style> <style>
body {
padding: 0px;
}
.hidden { .hidden {
display: none; display: none;
} }
.resize { .blocks_panel_large, .blocks_panel_small, #content_blocks, .content_xml_large, .content_xml_small {
height: 97%; height: 98vh; /* Standard */
width: 97%;
} }
</style> </style>

7
src/pages/Blockly/blockly.html
View file

@ -13,10 +13,9 @@
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content padding> <ion-content>
<ion-fab top right edge> <ion-fab top right edge>
<button ion-fab mini (click)="launchOtaWizard()" color ="light"><ion-icon name="wifi"></ion-icon></button> <button ion-fab large (click)="launchOtaWizard()" color ="light"><ion-icon name="wifi"></ion-icon></button>
</ion-fab> </ion-fab>
<iframe #blocklyFrame scrolling="no" src='assets/blockly.html'></iframe>
<iframe #blocklyFrame src='assets/blockly.html'></iframe>
</ion-content> </ion-content>

5
src/pages/Blockly/blockly.scss
View file

@ -1,9 +1,10 @@
page-blockly { page-blockly {
iframe { iframe {
height: 100%; height: 97%;
width: 100%; width: 100%;
border: 0; border: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
} overflow-y: hidden;
}
} }