From 2bd70034790c98e33fa27ff13d1d07e1d4752974 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 21 Jun 2024 13:26:17 -0700 Subject: [PATCH 01/29] Commit --- features/new-look/data.json | 13 +++++++++++++ features/new-look/scratch-www.css | 31 +++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 features/new-look/data.json create mode 100644 features/new-look/scratch-www.css diff --git a/features/new-look/data.json b/features/new-look/data.json new file mode 100644 index 00000000..62e41f24 --- /dev/null +++ b/features/new-look/data.json @@ -0,0 +1,13 @@ +{ + "title": "New Look", + "description": "Makes a newer look to the Scratch site", + "credits": [ + { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" } + ], + "styles": [{ "file": "scratch-www.css", "runOn": "/*" }], + "tags": ["Theme", "New"], + "type": ["Website", "Editor"], + "dynamic": true, + "resources": [] + } + \ No newline at end of file diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css new file mode 100644 index 00000000..73e64221 --- /dev/null +++ b/features/new-look/scratch-www.css @@ -0,0 +1,31 @@ +:root { + --ste-blue: #4e97fe; + --explore-orange: #ffbf00; + --explore-green: #338553; + --ste-green: #0fbd8c; + --scratchr2-blue: #278bbfff; +} + +.splash-activity .box.activity .box-header{ + background-color: var(--explore-orange); + border-top: none; + padding: 14px 20px; +} +.splash-activity .box.activity .box-content{ + background-color: var(--explore-orange); + border-top: none; + padding: 14px 20px; +} +.splash-activity .box.activity { + background-color: var(--explore-orange); + border-top: none; + border-radius: 24px 24px 0 0 +} +.activity-li:hover { + background: #f2f2f2; + padding: 8px; + border-radius: 8px; +} +.news li:nth-child(even) { + border:none !important +} \ No newline at end of file From 88e06c563135a525b502fd4f6496e0685930aed2 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 21 Jun 2024 13:35:36 -0700 Subject: [PATCH 02/29] Finish Home Page --- features/new-look/scratch-www.css | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 73e64221..5eaf953d 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -6,15 +6,22 @@ --scratchr2-blue: #278bbfff; } -.splash-activity .box.activity .box-header{ +.box .box-header{ background-color: var(--explore-orange); border-top: none; padding: 14px 20px; + border-radius: 24px 24px 0 0; } -.splash-activity .box.activity .box-content{ - background-color: var(--explore-orange); - border-top: none; - padding: 14px 20px; +.carousel .slick-slide.project{ + padding: 0px 12px; + padding-top:12px; + border-radius: 8px; +} +.carousel .slick-slide.project:hover{ + background: #e3e3e3 +} +.box{ + border-radius: 24px; } .splash-activity .box.activity { background-color: var(--explore-orange); From 31141179045d8f5e64c9b25db815b8ae0003aee3 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:30:55 -0700 Subject: [PATCH 03/29] Update scratch-www.css --- features/new-look/scratch-www.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 5eaf953d..42945d3d 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -12,6 +12,12 @@ padding: 14px 20px; border-radius: 24px 24px 0 0; } +.box-header > h4{ + color: black !important; +} +.box-header > a > p{ + color: black !Important +} .carousel .slick-slide.project{ padding: 0px 12px; padding-top:12px; @@ -35,4 +41,4 @@ } .news li:nth-child(even) { border:none !important -} \ No newline at end of file +} From 53134371d7f3db94adfae33a1bc8d3fe4ad45516 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:31:44 -0700 Subject: [PATCH 04/29] Update scratch-www.css --- features/new-look/scratch-www.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 42945d3d..5d155746 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -16,7 +16,7 @@ color: black !important; } .box-header > a > p{ - color: black !Important + color: black !important } .carousel .slick-slide.project{ padding: 0px 12px; From 82dd146b60605348c8d87a86b0502a0a5c00eb40 Mon Sep 17 00:00:00 2001 From: rgantzos <86856959+rgantzos@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:37:24 -0700 Subject: [PATCH 05/29] Add to `features.json` file --- features/features.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/features/features.json b/features/features.json index cb1a0966..4d02d25b 100644 --- a/features/features.json +++ b/features/features.json @@ -1,4 +1,9 @@ [ + { + "version": 2, + "id": "new-look", + "versionAdded": "v4.0.0" + }, { "version": 2, "id": "select-self", From 542133448595453b828e8aad12dd0ce61347033a Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:05:37 -0700 Subject: [PATCH 06/29] Update scratch-www.css --- features/new-look/scratch-www.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 5d155746..6098e3fe 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -12,6 +12,13 @@ padding: 14px 20px; border-radius: 24px 24px 0 0; } +.box.activity .box-header{ + background-color: var(--ste-green); +} +.box.news .box-header{ + background-color: var(--ste-green); +} + .box-header > h4{ color: black !important; } From afc25562964324cf1e8fb1ceaf326393f6cdc41e Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:16:43 -0700 Subject: [PATCH 07/29] Update scratch-www.css --- features/new-look/scratch-www.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 6098e3fe..e7cd6da6 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -10,7 +10,10 @@ background-color: var(--explore-orange); border-top: none; padding: 14px 20px; - border-radius: 24px 24px 0 0; + border-radius: 20px 20px 0 0; +} +.box .box-content{ + border-radius: 0px 0px 20px 20px; } .box.activity .box-header{ background-color: var(--ste-green); @@ -34,12 +37,12 @@ background: #e3e3e3 } .box{ - border-radius: 24px; + border-radius: 20px; } .splash-activity .box.activity { background-color: var(--explore-orange); border-top: none; - border-radius: 24px 24px 0 0 + border-radius: 20px 20px 0 0 } .activity-li:hover { background: #f2f2f2; From 993958c569c7b1ad226fcd140ee882971eaa8579 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:34:25 -0700 Subject: [PATCH 08/29] Add rounded corners for navigation items --- features/new-look/scratch-www.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index e7cd6da6..28585e44 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -5,13 +5,23 @@ --ste-green: #0fbd8c; --scratchr2-blue: #278bbfff; } - +.form-group.row.search-wrapper.no-label input{ + border-radius: 20px; +} .box .box-header{ background-color: var(--explore-orange); border-top: none; padding: 14px 20px; border-radius: 20px 20px 0 0; } +.link.messages a { + border-radius: 25px; + transform: scale(0.9); +} +.link.mystuff a { + border-radius: 25px; + transform: scale(0.9); +} .box .box-content{ border-radius: 0px 0px 20px 20px; } From e28aaa178c6ce90fdaa7e951f507f2f0500ec904 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:52:16 -0700 Subject: [PATCH 09/29] Added better looks for boxes --- features/new-look/scratch-www.css | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 28585e44..63d2390c 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -1,9 +1,9 @@ :root { --ste-blue: #4e97fe; - --explore-orange: #ffbf00; + --explore-orange: #ffbb00; --explore-green: #338553; --ste-green: #0fbd8c; - --scratchr2-blue: #278bbfff; + --scratchr2-blue: #407fff; } .form-group.row.search-wrapper.no-label input{ border-radius: 20px; @@ -14,6 +14,9 @@ padding: 14px 20px; border-radius: 20px 20px 0 0; } +.box .box-content{ + background-color: #ffbb0066; +} .link.messages a { border-radius: 25px; transform: scale(0.9); @@ -26,10 +29,25 @@ border-radius: 0px 0px 20px 20px; } .box.activity .box-header{ - background-color: var(--ste-green); + background-color: var(--scratchr2-blue); + +} +.box.activity .box-header > h4{ + color: white !important; +} +.box.news .box-header > h4{ + color: white !important; +} +.box.news .box-header{ + background-color: var(--scratchr2-blue); +} + +.box.activity .box-content { + height: 277px; + background-color: #d9e5ff; } .box.news .box-header{ - background-color: var(--ste-green); + background-color: #d9e5ff; } .box-header > h4{ From a535b30a30c816e8be32a6321b3d9d251cb92fca Mon Sep 17 00:00:00 2001 From: callum <116295240+callumjt@users.noreply.github.com> Date: Sun, 23 Jun 2024 17:44:23 +0100 Subject: [PATCH 10/29] new desc --- features/new-look/data.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/new-look/data.json b/features/new-look/data.json index 62e41f24..3f64cc00 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -1,6 +1,6 @@ { "title": "New Look", - "description": "Makes a newer look to the Scratch site", + "description": "Changes the look the scratch home page for a more modern look.", "credits": [ { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" } ], @@ -10,4 +10,4 @@ "dynamic": true, "resources": [] } - \ No newline at end of file + From 3410aee0965d52171c58262c52000459020e5c2b Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Sun, 23 Jun 2024 14:34:38 -0700 Subject: [PATCH 11/29] Fix bug with Scratch News boxes --- features/new-look/scratch-www.css | 46 ++++++++++++++++++------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 63d2390c..cf5a7a11 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -8,6 +8,30 @@ .form-group.row.search-wrapper.no-label input{ border-radius: 20px; } + +.box.activity .box-header{ + background-color: var(--scratchr2-blue); +} +.box.news .box-header{ + background-color: var(--scratchr2-blue); +} + +.box.activity .box-header > h4{ + color: white !important; +} +.box.news .box-header > h4{ + color: white !important; +} + +.box.activity .box-content { + height: 277px; + background-color: #d9e5ff; +} + +.box.news .box-content{ + background-color: #d9e5ff; +} + .box .box-header{ background-color: var(--explore-orange); border-top: none; @@ -17,6 +41,7 @@ .box .box-content{ background-color: #ffbb0066; } + .link.messages a { border-radius: 25px; transform: scale(0.9); @@ -28,27 +53,10 @@ .box .box-content{ border-radius: 0px 0px 20px 20px; } -.box.activity .box-header{ - background-color: var(--scratchr2-blue); -} -.box.activity .box-header > h4{ - color: white !important; -} -.box.news .box-header > h4{ - color: white !important; -} -.box.news .box-header{ - background-color: var(--scratchr2-blue); -} -.box.activity .box-content { - height: 277px; - background-color: #d9e5ff; -} -.box.news .box-header{ - background-color: #d9e5ff; -} + + .box-header > h4{ color: black !important; From cad10cfe5cf8465445cd8fc0feca1b32dc03f87c Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Mon, 24 Jun 2024 06:55:21 -0700 Subject: [PATCH 12/29] Update description --- features/new-look/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/new-look/data.json b/features/new-look/data.json index 3f64cc00..92e1cd38 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -1,6 +1,6 @@ { "title": "New Look", - "description": "Changes the look the scratch home page for a more modern look.", + "description": "Changes the look of the Scratch Site to a more modern, fresh look.", "credits": [ { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" } ], From 5f822eb2ebda09bba276a41cbe1d07c9dcf34857 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Mon, 24 Jun 2024 07:45:21 -0700 Subject: [PATCH 13/29] Add JSON for editor --- features/new-look/data.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/features/new-look/data.json b/features/new-look/data.json index 92e1cd38..4cc08fe0 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -2,9 +2,10 @@ "title": "New Look", "description": "Changes the look of the Scratch Site to a more modern, fresh look.", "credits": [ - { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" } + { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" }, + { "username": "_nix", "url": "https://scratch.mit.edu/users/_nix/" } ], - "styles": [{ "file": "scratch-www.css", "runOn": "/*" }], + "styles": [{ "file": "scratch-www.css", "runOn": "/*" }{ "file": "scratch-editor.css", "runOn": "/projects/*" }], "tags": ["Theme", "New"], "type": ["Website", "Editor"], "dynamic": true, From c011a3b1c0e7b13bb7a8972a60dae51743c47eee Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Mon, 24 Jun 2024 07:48:22 -0700 Subject: [PATCH 14/29] Add styles for Scratch Editor --- features/new-look/scratch-editor.css | 321 +++++++++++++++++++++++++++ 1 file changed, 321 insertions(+) create mode 100644 features/new-look/scratch-editor.css diff --git a/features/new-look/scratch-editor.css b/features/new-look/scratch-editor.css new file mode 100644 index 00000000..d09a9517 --- /dev/null +++ b/features/new-look/scratch-editor.css @@ -0,0 +1,321 @@ +/* Created by @towerofnix */ +body { + background-color: black; +} + +.blocklyMainBackground { + fill: #444 !important; +} + +/*.blocklyBlockCanvas { filter: brightness(0.9) saturate(0) !important; }*/ +.blocklySvg { + background-color: #222 !important; +} + +.blocklyFlyoutBackground { + fill: #222 !important; +} + +.blocklyFlyout { + border-right-color: #000 !important; +} + +.blocklyZoom image { + opacity: 0.25; +} + +.blocklyScrollbarHandle { + fill: #555 !important; +} + +.blocklyWidgetDiv .goog-menu { + background: #555 !important; + border-color: #111; +} + +.blocklyWidgetDiv .goog-menuitem { + color: #FFF !important; +} + +.blocklyWidgetDiv .goog-menuitem-highlight { + background-color: #999 !important; + border-top: 1px solid #333; + border-bottom: 1px solid #333 +} + +.blocklyWidgetDiv .goog-menuitem-disabled .goog-menuitem-content { + color: #AAA !important; +} + +.scratchCategoryMenu, +.blocklyToolboxDiv, +[class^=selector_wrapper] { + background: #333 !important; + color: #EEE; +} + +.scratchCategoryMenuItem.categorySelected { + background: #444 !important; +} + +[class^=menu-bar_menu-bar_] { + background: #222 !important; +} + +[class^=sprite-selector_], +[class^=stage-selector_] { + background: #333 !important; + color: #EEE; +} + +[class*=sprite-selector-item] { + background: #3A3A3A !important; + color: #EEE; +} + +[class^=selector_new-buttons]::before { + background: none !important; +} + +[class^=sprite-info] { + background: #333 !important; + color: #EEE; +} + +[class^=gui_extension-button-container] { + background: #444 !important; + border-color: #222 !important; +} + +[class^=gui_body-wrapper] { + background-color: #2E2E2E !important; +} + +[class*=gui_tab_] { + background-color: #444 !important; + border-bottom-color: #2E2E2E !important; +} + +[class*=gui_tab_][class*=gui_is-selected] { + background-color: #555 !important; +} + +[class^=asset-panel_] { + background-color: #444 !important; + color: #EEE; +} + +[class^=sound-editor_round-button] { + filter: brightness(0.75) saturate(0) !important; +} + +[class*=button_button], +[class^=sound-editor_button] { + background: #555 !important; + border-color: #333 !important; +} + +.injectionDiv, +.blocklyToolboxDiv, +[class^=stage_stage-wrapper], +[class^=asset-panel_], +[class^=sprite-selector], +[class^=stage-selector] { + border-color: #111 !important; +} + +[class^=stage_stage-wrapper-overlay] { + background-color: #000; +} + +[class*=stage_stage-overlay-content] { + border: 1px solid #333 !important; +} + +[class^=stage-header_stage-header-wrapper-overlay] { + background-color: #000; +} + +[class^=react-tabs]:focus::after { + display: none; +} + +[class^=input_input-form_], +[class^=sprite-info], +[class^=stage-header] { + border-color: #666 !important; +} + +[class^=backpack_backpack-header] { + background: #444; + color: white; +} + +[class^=menu-bar_help-icon] { + filter: brightness(0.5); +} + +.Popover-body { + background: #333; + border-color: #222; +} + +.Popover-tipShape { + fill: #333; + stroke: #222; +} + +[class^=color-picker_row-header] { + color: #EEE; +} + +[class^=color-picker_divider] { + border-color: #555; +} + +[class^=color-picker_swatch] { + border-color: #666; +} + +[class^=slider_handle] { + background-color: #EEE; +} + +/* recent changes :P */ + +.blocklyFlyoutButton>.blocklyText, +.blocklyFlyoutLabelText { + fill: #eed !important; +} + +[class^=gui_tab] span { + font-weight: 800; +} + +[class^=gui_tab] li:not([aria-selected=true])>span { + color: hsla(215, 100%, 85%, 0.5) !important; +} + +/* Makes block text a little easier to read. */ +.blocklyDraggable>.blocklyText, +.blocklyDraggable>g>text { + text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.4); +} + +[class^=button_outlined-button]:not([class*=menu-bar]):not([class*=modal]):not([class*=tag-button_active]) { + background: #444 !important; +} + +[class*=modal_modal-overlay] { + background-color: hsla(215, 20%, 35%, 0.9); +} + +[class^=prompt_body] { + background-color: hsla(0, 0%, 90%, 0.9); +} + +.blocklyFlyoutButton:hover { + fill: hsla(215, 60%, 40%, 1) !important; +} + +input { + background: #444; + color: #FFF !important; +} + +input::placeholder { + color: #DDD; +} + +input:focus { + box-shadow: 0 0 0 0.25rem hsla(215, 100%, 55%, 0.45) !important; +} + +[class^="stage_stage-wrapper-overlay"], +[class^="stage-header_stage-header-wrapper-overlay"] { + background-color: #222; +} + +/* Menu bar */ + +[class^=gui_menu-bar], +[class^=modal_header] { + background-color: hsla(215, 20%, 35%, 1); +} + +[class^=menu_menu] { + background-color: hsla(215, 20%, 35%, 1); +} + +[class*=project-title-input_title-field] { + background-color: hsla(215, 20%, 32%, 1); + border-color: hsla(0, 0%, 0%, 0.15) !important; +} + +[class*=project-title-input_title-field]:hover { + background-color: hsla(215, 20%, 29%, 1); +} + +[class*=project-title-input_title-field]:focus { + background-color: hsla(215, 20%, 25%, 1); +} + +/* Context menus */ + +[class*=context-menu_context-menu] { + background-color: #555; +} + +/* Libraries */ + +[class*=modal_modal-content], +[class^=library_library-scroll-grid] { + background-color: #2E2E2E !important; +} + +[class^=library_library-scroll-grid]>[class^=library-item_library-item] { + background-color: #3A3A3A; + border-color: #111; + color: white; +} + +[class^=library_library-scroll-grid]>[class^=library-item_library-item]:hover { + border-color: hsla(215, 100%, 65%, 1); +} + +[class^=library-item_featured-extension] { + color: white !important; +} + +[class^=library-item_featured-extension-metadata-detail] img { + filter: brightness(2.0) saturate(0); +} + +[class^=library-item_library-item-inset-image-container] { + border-color: #2C2C2C; +} + +[class^=library_filter-bar] { + background-color: hsla(215, 20%, 45%, 1); +} + +[class^=filter_filter-input] { + border-color: #666; + background: #444; + color: #FFF !important; + border-radius: 10rem; +} + +[class^=filter_filter-input]::placeholder { + color: #FFF !important; +} + +[class*=tag-button_active] { + background-color: hsla(30, 100%, 55%, 1) !important; +} + +/* Paint editor */ + +[class^=tool-select-base_tool-select] { + filter: brightness(2.0) saturate(0.25); +} \ No newline at end of file From 2a8308cf0a64a8576d97e27517c2502b6ac62efc Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:23:22 -0400 Subject: [PATCH 15/29] Some fixes --- features/new-look/scratch-www.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index cf5a7a11..dd16ecfd 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -17,10 +17,10 @@ } .box.activity .box-header > h4{ - color: white !important; + color: #fff !important; } .box.news .box-header > h4{ - color: white !important; + color: #fff !important; } .box.activity .box-content { @@ -88,3 +88,7 @@ .news li:nth-child(even) { border:none !important } + +.news .box-header a { + color: #fff; +} From 3fe5b20c3b76a2fa674a3f658ab20991d8dff8d1 Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:32:03 -0400 Subject: [PATCH 16/29] Another fix --- features/new-look/scratch-www.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index dd16ecfd..5e242af3 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -54,10 +54,6 @@ border-radius: 0px 0px 20px 20px; } - - - - .box-header > h4{ color: black !important; } @@ -92,3 +88,8 @@ .news .box-header a { color: #fff; } + +.splash .splash-header .box { + background-color:#d9e5ff !important; +} + From d41edc1016ec928c8ff76295a330bfb48018c525 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:01:26 -0700 Subject: [PATCH 17/29] Add Scratch Profile styles --- features/new-look/data.json | 2 +- features/new-look/scratch-profile.css | 45 +++++++++++++++++++++++++++ features/new-look/scratch-profile.js | 18 +++++++++++ features/new-look/scratch-www.css | 3 ++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 features/new-look/scratch-profile.css create mode 100644 features/new-look/scratch-profile.js diff --git a/features/new-look/data.json b/features/new-look/data.json index 4cc08fe0..0af37f2a 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -5,7 +5,7 @@ { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" }, { "username": "_nix", "url": "https://scratch.mit.edu/users/_nix/" } ], - "styles": [{ "file": "scratch-www.css", "runOn": "/*" }{ "file": "scratch-editor.css", "runOn": "/projects/*" }], + "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profiles.css", "runOn": "/users/*" }], "tags": ["Theme", "New"], "type": ["Website", "Editor"], "dynamic": true, diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css new file mode 100644 index 00000000..7a5467ee --- /dev/null +++ b/features/new-look/scratch-profile.css @@ -0,0 +1,45 @@ +:root { + --ste-blue: #4e97fe; + --explore-orange: #ffbb00; + --explore-green: #338553; + --ste-green: #0fbd8c; + --scratchr2-blue: #407fff; + } + .player { + display: block; + float: right; + text-align: center; + border: 1px solid #e2e2e2; + padding: 16px; + border-radius: 16px; +} +#profile-data .box-head { + height: 400px; +} +#profile-data .box-head .header-text .profile-details h2 { + font-size: 42px; + text-align: center; +} +#profile-data .box-head .profile-details p { + color: #666; + text-align: center; + margin-top: 24px; +} +.box .box-head .header-text { + margin-left: 65px; + margin-top: 80px; +} +.box .box-head .avatar img { + border-radius: 50%; + transform: scale(3) translate(16px,34px); +} +.follow-button{ + background-color: var(--ste-blue); + height: 38px; + width: 84px; + border-radius: 100px; +} +.follow-button.follow.text { + padding: 8px 9px; + /* height: 72px; */ +} \ No newline at end of file diff --git a/features/new-look/scratch-profile.js b/features/new-look/scratch-profile.js new file mode 100644 index 00000000..3c8b29cc --- /dev/null +++ b/features/new-look/scratch-profile.js @@ -0,0 +1,18 @@ +export default async function ({ feature }) { + let player = await ScratchTools.waitForElement(".user-content div.player"); + let pdata = await ScratchTools.waitForElement(".profile-data .box-head"); + pdata.appendChild(player) + player.remove() + if (feature.self.enabled) { + docume.querySelector("h4").textContent = "Dumpster Fire"; + } + + feature.addEventListener("disabled", function () { + box.querySelector("h4").textContent = oldContent; + }); + + feature.addEventListener("enabled", function () { + box.querySelector("h4").textContent = "Dumpster Fire"; + }); + } + \ No newline at end of file diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index 5e242af3..ee7fdcfa 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -5,6 +5,9 @@ --ste-green: #0fbd8c; --scratchr2-blue: #407fff; } +.view { + background: black !important; +} .form-group.row.search-wrapper.no-label input{ border-radius: 20px; } From c2f4dbd5fa9e44f6c3efd20a9bf0b293b4def8e2 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:02:13 -0700 Subject: [PATCH 18/29] Add Scratch Profile --- features/new-look/scratch-profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/new-look/scratch-profile.js b/features/new-look/scratch-profile.js index 3c8b29cc..389c5945 100644 --- a/features/new-look/scratch-profile.js +++ b/features/new-look/scratch-profile.js @@ -10,7 +10,7 @@ export default async function ({ feature }) { feature.addEventListener("disabled", function () { box.querySelector("h4").textContent = oldContent; }); - + feature.addEventListener("enabled", function () { box.querySelector("h4").textContent = "Dumpster Fire"; }); From bbf2d80f11f51486c0b32786f0d08f5ca11ef4f5 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 28 Jun 2024 08:15:14 -0700 Subject: [PATCH 19/29] Updated Scratch profile --- features/new-look/scratch-profile.css | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css index 7a5467ee..7c0d1d0d 100644 --- a/features/new-look/scratch-profile.css +++ b/features/new-look/scratch-profile.css @@ -42,4 +42,35 @@ .follow-button.follow.text { padding: 8px 9px; /* height: 72px; */ +} +#bio, #status{ + width: 400px; +} +.doing{ + width:450px; + background: white; + border: none; +} +.doing h3 { + text-align: center; + background: #417eff; + color: white; + padding: 8px; + border-radius: 16px 16px 0 0; + font-weight: normal; +} + +.activity-stream { + margin: 0 10px; + margin-bottom: 27px; +} +.activity-feed { + background: #d9e5ff; + border-radius: 0 0 16px 16px; +} +#profile-box .about { + width: 430px; + padding-left: 20px; + padding-bottom: 10px; + position: relative; } \ No newline at end of file From 8536e199b564987b504111f417ad1db69b4bf665 Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:14:29 -0400 Subject: [PATCH 20/29] Remove Borders --- features/new-look/scratch-www.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index ee7fdcfa..f8110f2f 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -96,3 +96,10 @@ background-color:#d9e5ff !important; } +.inner > .box { + border:none; +} +.splash .box { + border:none; +} + From 1f00c1bf7175543552e5051f686ff245bfc6528b Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:15:48 -0400 Subject: [PATCH 21/29] Resolve Conflicting Styles --- features/new-look/scratch-www.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/new-look/scratch-www.css b/features/new-look/scratch-www.css index f8110f2f..f9586203 100644 --- a/features/new-look/scratch-www.css +++ b/features/new-look/scratch-www.css @@ -97,9 +97,9 @@ } .inner > .box { - border:none; + border:none !important; } .splash .box { - border:none; + border:none !important; } From 3a5b3de431c4d5312f5a1998bd67880487f8cc57 Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:20:28 -0400 Subject: [PATCH 22/29] Fix file path --- features/new-look/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/new-look/data.json b/features/new-look/data.json index 0af37f2a..a96e8032 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -5,7 +5,7 @@ { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" }, { "username": "_nix", "url": "https://scratch.mit.edu/users/_nix/" } ], - "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profiles.css", "runOn": "/users/*" }], + "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profile.css", "runOn": "/users/*" }], "tags": ["Theme", "New"], "type": ["Website", "Editor"], "dynamic": true, From 553e76f29b6373ac4ad97cfbbfc5e27f9fd10ddc Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:26:41 -0400 Subject: [PATCH 23/29] Fix Carousel Buttons --- features/new-look/scratch-profile.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css index 7c0d1d0d..9e8a5efc 100644 --- a/features/new-look/scratch-profile.css +++ b/features/new-look/scratch-profile.css @@ -73,4 +73,15 @@ padding-left: 20px; padding-bottom: 10px; position: relative; -} \ No newline at end of file +} + + +#featured .arrow-left, #featured .arrow-right { + background-color: transparent !important; +} +#favorites .arrow-left, #favorites .arrow-right { + background-color: transparent !important; +} +#shared .arrow-left, #shared .arrow-left { + background-color: transparent !important; +} From fd693f273aa881d558eaba16579593bfbeff6673 Mon Sep 17 00:00:00 2001 From: MaterArc <105017592+MaterArc@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:33:25 -0400 Subject: [PATCH 24/29] Remove Borders --- features/new-look/scratch-profile.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css index 9e8a5efc..342b817a 100644 --- a/features/new-look/scratch-profile.css +++ b/features/new-look/scratch-profile.css @@ -79,9 +79,24 @@ #featured .arrow-left, #featured .arrow-right { background-color: transparent !important; } + #favorites .arrow-left, #favorites .arrow-right { background-color: transparent !important; } + #shared .arrow-left, #shared .arrow-left { background-color: transparent !important; } +#profile-data { + border:none !important; + box-shadow: none !important; + +} +.box { + border:none !important; + box-shadow: none !important; +} +.slider-carousel-container { + border:none !important; + box-shadow: none !important; +} From 1c0a1deeab6012e2b819c693db1a42c25cc76d67 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:38:26 -0700 Subject: [PATCH 25/29] Update scratch-profile.css --- features/new-look/scratch-profile.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css index 342b817a..ca488852 100644 --- a/features/new-look/scratch-profile.css +++ b/features/new-look/scratch-profile.css @@ -29,6 +29,12 @@ margin-left: 65px; margin-top: 80px; } +.box .box-head .header-text p{ + text-align:center +} +.box .box-head .header-text h2{ + text-align:center +} .box .box-head .avatar img { border-radius: 50%; transform: scale(3) translate(16px,34px); @@ -90,7 +96,7 @@ #profile-data { border:none !important; box-shadow: none !important; - + } .box { border:none !important; From be2769ddb82a95d1b1fd1be137858c30984323e0 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:39:27 -0700 Subject: [PATCH 26/29] Update scratch-profile.js --- features/new-look/scratch-profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/new-look/scratch-profile.js b/features/new-look/scratch-profile.js index 389c5945..8cc44b37 100644 --- a/features/new-look/scratch-profile.js +++ b/features/new-look/scratch-profile.js @@ -15,4 +15,4 @@ export default async function ({ feature }) { box.querySelector("h4").textContent = "Dumpster Fire"; }); } - \ No newline at end of file + From 95937134f202a31f956744b4f3c9c7bc8d64e22f Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 28 Jun 2024 13:14:42 -0700 Subject: [PATCH 27/29] Update data.json --- features/new-look/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/new-look/data.json b/features/new-look/data.json index a96e8032..7c157a2d 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -5,7 +5,7 @@ { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" }, { "username": "_nix", "url": "https://scratch.mit.edu/users/_nix/" } ], - "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profile.css", "runOn": "/users/*" }], + "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profile.css", "runOn": "/users/*" }, { "file": "scratch-profile.js", "runOn": "/users/*" }], "tags": ["Theme", "New"], "type": ["Website", "Editor"], "dynamic": true, From ed55c911921ebed71a25fd79182e32be2c2524e6 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 19 Jul 2024 07:35:49 -0700 Subject: [PATCH 28/29] Add customizability features --- features/new-look/data.json | 4 +++- features/new-look/scratch-profile.css | 6 ++++++ features/new-look/scratch-profile.js | 19 ++++--------------- features/new-look/scratch-www.js | 5 +++++ 4 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 features/new-look/scratch-www.js diff --git a/features/new-look/data.json b/features/new-look/data.json index 7c157a2d..6f36c2df 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -5,9 +5,11 @@ { "username": "LifeCoderBoy", "url": "https://scratch.mit.edu/users/LifeCoderBoy/" }, { "username": "_nix", "url": "https://scratch.mit.edu/users/_nix/" } ], - "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profile.css", "runOn": "/users/*" }, { "file": "scratch-profile.js", "runOn": "/users/*" }], + "styles": [{ "file": "scratch-www.css", "runOn": "/" }, { "file": "scratch-editor.css", "runOn": "/projects/*" }, { "file": "scratch-profile.css", "runOn": "/users/*" }], + "scripts": [{"file": "scratch-www.js", "runOn": "/"}, { "file": "scratch-profile.js", "runOn": "/users/*" }], "tags": ["Theme", "New"], "type": ["Website", "Editor"], + "options": [{ "id": "theme", "name": "Mode", "type": 0 }], "dynamic": true, "resources": [] } diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css index ca488852..b2a318d5 100644 --- a/features/new-look/scratch-profile.css +++ b/features/new-look/scratch-profile.css @@ -106,3 +106,9 @@ border:none !important; box-shadow: none !important; } +.view{ + background: black; +} +body{ + background:black +} diff --git a/features/new-look/scratch-profile.js b/features/new-look/scratch-profile.js index 8cc44b37..1bf29e09 100644 --- a/features/new-look/scratch-profile.js +++ b/features/new-look/scratch-profile.js @@ -1,18 +1,7 @@ export default async function ({ feature }) { - let player = await ScratchTools.waitForElement(".user-content div.player"); - let pdata = await ScratchTools.waitForElement(".profile-data .box-head"); - pdata.appendChild(player) - player.remove() - if (feature.self.enabled) { - docume.querySelector("h4").textContent = "Dumpster Fire"; - } - - feature.addEventListener("disabled", function () { - box.querySelector("h4").textContent = oldContent; - }); - - feature.addEventListener("enabled", function () { - box.querySelector("h4").textContent = "Dumpster Fire"; - }); + + let v = await ScratchTools.waitForElement(".view") + v.style.background = ScratchTools.Storage.theme } + diff --git a/features/new-look/scratch-www.js b/features/new-look/scratch-www.js new file mode 100644 index 00000000..37f290a3 --- /dev/null +++ b/features/new-look/scratch-www.js @@ -0,0 +1,5 @@ +export default async function ({ feature }) { + + let v = await ScratchTools.waitForElement(".view") + v.style.background = ScratchTools.Storage.theme + } \ No newline at end of file From 1da9750b8f80d2bacf295da6e88c3121a80e4ec1 Mon Sep 17 00:00:00 2001 From: blazgocompany <96586789+blazgocompany@users.noreply.github.com> Date: Fri, 19 Jul 2024 07:36:46 -0700 Subject: [PATCH 29/29] Add customizability --- features/new-look/data.json | 2 +- features/new-look/scratch-editor.css | 2 +- features/new-look/scratch-profile.css | 2 +- features/new-look/scratch-www.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/features/new-look/data.json b/features/new-look/data.json index 6f36c2df..9de361e9 100644 --- a/features/new-look/data.json +++ b/features/new-look/data.json @@ -12,5 +12,5 @@ "options": [{ "id": "theme", "name": "Mode", "type": 0 }], "dynamic": true, "resources": [] - } + } diff --git a/features/new-look/scratch-editor.css b/features/new-look/scratch-editor.css index d09a9517..e8792cef 100644 --- a/features/new-look/scratch-editor.css +++ b/features/new-look/scratch-editor.css @@ -6,7 +6,7 @@ body { .blocklyMainBackground { fill: #444 !important; } - + /*.blocklyBlockCanvas { filter: brightness(0.9) saturate(0) !important; }*/ .blocklySvg { background-color: #222 !important; diff --git a/features/new-look/scratch-profile.css b/features/new-look/scratch-profile.css index b2a318d5..82639082 100644 --- a/features/new-look/scratch-profile.css +++ b/features/new-look/scratch-profile.css @@ -111,4 +111,4 @@ } body{ background:black -} +} diff --git a/features/new-look/scratch-www.js b/features/new-look/scratch-www.js index 37f290a3..1c820617 100644 --- a/features/new-look/scratch-www.js +++ b/features/new-look/scratch-www.js @@ -2,4 +2,4 @@ export default async function ({ feature }) { let v = await ScratchTools.waitForElement(".view") v.style.background = ScratchTools.Storage.theme - } \ No newline at end of file +} \ No newline at end of file