Skip to content
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.

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

generate qr-code on enter #1012

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Fixed
- Scratch instructions are not localized #970
- Wrong arrow icon in Exerciser activity #748
- Improve calculator screen responsivity #982
- Overlap hover effect in circular mode view #974


## [1.6.0] - 2022-01-04
### Added
- Measure activity
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
As all Open Source software, contributions to Sugarizer are welcome.

A good way to start to contribute is testing and trying Sugarizer to find some issues. If you find one, don't be shy, submit your issue [here](https://github.com/llaske/Sugarizer/issues) by giving the maximum information on it, specifically detailed steps to reproduce it. We will check your issue and ask your more information if needed.
A good way to start to contribute is testing and trying Sugarizer to find some issues. If you find one, don't be shy, submit your issue [here](https://github.com/llaske/Sugarizer/issues) by giving the maximum information on it, specifically detailed steps to reproduce it. We will check your issue and ask you more information if needed.

If you're a developper, the best way to start is to read the [architecture](docs/architecture.md) then to do the whole [tutorial](docs/tutorial.md). It will give you a good understanding of Sugarizer internal.
If you're a developer, the best way to start is to read the [architecture](docs/architecture.md) then to do the whole [tutorial](docs/tutorial.md). It will give you a good understanding of Sugarizer internal.

When you think you're ready, you could try to fix some existing issues [here](https://github.com/llaske/Sugarizer/issues). If you find a fix, send a Pull Request, we will be please to review it.
When you think you're ready, you could try to fix some existing issues [here](https://github.com/llaske/Sugarizer/issues). If you find a fix, send a Pull Request, we will be pleased to review it.

Note than the **master** branch of the repository is for released/stable version, the **dev** branch is for development.
Note that the **master** branch of the repository is for released/stable version, the **dev** branch is for development.

So to send your Pull Request:

Expand Down
8 changes: 8 additions & 0 deletions activities/Calculate.activity/css/activity.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ textarea {
height: 50px !important;
font-size: 200% !important;
}
calc-container {
overflow-y: auto;
max-height: 92vh;
}
.calcbutton {
height: 50px;
padding: 8%;
Expand Down Expand Up @@ -259,6 +263,10 @@ textarea {
.calcbutton-large {
height: 100px;
}
.calc-container {
width: fit-content !important;
width: 100vw !important;
}
#results-zone {
overflow-y: scroll;
}
Expand Down
4 changes: 2 additions & 2 deletions activities/Calculate.activity/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<button class="toolbutton pull-right" id="help-button" title="Tutorial"></button>
</div>
<button class="toolbutton pull-right" id="unfullscreen-button" title="UnFullscreen"></button>
<div class="bootstrap-container-fluid" style="overflow-y: auto; max-height: 92vh;">
<div class="bootstrap-row-fluid">
<div class="bootstrap-container-fluid" >
<div class="bootstrap-row-fluid calc-container">
<div id="calc-input-div" class="col-xs-12 col-sm-7 col-md-7 col-lg-7">
<div style="padding:5px;">
<input placeholder="Label" id="label-input" type="text" style="color:#000; width:100%; padding:2px; font-size:150%;">
Expand Down
8 changes: 4 additions & 4 deletions activities/Exerciser.activity/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"main.css": "static/css/main.f8e2650a.css",
"main.css.map": "static/css/main.f8e2650a.css.map",
"main.js": "static/js/main.178fc4ed.js",
"main.js.map": "static/js/main.178fc4ed.js.map",
"main.css": "static/css/main.0acc0e38.css",
"main.css.map": "static/css/main.0acc0e38.css.map",
"main.js": "static/js/main.c592abb2.js",
"main.js.map": "static/js/main.c592abb2.js.map",
"static/media/ArrowSmall.cur": "static/media/ArrowSmall.8817744e.cur",
"static/media/README.md": "static/media/README.bc6c3970.md",
"static/media/activity-icon.svg": "static/media/activity-icon.4b722852.svg",
Expand Down
2 changes: 1 addition & 1 deletion activities/Exerciser.activity/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><title>Exerciser Activity</title><meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width,viewport-fit=cover"/><link rel="stylesheet" media="not screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-96dpi.css"><link rel="stylesheet" media="screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-200dpi.css"><script type="text/javascript" src="../../cordova.js"></script><link href="./static/css/main.f8e2650a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.178fc4ed.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><title>Exerciser Activity</title><meta name="viewport" content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width,viewport-fit=cover"/><link rel="stylesheet" media="not screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-96dpi.css"><link rel="stylesheet" media="screen and (device-width:1200px) and (device-height:900px)" href="lib/sugar-web/graphics/css/sugar-200dpi.css"><script type="text/javascript" src="../../cordova.js"></script><link href="./static/css/main.0acc0e38.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.c592abb2.js"></script></body></html>
Loading