diff --git a/.circleci/config.yml b/.circleci/config.yml
index 09bb9ba6..a5b5cc38 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,6 +82,7 @@ workflows:
ignore:
- master
- develop
+ - beta
- /^hotfix\/.*/
build-test-no-deploy:
jobs:
@@ -93,6 +94,7 @@ workflows:
ignore:
- master
- develop
+ - beta
- /^hotfix\/.*/
- gh-pages
build-test-deploy:
@@ -106,6 +108,7 @@ workflows:
only:
- master
- develop
+ - beta
- /^hotfix\/.*/
push-translations:
triggers:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 541e3357..a6197fb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,47 @@
All notable changes to this project will be documented in this file. See
[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [2.0.0-beta.1](https://github.com/LLK/scratch-paint/compare/v1.2.0-beta.1...v2.0.0-beta.1) (2023-06-15)
+
+
+### Bug Fixes
+
+* **deps:** update dependency scratch-l10n to v3.15.20230507032520 ([#2163](https://github.com/LLK/scratch-paint/issues/2163)) ([a249cb2](https://github.com/LLK/scratch-paint/commit/a249cb241684f329723c857204a6a442ad0c3f6d))
+* **deps:** update dependency scratch-l10n to v3.15.20230510032150 ([#2165](https://github.com/LLK/scratch-paint/issues/2165)) ([8452c11](https://github.com/LLK/scratch-paint/commit/8452c1160388a753f13b83fd0225394aa30cc02d))
+* **deps:** update dependency scratch-l10n to v3.15.20230513032248 ([#2166](https://github.com/LLK/scratch-paint/issues/2166)) ([dd85ed7](https://github.com/LLK/scratch-paint/commit/dd85ed758a1302e89dd0c09b4855a950c6187924))
+* **deps:** update dependency scratch-l10n to v3.15.20230514032149 ([#2167](https://github.com/LLK/scratch-paint/issues/2167)) ([85adacf](https://github.com/LLK/scratch-paint/commit/85adacf833b9bf2a677294cc39f70c6c59c3bbf6))
+* **deps:** update dependency scratch-l10n to v3.15.20230515032159 ([#2168](https://github.com/LLK/scratch-paint/issues/2168)) ([459d82a](https://github.com/LLK/scratch-paint/commit/459d82a977099dfa728bd60f1622f1760c63b250))
+* **deps:** update dependency scratch-l10n to v3.15.20230516032248 ([#2169](https://github.com/LLK/scratch-paint/issues/2169)) ([662dcfd](https://github.com/LLK/scratch-paint/commit/662dcfd19e0b78ef54077a9aaedeee728e000525))
+* **deps:** update dependency scratch-l10n to v3.15.20230517032217 ([#2170](https://github.com/LLK/scratch-paint/issues/2170)) ([91e821a](https://github.com/LLK/scratch-paint/commit/91e821a8457604669c63be90ed24ef9b3cbd98ea))
+* **deps:** update dependency scratch-l10n to v3.15.20230518032217 ([#2171](https://github.com/LLK/scratch-paint/issues/2171)) ([eb54dd5](https://github.com/LLK/scratch-paint/commit/eb54dd581807c468bbd61160c1e43eef7ae0c8e5))
+* **deps:** update dependency scratch-l10n to v3.15.20230519032230 ([#2172](https://github.com/LLK/scratch-paint/issues/2172)) ([66fa237](https://github.com/LLK/scratch-paint/commit/66fa237d724de9599ac569e61d4806a4544d62f8))
+* **deps:** update dependency scratch-l10n to v3.15.20230520032146 ([#2173](https://github.com/LLK/scratch-paint/issues/2173)) ([ec11fe2](https://github.com/LLK/scratch-paint/commit/ec11fe21ce23c387352da18b7b308f0f4d2d7e84))
+* **deps:** update dependency scratch-l10n to v3.15.20230521032145 ([#2174](https://github.com/LLK/scratch-paint/issues/2174)) ([c039727](https://github.com/LLK/scratch-paint/commit/c039727e3427bb30f022cfdc3c050f0c2e1d9e60))
+* **deps:** update dependency scratch-l10n to v3.15.20230523032203 ([#2175](https://github.com/LLK/scratch-paint/issues/2175)) ([c7ae8ee](https://github.com/LLK/scratch-paint/commit/c7ae8eee2da4179d37ccc23c67bbc21b13b8d301))
+* **deps:** update dependency scratch-l10n to v3.15.20230524032205 ([#2176](https://github.com/LLK/scratch-paint/issues/2176)) ([039379a](https://github.com/LLK/scratch-paint/commit/039379a1f8e3b79c9a8ef518454a58a54a0bb836))
+* **deps:** update dependency scratch-l10n to v3.15.20230526032224 ([#2177](https://github.com/LLK/scratch-paint/issues/2177)) ([9dd917f](https://github.com/LLK/scratch-paint/commit/9dd917f935fc77b010469577e1dfb50b52fd793a))
+* **deps:** update dependency scratch-l10n to v3.15.20230527032201 ([#2178](https://github.com/LLK/scratch-paint/issues/2178)) ([70ba4fd](https://github.com/LLK/scratch-paint/commit/70ba4fd2bffca637ecdfee81b1d5720b9b4d62ae))
+
+
+* feat!: bump major version ([a401a89](https://github.com/LLK/scratch-paint/commit/a401a897e80ef99173251e4928c3e26435de56ed))
+
+
+### BREAKING CHANGES
+
+* purple accent color to match color contrast feature
+
+# [1.2.0-beta.1](https://github.com/LLK/scratch-paint/compare/v1.1.53...v1.2.0-beta.1) (2023-05-08)
+
+
+### Bug Fixes
+
+* use looks secondary rather than tertiary color ([442afca](https://github.com/LLK/scratch-paint/commit/442afcab38cd59434eb53e364876181857d576e6))
+
+
+### Features
+
+* use purple theme ([a0f6a55](https://github.com/LLK/scratch-paint/commit/a0f6a55a34c98e5a192cc7b5ec96f7ce3e716e14))
+
## [1.1.73](https://github.com/LLK/scratch-paint/compare/v1.1.72...v1.1.73) (2023-06-20)
diff --git a/package-lock.json b/package-lock.json
index 4ec02b71..f0f5273a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "scratch-paint",
- "version": "1.1.73",
+ "version": "2.0.0-beta.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "scratch-paint",
- "version": "1.1.73",
+ "version": "2.0.0-beta.1",
"license": "BSD-3-Clause",
"dependencies": {
"@scratch/paper": "0.11.20200728195508",
diff --git a/package.json b/package.json
index 8f9bf4c7..ad4ace0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "scratch-paint",
- "version": "1.1.73",
+ "version": "2.0.0-beta.1",
"description": "Graphical User Interface for the Scratch 3.0 paint editor, which is used to make and edit sprites for use in projects.",
"main": "./dist/scratch-paint.js",
"browser": "./src/index.js",
diff --git a/release.config.js b/release.config.js
index 87af40a0..4765ef5f 100644
--- a/release.config.js
+++ b/release.config.js
@@ -8,6 +8,11 @@ module.exports = {
{
name: 'hotfix/*',
channel: 'hotfix'
+ },
+ {
+ name: 'beta',
+ channel: 'beta',
+ prerelease: true
}
]
};
diff --git a/src/components/button/button.css b/src/components/button/button.css
index e807cd89..1954084a 100644
--- a/src/components/button/button.css
+++ b/src/components/button/button.css
@@ -6,10 +6,10 @@
user-select: none;
}
.button:active {
- background-color: $motion-transparent;
+ background-color: $looks-transparent;
}
.highlighted.button {
- background-color: $motion-transparent;
+ background-color: $looks-transparent;
}
.mod-disabled {
cursor: auto;
diff --git a/src/components/color-picker/color-picker.css b/src/components/color-picker/color-picker.css
index 77987fb5..ae0463a2 100644
--- a/src/components/color-picker/color-picker.css
+++ b/src/components/color-picker/color-picker.css
@@ -1,3 +1,4 @@
+@import "../../css/colors";
@import "../../css/units";
/* Popover styles */
@@ -79,8 +80,8 @@
}
.active-swatch {
- border: 1px solid #4C97FF;
- box-shadow: 0px 0px 0px 3px hsla(215, 100%, 65%, 0.2);
+ border: 1px solid $looks-secondary;
+ box-shadow: 0px 0px 0px 3px $looks-transparent;
}
.swatch-icon {
diff --git a/src/components/color-picker/icons/fill-horz-gradient-enabled.svg b/src/components/color-picker/icons/fill-horz-gradient-enabled.svg
index 0d19dc39..36490a57 100644
--- a/src/components/color-picker/icons/fill-horz-gradient-enabled.svg
+++ b/src/components/color-picker/icons/fill-horz-gradient-enabled.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/src/components/color-picker/icons/fill-radial-enabled.svg b/src/components/color-picker/icons/fill-radial-enabled.svg
index 1c7416a6..3cac3a2b 100644
--- a/src/components/color-picker/icons/fill-radial-enabled.svg
+++ b/src/components/color-picker/icons/fill-radial-enabled.svg
@@ -5,11 +5,11 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/color-picker/icons/fill-solid-enabled.svg b/src/components/color-picker/icons/fill-solid-enabled.svg
index aab0d9d5..2f8bb698 100644
--- a/src/components/color-picker/icons/fill-solid-enabled.svg
+++ b/src/components/color-picker/icons/fill-solid-enabled.svg
@@ -5,6 +5,6 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/color-picker/icons/fill-vert-gradient-enabled.svg b/src/components/color-picker/icons/fill-vert-gradient-enabled.svg
index 4a5d4bb1..838c2da0 100644
--- a/src/components/color-picker/icons/fill-vert-gradient-enabled.svg
+++ b/src/components/color-picker/icons/fill-vert-gradient-enabled.svg
@@ -6,10 +6,10 @@
-
+
-
\ No newline at end of file
+
diff --git a/src/components/color-picker/icons/swap.svg b/src/components/color-picker/icons/swap.svg
index 042218fd..74afe479 100644
--- a/src/components/color-picker/icons/swap.svg
+++ b/src/components/color-picker/icons/swap.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/dropdown/dropdown-caret.svg b/src/components/dropdown/dropdown-caret.svg
index 42ef29f4..4c7f82bc 100644
--- a/src/components/dropdown/dropdown-caret.svg
+++ b/src/components/dropdown/dropdown-caret.svg
@@ -5,8 +5,8 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/dropdown/dropdown.css b/src/components/dropdown/dropdown.css
index 6219da4c..aca3ce9a 100644
--- a/src/components/dropdown/dropdown.css
+++ b/src/components/dropdown/dropdown.css
@@ -7,7 +7,7 @@ $arrow-border-width: 14px;
border-radius: 5px;
overflow: visible;
min-width: 3.5rem;
- color: $motion-primary;
+ color: $looks-secondary;
padding: .5rem;
}
diff --git a/src/components/fixed-tools/fixed-tools.css b/src/components/fixed-tools/fixed-tools.css
index 62c0a7d4..7e586e05 100644
--- a/src/components/fixed-tools/fixed-tools.css
+++ b/src/components/fixed-tools/fixed-tools.css
@@ -116,7 +116,7 @@ $border-radius: 0.25rem;
}
.mod-menu-item:hover {
- background: $motion-transparent;
+ background: $looks-transparent;
}
.mod-disabled:hover {
diff --git a/src/components/fixed-tools/icons/group.svg b/src/components/fixed-tools/icons/group.svg
index a3a76f7f..1748fe58 100644
--- a/src/components/fixed-tools/icons/group.svg
+++ b/src/components/fixed-tools/icons/group.svg
@@ -7,14 +7,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -22,4 +22,4 @@
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/redo.svg b/src/components/fixed-tools/icons/redo.svg
index 6a61e57b..c32f9449 100644
--- a/src/components/fixed-tools/icons/redo.svg
+++ b/src/components/fixed-tools/icons/redo.svg
@@ -5,8 +5,8 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/send-back.svg b/src/components/fixed-tools/icons/send-back.svg
index 9489b84f..7e60ac6c 100644
--- a/src/components/fixed-tools/icons/send-back.svg
+++ b/src/components/fixed-tools/icons/send-back.svg
@@ -7,7 +7,7 @@
-
+
@@ -17,4 +17,4 @@
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/send-backward.svg b/src/components/fixed-tools/icons/send-backward.svg
index b599b48f..8d490574 100644
--- a/src/components/fixed-tools/icons/send-backward.svg
+++ b/src/components/fixed-tools/icons/send-backward.svg
@@ -7,10 +7,10 @@
-
+
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/send-forward.svg b/src/components/fixed-tools/icons/send-forward.svg
index 636bf26f..c611e8e7 100644
--- a/src/components/fixed-tools/icons/send-forward.svg
+++ b/src/components/fixed-tools/icons/send-forward.svg
@@ -7,10 +7,10 @@
-
+
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/send-front.svg b/src/components/fixed-tools/icons/send-front.svg
index c78a5c82..2941c4de 100644
--- a/src/components/fixed-tools/icons/send-front.svg
+++ b/src/components/fixed-tools/icons/send-front.svg
@@ -7,7 +7,7 @@
-
+
@@ -17,4 +17,4 @@
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/undo.svg b/src/components/fixed-tools/icons/undo.svg
index c9c28254..44c9517b 100644
--- a/src/components/fixed-tools/icons/undo.svg
+++ b/src/components/fixed-tools/icons/undo.svg
@@ -5,8 +5,8 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/fixed-tools/icons/ungroup.svg b/src/components/fixed-tools/icons/ungroup.svg
index 2fcb477a..04d45fea 100644
--- a/src/components/fixed-tools/icons/ungroup.svg
+++ b/src/components/fixed-tools/icons/ungroup.svg
@@ -9,14 +9,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/components/font-dropdown/font-dropdown.css b/src/components/font-dropdown/font-dropdown.css
index c5a55a4c..a528a9f4 100644
--- a/src/components/font-dropdown/font-dropdown.css
+++ b/src/components/font-dropdown/font-dropdown.css
@@ -16,7 +16,7 @@
}
.mod-menu-item:hover {
- background: $motion-primary;
+ background: $looks-secondary;
color: white;
}
diff --git a/src/components/forms/input.css b/src/components/forms/input.css
index ca9d406a..09049a11 100644
--- a/src/components/forms/input.css
+++ b/src/components/forms/input.css
@@ -40,8 +40,8 @@ Edited to add input-range-small
}
.input-form:focus {
- border-color: $motion-primary;
- box-shadow: 0 0 0 $grid-unit $motion-transparent;
+ border-color: $looks-secondary;
+ box-shadow: 0 0 0 $grid-unit $looks-transparent;
}
.input-small {
diff --git a/src/components/mode-tools/icons/copy.svg b/src/components/mode-tools/icons/copy.svg
index 89010127..37f22e49 100644
--- a/src/components/mode-tools/icons/copy.svg
+++ b/src/components/mode-tools/icons/copy.svg
@@ -8,10 +8,10 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/src/components/mode-tools/icons/curved-point.svg b/src/components/mode-tools/icons/curved-point.svg
index 6976d36c..fcad7bb0 100644
--- a/src/components/mode-tools/icons/curved-point.svg
+++ b/src/components/mode-tools/icons/curved-point.svg
@@ -6,12 +6,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/components/mode-tools/icons/delete.svg b/src/components/mode-tools/icons/delete.svg
index dbfad7d1..91d41f00 100644
--- a/src/components/mode-tools/icons/delete.svg
+++ b/src/components/mode-tools/icons/delete.svg
@@ -5,8 +5,8 @@
Created with Sketch.
-
+
-
\ No newline at end of file
+
diff --git a/src/components/mode-tools/icons/flip-horizontal.svg b/src/components/mode-tools/icons/flip-horizontal.svg
index 972b68b3..40c54500 100644
--- a/src/components/mode-tools/icons/flip-horizontal.svg
+++ b/src/components/mode-tools/icons/flip-horizontal.svg
@@ -12,9 +12,9 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/src/components/mode-tools/icons/flip-vertical.svg b/src/components/mode-tools/icons/flip-vertical.svg
index dbd3ea69..b286a23e 100644
--- a/src/components/mode-tools/icons/flip-vertical.svg
+++ b/src/components/mode-tools/icons/flip-vertical.svg
@@ -12,9 +12,9 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/src/components/mode-tools/icons/paste.svg b/src/components/mode-tools/icons/paste.svg
index de9b64a4..069531db 100644
--- a/src/components/mode-tools/icons/paste.svg
+++ b/src/components/mode-tools/icons/paste.svg
@@ -8,10 +8,10 @@
-
-
+
+
-
\ No newline at end of file
+
diff --git a/src/components/mode-tools/icons/straight-point.svg b/src/components/mode-tools/icons/straight-point.svg
index ff4d280e..a198dfa6 100644
--- a/src/components/mode-tools/icons/straight-point.svg
+++ b/src/components/mode-tools/icons/straight-point.svg
@@ -5,10 +5,10 @@
Created with Sketch.
-
-
+
+
-
\ No newline at end of file
+
diff --git a/src/components/paint-editor/icons/rotation-point.svg b/src/components/paint-editor/icons/rotation-point.svg
index ce676389..5857252c 100755
--- a/src/components/paint-editor/icons/rotation-point.svg
+++ b/src/components/paint-editor/icons/rotation-point.svg
@@ -5,7 +5,7 @@
Created with Sketch.
-
+
@@ -15,4 +15,4 @@
-
\ No newline at end of file
+
diff --git a/src/components/paint-editor/paint-editor.css b/src/components/paint-editor/paint-editor.css
index 77e3ef67..35672d5c 100644
--- a/src/components/paint-editor/paint-editor.css
+++ b/src/components/paint-editor/paint-editor.css
@@ -172,7 +172,7 @@ $border-radius: 0.25rem;
.bitmap-button {
display: flex;
border-radius: 5px;
- background-color: $motion-primary;
+ background-color: $looks-secondary;
padding: calc(2 * $grid-unit);
line-height: 1.5rem;
font-size: calc(3 * $grid-unit);
diff --git a/src/components/tool-select-base/tool-select-base.css b/src/components/tool-select-base/tool-select-base.css
index 574de03f..9eda9115 100644
--- a/src/components/tool-select-base/tool-select-base.css
+++ b/src/components/tool-select-base/tool-select-base.css
@@ -16,7 +16,7 @@ $border-radius: .25rem;
}
.mod-tool-select.is-selected {
- background-color: $motion-primary;
+ background-color: $looks-secondary;
}
.mod-tool-select:focus {
diff --git a/src/css/colors.css b/src/css/colors.css
index 14d539c4..7d003201 100644
--- a/src/css/colors.css
+++ b/src/css/colors.css
@@ -8,9 +8,8 @@ $ui-background-blue: #e8edf1;
$text-primary: #575e75;
-$motion-primary: #4C97FF;
-$motion-tertiary: #3373CC;
-$motion-transparent: hsla(215, 100%, 65%, 0.20);
+$looks-secondary: #855CD6;
+$looks-transparent: hsla(260, 60%, 60%, 0.35); /* 35% transparent version of looks-secondary */
$red-primary: #FF661A;
$red-tertiary: #E64D00;