Skip to content

Commit 5e50869

Browse files
author
Lionel Laské
committed
Merge branch 'pr/1985' into dev
2 parents 21e3836 + 9d4f222 commit 5e50869

File tree

10 files changed

+287
-38
lines changed

10 files changed

+287
-38
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1010
- Stickman activity
1111
- Add "Global Time" feature to Clock activity with timezone selection #1825
1212
- Add Water mode in Physics activity #1863
13+
- Add pen tool for freehand drawing in Physics activity #1858
1314

1415
### Changed
1516
- Rewrite of Sugarizer Core using Vue.js

activities/PhysicsJS.activity/css/activity.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ body {
5050
z-index: 2;
5151
}
5252

53+
#main-toolbar #pen-button {
54+
background-image: url(../icons/pen.svg);
55+
z-index: 3;
56+
}
57+
5358
/* Left water */
5459
#viewport.water-mode[data-water-region="left"]::after {
5560
content: "";
Lines changed: 21 additions & 0 deletions
Loading

activities/PhysicsJS.activity/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<button class="toolbutton" id="box-button" title="Box"></button>
3030
<button class="toolbutton" id="triangle-button" title="Triangle"></button>
3131
<button class="toolbutton" id="polygon-button" title="Polygon"></button>
32+
<button class="toolbutton" id="pen-button" title="Drawing tool"></button>
3233
<button class="toolbutton" id="gravity-button" title="Gravity"></button>
3334
<button class="toolbutton" id="sensor-button" title="Sensor"></button>
3435
<button class="toolbutton" id="apple-button" title="Newton"></button>

0 commit comments

Comments
 (0)