Commit 46ad94a0 authored by carlosperate's avatar carlosperate

Update to latest version of Materialize, include Ardublockly sync updates.

Moving to version >0.97.5 09cd7116129c3f3b9879c24f7ff688e8c7da18f2 https://github.com/Dogfalo/materialize/commit/09cd7116129c3f3b9879c24f7ff688e8c7da18f2 .

Minor updates to the Ardublockly front end were required to accommodate the new version
parent 572aef78
...@@ -483,7 +483,7 @@ ul.side-nav li.side-menu-end { ...@@ -483,7 +483,7 @@ ul.side-nav li.side-menu-end {
/************************/ /************************/
/* Modals and content */ /* Modals and content */
/************************/ /************************/
/* Sehttp://192.168.0.7:8000/ardublockly/apps/arduino_material/#ttings modal dialog */ /* Settings modal dialog */
.settings_div { .settings_div {
margin: 24px 0px; margin: 24px 0px;
width: 100%; width: 100%;
...@@ -609,27 +609,6 @@ ul.side-nav li.side-menu-end { ...@@ -609,27 +609,6 @@ ul.side-nav li.side-menu-end {
background-color: #FDBEBE; background-color: #FDBEBE;
} }
/* Clean 50:50 same row divs */
.two_halves_container {
width: 100%;
padding: 0;
margin: 0;
}
.two_halves_left {
padding: 0;
margin: 0;
border: none;
width: 49%;
float: right;
}
.two_halves_right {
padding: 0;
margin: 0;
border: none;
width: 50%;
float: right;
}
/*****************************/ /*****************************/
/* Overwriting Blockly CSS */ /* Overwriting Blockly CSS */
...@@ -806,13 +785,6 @@ ul.side-nav li ul li ul li { ...@@ -806,13 +785,6 @@ ul.side-nav li ul li ul li {
margin-right: 16px; margin-right: 16px;
} }
/* button-collapse with show-on-large does not work in IE
@media only screen and (min-width : 993px) {
.button-collapse {
display: block;
}
} */
/* Increase the size of Materialize Modal in small resolutions */ /* Increase the size of Materialize Modal in small resolutions */
@media only screen and (max-width : 600px) { @media only screen and (max-width : 600px) {
.modal { .modal {
...@@ -825,6 +797,7 @@ ul.side-nav li ul li ul li { ...@@ -825,6 +797,7 @@ ul.side-nav li ul li ul li {
.btn-large:hover { .btn-large:hover {
background-color: inherit; background-color: inherit;
} }
/* Circle clipper (loading animation) thickness */ /* Circle clipper (loading animation) thickness */
.circle-clipper .circle { .circle-clipper .circle {
border-width: 4px !important; border-width: 4px !important;
......
...@@ -414,7 +414,7 @@ Ardublockly.contentHeightToggle = function() { ...@@ -414,7 +414,7 @@ Ardublockly.contentHeightToggle = function() {
// Apart from checking if the output is visible, do not bother to shrink in // Apart from checking if the output is visible, do not bother to shrink in
// small screens as the minimum height of the content will kick in and cause // small screens as the minimum height of the content will kick in and cause
// the content to be behind the IDE output data anyway. // the content to be behind the IDE output data anyway.
if (outputHeader.className.match('active') && $(window).height() > 800) { if (!outputHeader.className.match('active') && $(window).height() > 800) {
blocks.className = 'content height_transition blocks_panel_small'; blocks.className = 'content height_transition blocks_panel_small';
arduino.className = 'content height_transition content_arduino_small'; arduino.className = 'content height_transition content_arduino_small';
xml.className = 'content height_transition content_xml_small'; xml.className = 'content height_transition content_xml_small';
......
...@@ -49,7 +49,7 @@ Ardublockly.containerFullWidth = function() { ...@@ -49,7 +49,7 @@ Ardublockly.containerFullWidth = function() {
/** Hides the side menu button. */ /** Hides the side menu button. */
Ardublockly.hideSideMenuButton = function() { Ardublockly.hideSideMenuButton = function() {
var sideMenuButton = document.getElementById('button-collapse'); var sideMenuButton = document.getElementById('button-collapse');
sideMenuButton.style.display = 'none'; sideMenuButton.style.setProperty ('display', 'none', 'important');
}; };
/** /**
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<!-- Horizontal Navigation bar --> <!-- Horizontal Navigation bar -->
<nav class="nav-fixed arduino_teal"> <nav class="nav-fixed arduino_teal">
<div class="nav-wrapper container"> <div class="nav-wrapper container">
<a class="button-collapse" href="#" data-activates="slide-out" id="button-collapse"><i class="mdi-navigation-menu"></i> <a class="show-on-large button-collapse" href="#" data-activates="slide-out" id="button-collapse"><i class="mdi-navigation-menu"></i></a>
<a id="logo-container" class="brand-logo"> <a id="logo-container" class="brand-logo">
<span class="app_title">Ardublockly:</span> <span class="app_title">Ardublockly:</span>
<!-- Sketch name editable text field --> <!-- Sketch name editable text field -->
......
...@@ -4,4 +4,4 @@ This folder contains the CSS and Javascript for the Materialize CSS framework. ...@@ -4,4 +4,4 @@ This folder contains the CSS and Javascript for the Materialize CSS framework.
https://github.com/Dogfalo/materialize https://github.com/Dogfalo/materialize
Current version used: >0.97.0 [@c996377381fc35b4230974d3ec28e4c430a7a0b3 commit](https://github.com/Dogfalo/materialize/commit/c996377381fc35b4230974d3ec28e4c430a7a0b3) Current version used: >0.97.5 [@09cd7116129c3f3b9879c24f7ff688e8c7da18f2 commit](https://github.com/Dogfalo/materialize/commit/09cd7116129c3f3b9879c24f7ff688e8c7da18f2)
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment