Merge pull request #84 from microbit-sam/1.0.0-clean

microbit-carlos · web-flow · commit 761756253ecd · 2019-02-01T00:01:49.000Z
Integrate changes from microbit-foundation 1.0.0 tag
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+1.0.0
+-----
+
+* Updated styling
+* Moved show script to bin/show
+* Flags disabled by default: blocks, experimental, and share
+
 0.1.0
 -----
 
diff --git a/README.rst b/README.rst
@@ -22,7 +22,7 @@ submodules::
 
 Assuming you have Python 3 installed you can serve the editor like this::
 
-    $ ./show.sh
+    $ ./bin/show.sh
     http://localhost:8000/editor.html
     Serving HTTP on 0.0.0.0 port 8000 ...
 
diff --git a/bin/show b/bin/show
@@ -0,0 +1,8 @@
+#!/bin/bash
+echo "http://localhost:8000/editor.html"
+
+pushd `dirname $0` > /dev/null
+SCRIPTPATH=`pwd`
+popd > /dev/null
+
+cd ${SCRIPTPATH}/../ && python3 -m http.server
diff --git a/editor.html b/editor.html
@@ -70,7 +70,7 @@
     <body>
         <script type="application/javascript">
         <!-- VERSION INFORMATION -->
-        VERSION = "0.1.0";
+        VERSION = "1.0.0";
         </script>
         <script id="load-template" type="x-tmpl-mustache">
             <h2><i class="fa fa-upload"></i> <strong>{{ title }}</strong></h2>
@@ -337,10 +337,10 @@ <h2><i class="fa fa-unlock-alt"></i> <strong>{{ title }}</strong></h2>
       }
     },
     'flags': {
-      'blocks': true,
+      'blocks': false,
       'snippets': true,
-      'share': true,
-      'experimental': false
+      'experimental': false,
+      'share': false
     },
 });
         </script>
diff --git a/show.sh b/show.sh
diff --git a/static/css/style.css b/static/css/style.css
@@ -91,20 +91,30 @@ body, input {
 
 /* Script info box */
 #script-box {
+  padding-right: 1rem;
+  margin-left: auto;
   margin-right: 1rem;
-  margin-left: 1rem;
-  text-align: right;
-  width: 100%;
+  justify-content: center;
 }
 
 #script-name {
-  font-size: 2rem;
+  font-size: 1.75rem;
+  border: #808080 1px solid;
   color: #1a354c;
   overflow: hidden;
-  max-height: 90px;
+  width: 100%;
+  margin-right: 1rem;
+  min-width: 10rem;
+  max-width: 15rem;
+  background-color: white;
+  line-height: 2.5rem;
+  max-height: 2.5rem;
+  padding: 0 0.5rem;
+  border-radius: 0.5rem;
 }
 
 #script-description {
+  display: none; /* TODO: FIXME: remove this field */
   color: #336699;
   padding-bottom: 0.2rem;
   overflow: hidden;
@@ -207,20 +217,12 @@ body, input {
   font-weight: bold;
 }
 
-#commands {
-  min-width: 900px;
-}
-
 #commands a {
   text-align: center;
   padding-left: 0.75em;
   padding-right: 0.75em;
 }
 
-
-#toolbox {
-}
-
 #log {
   overflow: auto;
   width: 500px;
@@ -258,6 +260,7 @@ body, input {
   color: #336699;
   text-decoration: none;
   background-image: url("../img/triangle.svg");
+  background-position-x: -1px;
   background-size: 100%;
   background-repeat: no-repeat;
   min-width: 90px;
@@ -354,7 +357,6 @@ a.command:hover {
   #script-name {
     font-size: 1.2rem;
     font-weight: bold;
-    max-height: 50px;
   }
 
   .blocklyTreeRow {
@@ -368,10 +370,6 @@ a.command:hover {
   .blocklyTreeLabel {
     font-size: 12px !important;
   }
-
-  #commands {
-    min-width: 425px;
-  }
 }
 
 @media (max-width: 480px) {
@@ -381,8 +379,7 @@ a.command:hover {
   }
 
   #script-box {
-    margin-right: 1rem;
-    margin-left: 1rem;
+    margin: 1rem;
     text-align: left;
     width: 100%;
   }
