Fixed10 #30 2015-06-06

mozilla · Jun 6, 2015 · 481c00c · 481c00c
1 parent b490309
commit 481c00c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/editor/public/css/editor.css b/editor/public/css/editor.css
@@ -49,7 +49,7 @@ div.tool-box {
   height: 100%;
   border-radius: 15px;
   text-align: center;
-  z-index: 2;
+  z-index: 1;
 }
 div.inner-border {
   position: relative;

diff --git a/editor/public/css/fullscreen.css b/editor/public/css/fullscreen.css
@@ -75,3 +75,10 @@ svg#canvas {
 .settingsMenu:hover details, .settingsMenu details[open="open"] {
   background-color: rgba(138,122,106,0.5);
 }
+
+@media screen and (orientation: portrait) {
+  div.canvas-container {
+    height: 100%;
+  }
+
+}
diff --git a/editor/public/index.html.php b/editor/public/index.html.php
@@ -50,6 +50,8 @@ class="panelContents" id="widths"></iframe><iframe
               <menu>
                 <li aria-checked=false aria-role=menuitemcheckbox
                   data-l10n-id="fullscreen" id="full-screen-menu">Fullscreen
+                <li aria-checked=false aria-role=menuitemcheckbox
+                  data-l10n-id="hidetools" id="hide-tools-menu">ツールを隠す
                 <li class=lang aria-checked=true aria-role=menuitemradio 
                   lang=en>English
                 <li class=lang aria-checked=false aria-role=menuitemradio 

diff --git a/editor/public/js/editor-ui.js.php b/editor/public/js/editor-ui.js.php
@@ -834,6 +834,8 @@ function() { EditorUI.continueLongPress(callback); },
     fullscreen.style.display = "none";
   }
 
+  var hidetool = document.getElementById("hide-tools-menu");
+  hidetool.addEventListener("click", EditorUI.FullScreen.hideTool);
   // Init language menu
   EditorUI.initLangMenu();
 }

diff --git a/editor/public/js/fullscreen.js b/editor/public/js/fullscreen.js
@@ -1,3 +1,5 @@
+var EditorUI = EditorUI || {};
+EditorUI.FullScreen = EditorUI.FullScreen || {};
 var toolbox;
 var filmstrip;
 var burgerbutton;
@@ -7,9 +9,9 @@ document.addEventListener("DOMContentLoaded", function() {
   burgerbutton = document.getElementById("burgerbutton");
   burgerbutton.addEventListener("click", function() {
     if (toolbox.style.display === "none" || toolbox.style.display === "") {
-      showTool();
+      EditorUI.FullScreen.showTool();
     } else {
-      hideTool();
+      EditorUI.FullScreen.hideTool();
     }
   });
   burgerbutton.addEventListener("mousemove", function(e) {
@@ -20,12 +22,16 @@ document.addEventListener("DOMContentLoaded", function() {
   });
 });
 
-function hideTool() {
+EditorUI.FullScreen.hideTool = function() {
   toolbox.style.display = "none";
   filmstrip.style.display = "none";
+
+  burgerbutton.style.display = "block";
 }
 
-function showTool() {
+EditorUI.FullScreen.showTool = function() {
   toolbox.style.display = "block";
   filmstrip.style.display = "block";
+
+  burgerbutton.style.display = "none";
 }