Skip to content

Commit

Permalink
Merge pull request #55 from bjc-edc/middle-school
Browse files Browse the repository at this point in the history
Merge Middle School Updates
  • Loading branch information
cycomachead authored Sep 13, 2021
2 parents ca4e5d9 + ac43534 commit 75280a8
Show file tree
Hide file tree
Showing 163 changed files with 980 additions and 566 deletions.
17 changes: 0 additions & 17 deletions Syllabus-CR10.txt

This file was deleted.

2 changes: 1 addition & 1 deletion css/bjc.css
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ img.noshadow {

.forYouToDo, .ifTime, .dialogue, .takeItFurther, .takeNote, .endnote, .narrower, .narrowblue, .narrowpurple, .time , .learn {
padding: 1em;
margin-bottom: .5em;
margin-bottom: 1em;
margin-top: .5em;
}

Expand Down
1 change: 1 addition & 0 deletions css/edcdevtech-headerfooter.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ header, .llab-nav {
display: flex;
padding: 0em 1em;
flex-wrap: wrap;
clear: right;
}

.footer img {padding: 0px;}
Expand Down
Binary file modified img/blocks/ask-empty-full-size.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/sys/camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 0 additions & 60 deletions index13.html

This file was deleted.

58 changes: 0 additions & 58 deletions index22.html

This file was deleted.

86 changes: 0 additions & 86 deletions index_ancient.html

This file was deleted.

54 changes: 0 additions & 54 deletions index_old.html

This file was deleted.

2 changes: 1 addition & 1 deletion llab/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ img.indent, div.indent {

/* Image added to all clickable program file links
* Indicates a new window will open */
.run {
.run, .snap-project {
background: url(../img/external-link.png) center right no-repeat;
padding-right: 13px;
font-weight: bold;
Expand Down
1 change: 1 addition & 0 deletions llab/script/library.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ llab.getSnapRunURL = function(targeturl, options) {
var currdom = document.domain;
if (currdom == "localhost") {
currdom = 'http://' + currdom + ":" + window.location.port;
finalurl = finalurl.replace('https://snap', 'http://extensions.snap');
} else if (targeturl.indexOf("..") != -1 || targeturl.indexOf(llab.rootURL) == -1) {
var path = window.location.pathname;
path = path.split("?")[0];
Expand Down
Binary file removed middle-school/img/U1/arrow-left-to-right.png
Binary file not shown.
Binary file removed middle-school/img/U1/color-red-from-pixel.png
Binary file not shown.
Binary file removed middle-school/img/U1/draw-picture.png
Binary file not shown.
Binary file removed middle-school/img/U1/fancy.png
Binary file not shown.
Binary file removed middle-school/img/U1/feeling-label.jpg
Binary file not shown.
Binary file removed middle-school/img/U1/feeling-variable.jpg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed middle-school/img/U1/image-manipulation-filter-4.png
Binary file not shown.
Binary file not shown.
Binary file removed middle-school/img/U1/item1-of-pixels.png
Binary file not shown.
Binary file removed middle-school/img/U1/join-random-animal-s.png
Binary file not shown.
File renamed without changes
File renamed without changes.
File renamed without changes
Binary file added middle-school/img/U1/lab01/fancy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added middle-school/img/U1/lab01/say-hello.png
Binary file added middle-school/img/U1/lab02/feeling-label.jpg
Binary file added middle-school/img/U1/lab02/feeling-variable.jpg
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added middle-school/img/U1/lab02/random-action.png
Binary file added middle-school/img/U1/lab02/random-color.png
Binary file added middle-school/img/U1/lab02/random-feeling.png
Binary file added middle-school/img/U1/lab02/random-food.png
Binary file added middle-school/img/U1/lab02/random-job.png
Binary file added middle-school/img/U1/lab02/random-place.png
Binary file added middle-school/img/U1/lab02/super-short-story.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added middle-school/img/U1/lab04/color-from-pixel.png
File renamed without changes
Binary file added middle-school/img/U1/lab04/draw-picture.png
Binary file added middle-school/img/U1/lab04/draw-pixel.png
Binary file added middle-school/img/U1/lab04/gray-ring.png
Diff not rendered.
Binary file added middle-school/img/U1/lab04/item1-of-pixels.png
Binary file added middle-school/img/U1/lab04/list-111-111-112.png
Binary file added middle-school/img/U1/lab04/paint-color-rgb.png
Binary file added middle-school/img/U1/lab04/paint-color.png
Binary file added middle-school/img/U1/lab04/pixel-animation.gif
Binary file added middle-school/img/U1/lab04/pixel-animation.psd
Diff not rendered.
Binary file added middle-school/img/U1/lab04/pixel-grid-stage.png
File renamed without changes
Binary file added middle-school/img/U1/lab04/pixels-of-costume.png
Binary file added middle-school/img/U1/lab04/rgb-pixel.png
Binary file added middle-school/img/U1/lab04/scale.png
Diff not rendered.
Binary file removed middle-school/img/U1/pixel-grid-stage.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-action.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-color.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-feeling.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-food.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-job-block-editor.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-job.png
Diff not rendered.
Binary file removed middle-school/img/U1/random-place.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed middle-school/img/U1/say-hello.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed middle-school/img/U1/super-short-story.png
Diff not rendered.
Binary file removed middle-school/img/U1/use-costume-parrots.png
Diff not rendered.
File renamed without changes
2 changes: 1 addition & 1 deletion middle-school/prog/image-manipulation.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion middle-school/prog/picture-of-a-pixel.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion middle-school/prog/visualizing-data.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ <h4><strong>For example...</strong></h4>
<div class="borderless-table two-col">
<div class="center">
<div class="header">Programmer's Original Drawing</div>
<img class="inline noshadow " style="width:200px;" src="/bjc-r/middle-school/img/U1/draw-like-computer-01.png" alt="a line-drawing that looks like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three overlapping droplets on top arranged to look like a bow" title="a line-drawing that looks like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three droplets on top arranged to look like a bow" />
<img class="inline noshadow " style="width:200px;" src="/bjc-r/middle-school/img/U1/lab01/draw-like-computer-01.png" alt="a line-drawing that looks like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three overlapping droplets on top arranged to look like a bow" title="a line-drawing that looks like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three droplets on top arranged to look like a bow" />
</div>
<div class="center">
<div class="header">Computer's Interpretation</div>
<img class="inline noshadow" style="width:100px;" src="/bjc-r/middle-school/img/U1/draw-like-computer-02.png" alt="a line-drawing that doesn't look like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three overlapping droplets of different sizes hanging down from the top center of the square" title="a line-drawing that doesn't look like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three overlapping droplets of different sizes hanging down from the top center of the square" />
<img class="inline noshadow" style="width:100px;" src="/bjc-r/middle-school/img/U1/lab01/draw-like-computer-02.png" alt="a line-drawing that doesn't look like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three overlapping droplets of different sizes hanging down from the top center of the square" title="a line-drawing that doesn't look like a gift: a square with a horizontal line through the middle, a vertical line through the middle, and a set of three overlapping droplets of different sizes hanging down from the top center of the square" />
</div>
</div>
<p>Note that the programmer wasn't specific when describing the square's size, orientation, place on the page, or bow, and look what resulted! In a sense, the computer "won" this game, since the image was different from the original.
Expand Down
Loading

0 comments on commit 75280a8

Please sign in to comment.