Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
534436b
Convert editor dark mode to presets
mxmou Mar 10, 2021
904ff83
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Mar 10, 2021
2aedf63
style: format code
mxmou Mar 10, 2021
15f87be
Finish CSS variable defaults
mxmou Mar 10, 2021
e72bb71
Merge branch 'dark-presets' of https://github.com/mxmou/ScratchAddons…
mxmou Mar 10, 2021
104d807
style: format code
mxmou Mar 10, 2021
0db1f19
Better workspace dots and zoom buttons
mxmou Mar 13, 2021
c9e732c
Make selected category background transparent
mxmou Mar 13, 2021
7f27b9b
Add default border color to CSS
mxmou Mar 13, 2021
de9b1d5
Automatically determine secondary and scrollbar color
mxmou Mar 13, 2021
b0f1d4e
style: format code
mxmou Mar 13, 2021
1cf14dc
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Mar 13, 2021
9024613
Make 3.Darker default
mxmou Mar 13, 2021
a76aaf7
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Mar 13, 2021
c1f2ba3
Change description
mxmou Mar 14, 2021
47e47d2
Dark scrollbars
mxmou Mar 14, 2021
dedebc2
Fix action button shadow not being changed
mxmou Mar 15, 2021
7a76214
Remove reference to removed setting
mxmou Mar 15, 2021
d0a687d
Use workspace background to determine if zoom buttons should be dark
mxmou Mar 15, 2021
04b8576
Remove active state from selected paint tools
mxmou Mar 15, 2021
61134b7
Make unselected radio button icons dim
mxmou Mar 15, 2021
6bc3e8a
Compatibility with other editor addons
mxmou Mar 15, 2021
2db159f
Make menu bar hover effect visible on dark background
mxmou Mar 15, 2021
e13e6d9
style: format code
mxmou Mar 15, 2021
8d6130a
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Mar 15, 2021
286b77c
Separate workspace and palette scrollbar colors
mxmou Mar 15, 2021
90a3d60
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Mar 22, 2021
5c2ee03
Use color with allowTransparency for border setting
mxmou Mar 23, 2021
1e75e1e
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Apr 2, 2021
8e49657
Merge remote-tracking branch 'upstream/master' into dark-presets
mxmou Apr 3, 2021
0d270a2
Make "Reset" a dropdown
mxmou Apr 4, 2021
c044896
style: format code
mxmou Apr 4, 2021
d2d0a50
Update credits
mxmou Apr 5, 2021
1b0ff46
Revert unintentional change
mxmou Apr 5, 2021
821a992
Remove double border between dropdown button and menu
mxmou Apr 5, 2021
9803224
Fix selected tab changing border on focus
mxmou Apr 5, 2021
16baaa2
Remove unnecessary dot
mxmou Apr 5, 2021
7147306
117, not 177
mxmou Apr 6, 2021
ef85efb
Make input background not affect block inputs
mxmou Apr 8, 2021
70d025f
Handle editor-dark-mode settings migration
WorldLanguages Apr 8, 2021
29a1f48
Update get-addon-settings.js
mxmou Apr 9, 2021
2e3ffd1
Move text color functionality to a library
mxmou Apr 9, 2021
04fd844
style: format code
mxmou Apr 9, 2021
a7b48f0
Fix settings not updating when reset
mxmou Apr 9, 2021
d5c2837
Fix text color bugs
mxmou Apr 11, 2021
a130ef8
style: format code
mxmou Apr 11, 2021
a50ff1f
Change addon name
mxmou Apr 11, 2021
cad59dd
Merge branch 'dark-presets' of https://github.com/mxmou/ScratchAddons…
mxmou Apr 11, 2021
a179294
Make full screen button and stage border styled by website dark mode …
mxmou Apr 13, 2021
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
3 changes: 3 additions & 0 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
"reset": {
"message": "Reset"
},
"default": {
"message": "Default"
},
"presets": {
"message": "Presets"
},
Expand Down
4 changes: 3 additions & 1 deletion addons/color-picker/code-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export default async ({ addon, console, msg }) => {
value: defaultColor || "#000000",
});
const saColorPickerText = Object.assign(document.createElement("input"), {
className: "sa-color-picker-text sa-color-picker-code-text",
className: addon.tab.scratchClass("input_input-form", {
others: "sa-color-picker-text sa-color-picker-code-text",
}),
type: "text",
pattern: "^#?([0-9a-fA-F]{3}){1,2}$",
placeholder: msg("hex"),
Expand Down
24 changes: 0 additions & 24 deletions addons/color-picker/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,6 @@
.sa-color-picker > .sa-color-picker-text {
box-sizing: border-box;
width: calc(150px - 3rem);
}

.sa-color-picker > .sa-color-picker-code-text {
border-radius: 0;
border-top-right-radius: 1rem;
border-bottom-right-radius: 1rem;
border: 1px solid rgba(0, 0, 0, 0.15);
box-sizing: border-box;
width: calc(150px - 3rem);
height: 2rem;
padding: 0 0.75rem;
font: inherit;
font-size: 0.75rem;
font-weight: bold;
transition: all 0.25s ease-out;
}

.sa-color-picker > .sa-color-picker-code-text:focus {
outline: none;
border-color: hsla(215, 100%, 65%, 1);
box-shadow: 0 0 0 0.25rem hsla(215, 100%, 65%, 0.35);
}

.sa-color-picker > .sa-color-picker-paint-text {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion addons/dark-www/addon.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"potentialValues": [
{
"id": "experimental-dark",
"name": "Experimental Dark"
"name": "\"Experimental\" Dark"
}
],
"default": "experimental-dark"
Expand Down
24 changes: 11 additions & 13 deletions addons/dark-www/experimental_scratchwww.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
html > body:not(.sa-body-editor):not(.monitor_monitor-container_2J9gl),
html > body:not(.sa-body-editor),
body:not(.sa-body-editor) h1,
body:not(.sa-body-editor) h2,
body:not(.sa-body-editor) h3,
Expand All @@ -23,10 +23,6 @@ body:not(.sa-body-editor) .join-flow-title,
.initiatives-section .initiatives-tools .subsection-tag.collaborator {
color: #fff;
}
.monitor_label_ci1ok {
/* For some strange reason, variable names inherit their color from the body, unlike list title names */
color: #575e75;
}
#view,
.outer #projectBox,
.tips-getting-started,
Expand Down Expand Up @@ -54,7 +50,8 @@ body:not(.sa-body-editor) .gender-radio-row,
.project-remixes::before,
.project-views::before,
img.tips-icon,
.tabs li:not(.active) .tab-icon {
.tabs li:not(.active) .tab-icon,
body:not(.sa-body-editor) .stage-header_stage-button-icon_3zzFK {
filter: brightness(0) invert(1);
}
.project-loves.loved::before,
Expand Down Expand Up @@ -86,7 +83,8 @@ body:not(.sa-body-editor) .modal-content,
.milestones-section .milestone-box,
.supporters-section .comment-text,
.card,
.extension-landing .project-card {
.extension-landing .project-card,
body:not(.sa-body-editor) .stage-header_stage-button_hkl9B {
background: #282828;
}
.comment-text::after {
Expand Down Expand Up @@ -134,7 +132,9 @@ input[type="checkbox"].formik-checkbox,
.information-page .info-outer nav,
.conf2020-panel,
.extension-landing hr,
.extension-landing .project-card {
.extension-landing .project-card,
body:not(.sa-body-editor) .stage_stage_1fD7k,
body:not(.sa-body-editor) .stage-header_stage-button_hkl9B {
border-color: #606060;
}
.box .box-header {
Expand Down Expand Up @@ -188,10 +188,8 @@ body:not(.sa-body-editor) .select select option,
content: url(%addon-self-dir%/assets/waffle.png);
}

[class^="loader_background"] {
background-color: #252525;
}

.project-info-alert {
.project-info-alert,
.monitor_label_ci1ok, /* for some strange reason, variable names inherit their color from the body, unlike list title names */
.monitor_list-empty_1UKsB {
color: #575e75;
}
247 changes: 0 additions & 247 deletions addons/editor-dark-mode/3dark.css

This file was deleted.

Loading