Skip to content

Integrate changes from microbit-foundation 1.0.0 tag #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 1, 2019
Merged

Integrate changes from microbit-foundation 1.0.0 tag #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c4ef9c2
Replace firmware with version from microbit.co.uk
jaustin Feb 15, 2017
a1cb715
Foundation config for deployment
jaustin Feb 14, 2017
33c4f98
Update script box styling
microbit-matt-smith Aug 29, 2017
22464da
Remove arbitrary height on script name box at small widths
microbit-matt-smith Aug 29, 2017
2a1b711
Fix positioning / wrapping of script name box
microbit-matt-smith Aug 29, 2017
6289b57
Fix annoying 1px button background gap on first button
microbit-matt-smith Aug 30, 2017
60024cd
Add right padding to script name box
microbit-matt-smith Aug 30, 2017
99b8250
Move show script to bin directory
microbit-matt-smith Aug 29, 2017
c629ea1
Revert "Initial export script"
microbit-matt-smith Aug 31, 2017
f42c29d
Add VERSION
microbit-matt-smith Aug 31, 2017
fb8d43b
non micro:bit related changes
microbit-sam Jan 30, 2019
5a0e321
Add VERSION
microbit-matt-smith Aug 31, 2017
dc57330
Consistent MicroPython Firmware from 1.0.0
microbit-sam Jan 31, 2019
d5b3d22
Update VERSION number to 1.0.0
microbit-sam Jan 31, 2019
03438dd
Updated CHANGELOG and README
microbit-sam Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
-----

Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...

Expand Down
8 changes: 8 additions & 0 deletions bin/show
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions show.sh
View file
Open in desktop

This file was deleted.

37 changes: 17 additions & 20 deletions static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -354,7 +357,6 @@ a.command:hover {
#script-name {
font-size: 1.2rem;
font-weight: bold;
max-height: 50px;
}

.blocklyTreeRow {
Expand All @@ -368,10 +370,6 @@ a.command:hover {
.blocklyTreeLabel {
font-size: 12px !important;
}

#commands {
min-width: 425px;
}
}

@media (max-width: 480px) {
Expand All @@ -381,8 +379,7 @@ a.command:hover {
}

#script-box {
margin-right: 1rem;
margin-left: 1rem;
margin: 1rem;
text-align: left;
width: 100%;
}
Expand Down