From c4ef9c224ccd0346fe139e0a35d422eedc15c105 Mon Sep 17 00:00:00 2001 From: Jonathan Austin Date: Wed, 15 Feb 2017 16:15:24 +0000 Subject: [PATCH 01/11] Replace firmware with version from microbit.co.uk The aim of this is to create a new 'legacy' branch that has the features of the latest editor but the MicroPython version of the past. This is what we will expect people migrating from microbit.co.uk to use first. --- editor.html | 28730 +++++++++++++++++++++++-------------------------- firmware.hex | 27166 +++++++++++++++++++++------------------------- 2 files changed, 25601 insertions(+), 30295 deletions(-) diff --git a/editor.html b/editor.html index d278baff..baf8fd30 100644 --- a/editor.html +++ b/editor.html @@ -70,7 +70,7 @@ From 33c4f985988dbed762ff5460d6fcc10bc8017297 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 29 Aug 2017 14:18:14 +0100 Subject: [PATCH 03/11] Update script box styling --- static/css/style.css | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 45c09d88..597677a9 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -91,21 +91,27 @@ body, input { /* Script info box */ #script-box { + 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: 15rem; + background-color: white; + line-height: 2.5rem; + max-height: 2.5rem; + padding: 0 0.5rem; + border-radius: 0.5rem; } #script-description { - color: #336699; + display: none; /* TODO: FIXME: remove this field */ + color: #3758ce; padding-bottom: 0.2rem; overflow: hidden; max-height: 22px; @@ -381,8 +387,7 @@ a.command:hover { } #script-box { - margin-right: 1rem; - margin-left: 1rem; + margin: 1rem; text-align: left; width: 100%; } From 22464da9d50cb41a58e4d5d9063c82428ff695ed Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 29 Aug 2017 18:13:57 +0100 Subject: [PATCH 04/11] Remove arbitrary height on script name box at small widths --- static/css/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/static/css/style.css b/static/css/style.css index 597677a9..8ed1ee35 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -360,7 +360,6 @@ a.command:hover { #script-name { font-size: 1.2rem; font-weight: bold; - max-height: 50px; } .blocklyTreeRow { From 2a1b711d45fd620f408a5bace8895ec7341eb924 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 29 Aug 2017 18:47:49 +0100 Subject: [PATCH 05/11] Fix positioning / wrapping of script name box --- static/css/style.css | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 8ed1ee35..e9ca422f 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -93,6 +93,7 @@ body, input { #script-box { margin-left: auto; margin-right: 1rem; + padding-right: 1rem; justify-content: center; } @@ -101,7 +102,10 @@ body, input { border: #808080 1px solid; color: #1a354c; overflow: hidden; - width: 15rem; + width: 100%; + margin-right: 1rem; + min-width: 10rem; + max-width: 15rem; background-color: white; line-height: 2.5rem; max-height: 2.5rem; @@ -213,10 +217,6 @@ body, input { font-weight: bold; } -#commands { - min-width: 900px; -} - #commands a { text-align: center; padding-left: 0.75em; @@ -373,10 +373,6 @@ a.command:hover { .blocklyTreeLabel { font-size: 12px !important; } - - #commands { - min-width: 425px; - } } @media (max-width: 480px) { From 6289b57e3bedd539ff97e68dd47716415742e4ad Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Wed, 30 Aug 2017 10:56:33 +0100 Subject: [PATCH 06/11] Fix annoying 1px button background gap on first button --- static/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/style.css b/static/css/style.css index e9ca422f..9f10426e 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -93,7 +93,6 @@ body, input { #script-box { margin-left: auto; margin-right: 1rem; - padding-right: 1rem; justify-content: center; } @@ -264,6 +263,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; From 60024cdc2000a0dc758a86bbddf40f1be4542f05 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Wed, 30 Aug 2017 11:00:03 +0100 Subject: [PATCH 07/11] Add right padding to script name box --- static/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/style.css b/static/css/style.css index 9f10426e..19247a57 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -91,6 +91,7 @@ body, input { /* Script info box */ #script-box { + padding-right: 1rem; margin-left: auto; margin-right: 1rem; justify-content: center; From 99b8250ca6beda62e220e2d0074350d48b643126 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 29 Aug 2017 14:56:17 +0100 Subject: [PATCH 08/11] Move show script to bin directory --- bin/show | 8 ++++++++ show.sh | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100755 bin/show delete mode 100755 show.sh diff --git a/bin/show b/bin/show new file mode 100755 index 00000000..4e8d4c71 --- /dev/null +++ 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/show.sh b/show.sh deleted file mode 100755 index 3f7e353d..00000000 --- a/show.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -echo "http://localhost:8000/editor.html" -python3 -m http.server From c629ea144b23e6faa3f6075dfb11119acdaadfd3 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Thu, 31 Aug 2017 16:08:38 +0100 Subject: [PATCH 09/11] Revert "Initial export script" This reverts commit 13ded9b86e52d13a53d1c5df7011abbb06ffd8e7. From f42c29d64fc0291291c36e07b43840ab3069c099 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Thu, 31 Aug 2017 16:26:28 +0100 Subject: [PATCH 10/11] Add VERSION --- VERSION | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..6e8bf73a --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.1.0 From fb8d43b62eb2656ca84fe167f10ac54176d2fcf0 Mon Sep 17 00:00:00 2001 From: Sam Kent Date: Wed, 30 Jan 2019 11:30:59 +0000 Subject: [PATCH 11/11] non micro:bit related changes --- static/css/style.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 19247a57..fa1a5521 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -115,7 +115,7 @@ body, input { #script-description { display: none; /* TODO: FIXME: remove this field */ - color: #3758ce; + color: #336699; padding-bottom: 0.2rem; overflow: hidden; max-height: 22px; @@ -223,10 +223,6 @@ body, input { padding-right: 0.75em; } - -#toolbox { -} - #log { overflow: auto; width: 500px;