From eaf106bdc9734104aa9806a718bd12be975d789c Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Tue, 20 Oct 2020 11:51:07 -0700 Subject: [PATCH 01/30] Updated xd-arsenic's name --- js/all.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/all.js b/js/all.js index 34106e20..763cb6e0 100644 --- a/js/all.js +++ b/js/all.js @@ -286,7 +286,7 @@ let modals = [ createElement("span", [], { textContent: ", " }), createElement("a", [], { href: "https://github.com/reteps", textContent: "Peter Stenger" }), createElement("span", [], { textContent: ", and " }), - createElement("a", [], { href: "https://github.com/xd-arsenic", textContent: "xd-arsenic" }) + createElement("a", [], { href: "https://github.com/xd-arsenic", textContent: "Alexander (xd-arsenic)" }) ]), createElement("p", ["setting-description"], { textContent: "Various code contributions" }) ]), From 681320c1f0c3efca7aac90a01ac71e75394c0933 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Tue, 20 Oct 2020 11:52:10 -0700 Subject: [PATCH 02/30] Added github handles for all contributors --- js/all.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/all.js b/js/all.js index 763cb6e0..03f8dedd 100644 --- a/js/all.js +++ b/js/all.js @@ -270,23 +270,23 @@ let modals = [ createElement("h2", ["setting-entry"], { textContent: "Contributors" }), createElement("div", ["setting-entry"], {}, [ createElement("h3", ["setting-title"], {}, [ - createElement("a", [], { href: "https://github.com/aopell", textContent: "Aaron Opell" }) + createElement("a", [], { href: "https://github.com/aopell", textContent: "Aaron Opell (@aopell)" }) ]), createElement("p", ["setting-description"], { textContent: "Extension creator; lead developer" }) ]), createElement("div", ["setting-entry"], {}, [ createElement("h3", ["setting-title"], {}, [ - createElement("a", [], { href: "https://github.com/glen3b", textContent: "Glen Husman" }) + createElement("a", [], { href: "https://github.com/glen3b", textContent: "Glen Husman (@glen3b)" }) ]), createElement("p", ["setting-description"], { textContent: "Lead developer" }) ]), createElement("div", ["setting-entry"], {}, [ createElement("h3", ["setting-title"], {}, [ - createElement("a", [], { href: "https://github.com/Roguim", textContent: "Roguim" }), + createElement("a", [], { href: "https://github.com/Roguim", textContent: "@Roguim" }), createElement("span", [], { textContent: ", " }), - createElement("a", [], { href: "https://github.com/reteps", textContent: "Peter Stenger" }), + createElement("a", [], { href: "https://github.com/reteps", textContent: "Peter Stenger (@reteps)" }), createElement("span", [], { textContent: ", and " }), - createElement("a", [], { href: "https://github.com/xd-arsenic", textContent: "Alexander (xd-arsenic)" }) + createElement("a", [], { href: "https://github.com/xd-arsenic", textContent: "Alexander (@xd-arsenic)" }) ]), createElement("p", ["setting-description"], { textContent: "Various code contributions" }) ]), From b185699c7b4cd9bc4e5bf69945c3482593f0e57d Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 14:59:13 -0700 Subject: [PATCH 03/30] Added more user-styled element coverage --- css/all.css | 6 + css/modern.css | 502 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 382 insertions(+), 126 deletions(-) diff --git a/css/all.css b/css/all.css index 7555ea8f..3bbd9c2a 100644 --- a/css/all.css +++ b/css/all.css @@ -694,6 +694,12 @@ a._3_bfp { content: "eta Enabled"; } +.splus-beta-container:hover .splus-beta-tag::before { + content: "⚙"; + float: right; + padding-left: 5px; +} + .splus-beta-container div { display: none; } diff --git a/css/modern.css b/css/modern.css index 49d991b8..80ffa16b 100644 --- a/css/modern.css +++ b/css/modern.css @@ -47,7 +47,7 @@ --contrast-text: white; --muted-text: #677583; --contrast-border: #BABABA; - --input: #C2C2C2; + --input: #D0D0D0; --error: #F44336; --highlight: rgba(255, 183, 2, 0.2); --active: #98d4e4; @@ -153,7 +153,13 @@ /* General */ -h1, h2, h3, h4, h5, h6, p { +h1, +h2, +h3, +h4, +h5, +h6, +p { color: var(--text) !important; } @@ -163,18 +169,41 @@ pre { } #youtube-disclaimer { - color: var(--contrast-text); - background-color: var(--secondary); + display: inline-block !important; + color: var(--text) !important; + background-color: var(--secondary) !important; + padding: 10px !important; + margin-top: 10px !important; + border-radius: var(--border-radius) !important; } -textarea, select, input[type=text] { +textarea, +select, +input[type=text] { background-color: var(--input) !important; color: var(--text) !important; border: none !important; border-radius: var(--border-radius) !important; } -ul.context-menu-list, ul.context-menu-list li.context-menu-item { +/* All user-styled elements -- should be for dark only */ +.s-edge-feed .edge-item *[style], +.discussion-view .discussion-prompt *[style], +.discussion-view .comment-body-wrapper *[style], +#important-post-body *[style], +#main-inner .info-container *[style], +.standard-page .s-page-content-full *[style], +.discussion-prompt *[style], +.comment-comment .comment-body-wrapper *[style], +.instructions-content *[style], +.lrn_stimulus .lrn_stimulus_content *[style], +.lrn-possible-answer *[style] { + color: var(--text) !important; + background: none !important; +} + +ul.context-menu-list, +ul.context-menu-list li.context-menu-item { background-color: var(--secondary) !important; color: var(--text) !important; border-color: var(--accent) !important; @@ -197,7 +226,8 @@ ul.context-menu-list li.context-menu-item:hover { background: var(--accent) !important; } -*::-webkit-scrollbar-button, *::-webkit-scrollbar-corner { +*::-webkit-scrollbar-button, +*::-webkit-scrollbar-corner { display: none !important; } @@ -247,7 +277,8 @@ iframe { background: none !important; } -body a.link-btn, body button.link-btn { +body a.link-btn, +body button.link-btn { box-shadow: none !important; background: none !important; background-color: var(--secondary) !important; @@ -279,11 +310,32 @@ body a.link-btn, body button.link-btn { color: var(--grades) !important; } -#main .s-notifications-mini .edge-time, #main .s-notifications-mini .created { +#main .s-notifications-mini .edge-time, +#main .s-notifications-mini .created { color: var(--muted-text) !important; } -.splus-modal-title, .submit-span-wrapper, .submit-span-wrapper input[type="button"], .submit-span-wrapper input[type="submit"], :not(.submit-span-wrapper)>input[type="button"], :not(.submit-span-wrapper)>input[type="submit"], footer li a, header li a, .splus-modal-footer-text, .splus-modal-footer-text a, body a.link-btn.active, div.courses-left-menu, .portfolio-list a.btn, a._3_bfp, footer, footer button, .Header-header-button-1EE8Y, [class*="Header-header-drop-menu-item-"], [class*="Header-header-drop-menu-"] li a *, .Header-header-button-active-GnvKh, .LGaPf svg { +.splus-modal-title, +.submit-span-wrapper, +.submit-span-wrapper input[type="button"], +.submit-span-wrapper input[type="submit"], +:not(.submit-span-wrapper)>input[type="button"], +:not(.submit-span-wrapper)>input[type="submit"], +footer li a, +header li a, +.splus-modal-footer-text, +.splus-modal-footer-text a, +body a.link-btn.active, +div.courses-left-menu, +.portfolio-list a.btn, +a._3_bfp, +footer, +footer button, +.Header-header-button-1EE8Y, +[class*="Header-header-drop-menu-item-"], +[class*="Header-header-drop-menu-"] li a *, +.Header-header-button-active-GnvKh, +.LGaPf svg { color: var(--contrast-text) !important; } @@ -292,7 +344,8 @@ body a.link-btn, body button.link-btn { opacity: 0.8 !important; } -.close:hover, .close:focus { +.close:hover, +.close:focus { opacity: 1 !important; color: var(--contrast-text) !important; } @@ -315,13 +368,17 @@ body a.link-btn, body button.link-btn { color: var(--text) !important; } -.action-links-wrapper-expanded .action-links-unfold .action-links-unfold-text:hover, .action-links-unfold:hover, :root[dark=false] .action-links-wrapper-expanded .action-links-unfold .action-links-unfold-text:hover, :root[dark=false] .action-links-unfold:hover { +.action-links-wrapper-expanded .action-links-unfold .action-links-unfold-text:hover, +.action-links-unfold:hover, +:root[dark=false] .action-links-wrapper-expanded .action-links-unfold .action-links-unfold-text:hover, +:root[dark=false] .action-links-unfold:hover { background-color: var(--muted-text) !important; } /* Schoology Popups */ -.popups-box .popups-body, #popups-loading div { +.popups-box .popups-body, +#popups-loading div { background-color: var(--primary) !important; color: var(--text) !important; border: none !important; @@ -363,7 +420,8 @@ fieldset div div div label span { background: var(--secondary) !important; } -.popups-tab, .popups-tabs { +.popups-tab, +.popups-tabs { background: var(--accent) !important; } @@ -390,14 +448,16 @@ fieldset div div div label span { border-bottom-left-radius: var(--border-radius) !important; } -div.error, tr.error { +div.error, +tr.error { background-color: var(--error) !important; border-color: var(--error) !important; } /* Courses and Groups Dropdown */ -.splus-courses-navbar-button div[role=menu], .splus-groups-navbar-button div[role=menu] { +.splus-courses-navbar-button div[role=menu], +.splus-groups-navbar-button div[role=menu] { background-color: var(--accent) !important; } @@ -405,12 +465,18 @@ div.error, tr.error { filter: invert(var(--theme-is-dark)) !important; } -.splus-courses-navbar-button article, .splus-courses-navbar-button article a, .splus-groups-navbar-button article, .splus-groups-navbar-button article a, .JoinCard-card-1qWtS { +.splus-courses-navbar-button article, +.splus-courses-navbar-button article a, +.splus-groups-navbar-button article, +.splus-groups-navbar-button article a, +.JoinCard-card-1qWtS { border: var(--border-size) solid transparent !important; outline: none !important; } -.splus-courses-navbar-button article a:hover, .splus-groups-navbar-button article a:hover, .JoinCard-card-1qWtS:hover { +.splus-courses-navbar-button article a:hover, +.splus-groups-navbar-button article a:hover, +.JoinCard-card-1qWtS:hover { border: var(--border-size) solid var(--contrast-border) !important; border-radius: var(--border-radius) !important; } @@ -420,20 +486,24 @@ div.error, tr.error { border-top-right-radius: var(--border-radius) !important; } -.Card-card-data-17m6S, .Card-card-data-17m6S div { +.Card-card-data-17m6S, +.Card-card-data-17m6S div { border-bottom-left-radius: var(--border-radius) !important; border-bottom-right-radius: var(--border-radius) !important; } -.splus-courses-navbar-button article a div, .splus-groups-navbar-button article a div { +.splus-courses-navbar-button article a div, +.splus-groups-navbar-button article a div { background-color: var(--primary) !important; } -.splus-courses-navbar-button article a div div._1wP6w, .splus-groups-navbar-button article a div div._1wP6w { +.splus-courses-navbar-button article a div div._1wP6w, +.splus-groups-navbar-button article a div div._1wP6w { color: var(--text) !important; } -.splus-courses-navbar-button article a div div._2wOCj, .splus-groups-navbar-button article a div div._2wOCj { +.splus-courses-navbar-button article a div div._2wOCj, +.splus-groups-navbar-button article a div div._2wOCj { color: var(--muted-text) !important; } @@ -443,7 +513,9 @@ header div.Je0RK button._1SIMq { border-radius: var(--border-radius) !important; } -._1DD87, ._3gfrT:focus:not(:active), .oUq3j:hover:not(:active) { +._1DD87, +._3gfrT:focus:not(:active), +.oUq3j:hover:not(:active) { border: var(--border-size) solid var(--contrast-border) !important; } @@ -471,26 +543,49 @@ body .fc-event-skin { color: var(--text); } -.color-default-personal, .color-default-groups, .color-default-courses, .color-default-school, .color-1, .color-2, .color-3, .color-4, .color-5, .color-6, .color-7, .color-8, .color-9, .color-10, .color-11, .color-12, .color-13, .color-14, .color-15, .color-16 { +.color-default-personal, +.color-default-groups, +.color-default-courses, +.color-default-school, +.color-1, +.color-2, +.color-3, +.color-4, +.color-5, +.color-6, +.color-7, +.color-8, +.color-9, +.color-10, +.color-11, +.color-12, +.color-13, +.color-14, +.color-15, +.color-16 { border-color: rgba(0, 0, 0, 0.4) !important; } -.fc-event-skin.ev-course, .legend-course { +.fc-event-skin.ev-course, +.legend-course { background: var(--cal3); border-color: rgba(0, 0, 0, 0.4) !important; } -.fc-event-skin.ev-group, .legend-group { +.fc-event-skin.ev-group, +.legend-group { background: var(--cal2); border-color: rgba(0, 0, 0, 0.4) !important; } -.fc-event-skin.ev-user, .legend-user { +.fc-event-skin.ev-user, +.legend-user { background: var(--cal1); border-color: rgba(0, 0, 0, 0.4) !important; } -.fc-event-skin.ev-school, .legend-school { +.fc-event-skin.ev-school, +.legend-school { background: var(--cal4); border-color: rgba(0, 0, 0, 0.4) !important; } @@ -575,7 +670,8 @@ body .fc-event-skin { background: var(--cal20) !important; } -.fc-state-default, .fc-state-default .fc-button-inner { +.fc-state-default, +.fc-state-default .fc-button-inner { background-color: var(--primary) !important; border-color: none !important; color: var(--text) !important; @@ -592,13 +688,15 @@ body .fc-event-skin { border-top-right-radius: var(--border-radius) !important; } -.fc-state-disabled, .fc-state-disabled .fc-button-inner { +.fc-state-disabled, +.fc-state-disabled .fc-button-inner { background-color: var(--secondary) !important; color: var(--muted-text) !important; border-color: none !important; } -.fc-state-active, .fc-state-active .fc-button-inner { +.fc-state-active, +.fc-state-active .fc-button-inner { background-color: var(--active) !important; } @@ -634,7 +732,8 @@ div.les2- h3 { /* Modal Red Color */ -.close-button, .restore-defaults { +.close-button, +.restore-defaults { color: var(--error) !important; } @@ -644,22 +743,34 @@ div.les2- h3 { /* Home Page */ -[page^="/home"] #center div#main, [page^="/home"] #main-inner, [page^="/home"] #main-content-wrapper, [page="/"] #center div#main, [page="/"] #main-inner, [page="/"] #main-content-wrapper, .splus-modal-body { +[page^="/home"] #center div#main, +[page^="/home"] #main-inner, +[page^="/home"] #main-content-wrapper, +[page="/"] #center div#main, +[page="/"] #main-inner, +[page="/"] #main-content-wrapper, +.splus-modal-body { background-color: var(--primary) !important; color: var(--text) !important; } -[page^="/home"] #right-column-inner div, [page^="/home"] #home-feed-container, [page="/"] #right-column-inner div, [page="/"] #home-feed-container { +[page^="/home"] #right-column-inner div, +[page^="/home"] #home-feed-container, +[page="/"] #right-column-inner div, +[page="/"] #home-feed-container { background-color: var(--accent) !important; color: var(--text) !important; border-radius: var(--border-radius) !important; } -.date-header h4 span, .s-poll-option-title, .s-like-sentence { +.date-header h4 span, +.s-poll-option-title, +.s-like-sentence { color: var(--text) !important; } -.s-polls-poll-option, #edge-filters-menu { +.s-polls-poll-option, +#edge-filters-menu { background: none !important; background-color: var(--secondary) !important; color: var(--text) !important; @@ -672,7 +783,8 @@ div.les2- h3 { border: none !important; } -#edge-filters-btn, .feed-comments { +#edge-filters-btn, +.feed-comments { background-position-y: calc(-576px - 18px * var(--theme-is-dark)) !important; background-color: var(--primary) !important; color: var(--text) !important; @@ -685,12 +797,14 @@ div.les2- h3 { background-position: 0 calc(-237px - 20px * var(--theme-is-dark)) !important; } -#edge-filters-menu .edge-filter-option:hover, #edge-filters-menu .edge-filter-option.active:hover { +#edge-filters-menu .edge-filter-option:hover, +#edge-filters-menu .edge-filter-option.active:hover { background-color: var(--active) !important; color: var(--text) !important; } -.gray, .upcoming-time { +.gray, +.upcoming-time { color: var(--muted-text) !important; } @@ -702,11 +816,14 @@ img.splus-logo-inline { background-color: var(--active) !important; } -.theme-2016 .date-header h4, #home-feed-container #smart-box { +.theme-2016 .date-header h4, +#home-feed-container #smart-box { border-bottom: var(--border-size) solid var(--contrast-border) !important; } -.view-file-popup, .view-btn-disabled, .edit-external-tool-attachment { +.view-file-popup, +.view-btn-disabled, +.edit-external-tool-attachment { border-left: var(--border-size) solid var(--contrast-border) !important; } @@ -718,7 +835,8 @@ img.splus-logo-inline { border-bottom: 5px solid var(--contrast-border) !important; } -.s-edge-type-update-post .update-body, .s-edge-type-update-poll .update-body { +.s-edge-type-update-post .update-body, +.s-edge-type-update-poll .update-body { color: var(--text) !important; } @@ -748,11 +866,23 @@ img.splus-logo-inline { /* Grades Page */ -.gradebook-course.hierarchical-grading-report .period-row .grade-column, .gradebook-course.hierarchical-grading-report .category-row .grade-column, .gradebook-course.hierarchical-grading-report .item-row .grade-column, .grade-active-color, .awarded-grade span { +.gradebook-course.hierarchical-grading-report .period-row .grade-column, +.gradebook-course.hierarchical-grading-report .category-row .grade-column, +.gradebook-course.hierarchical-grading-report .item-row .grade-column, +.grade-active-color, +.awarded-grade span { color: var(--grades) !important; } -.due-date, .gradebook-course.hierarchical-grading-report .grade-column .max-grade, .percentage-contrib, span.comment, .grade-none-color, .course-grade-text, .total-points-wrapper *, .percentage-grade, .no-grade { +.due-date, +.gradebook-course.hierarchical-grading-report .grade-column .max-grade, +.percentage-contrib, +span.comment, +.grade-none-color, +.course-grade-text, +.total-points-wrapper *, +.percentage-grade, +.no-grade { color: var(--text) !important; } @@ -771,7 +901,9 @@ div.summary-course { border-top: var(--border-size) dotted var(--contrast-border) !important; } -.gradebook-course.hierarchical-grading-report .period-row .td-content-wrapper, .gradebook-course.hierarchical-grading-report .final-row .td-content-wrapper, .gradebook-course.hierarchical-grading-report .td-content-wrapper { +.gradebook-course.hierarchical-grading-report .period-row .td-content-wrapper, +.gradebook-course.hierarchical-grading-report .final-row .td-content-wrapper, +.gradebook-course.hierarchical-grading-report .td-content-wrapper { border-top: var(--border-size) solid var(--contrast-border) !important; } @@ -827,12 +959,18 @@ div.summary-course { background-color: var(--active) !important; } -body ul.primary li.active a, body ul.primary li.active a:hover, body ul.primary li a, body ul.primary li a:hover, body ul.primary li a:visited, body ul.primary { +body ul.primary li.active a, +body ul.primary li.active a:hover, +body ul.primary li a, +body ul.primary li a:hover, +body ul.primary li a:visited, +body ul.primary { border-color: var(--contrast-border) !important; border-width: var(--border-size) !important; } -.gradebook-course, .attendance-course { +.gradebook-course, +.attendance-course { border-top: var(--border-size) solid var(--contrast-border) !important; } @@ -841,7 +979,8 @@ body ul.primary li.active a, body ul.primary li.active a:hover, body ul.primary border-width: var(--border-size) 0 !important; } -.attendance-course-attendance table th, .attendance-course-attendance table td { +.attendance-course-attendance table th, +.attendance-course-attendance table td { border: var(--border-size) solid var(--contrast-border) !important; } @@ -870,7 +1009,8 @@ body ul.primary li.active a, body ul.primary li.active a:hover, body ul.primary /* Courses Page */ -.course-action-btns, .group-action-btns { +.course-action-btns, +.group-action-btns { padding: var(--padding) !important; border-radius: var(--border-radius) !important; } @@ -902,7 +1042,8 @@ body>div._1f1I3._35u4I.IaH_B.RuZ14.VSOiH._3brnw.S42JQ>div>div div._2wOCj { color: var(--muted-text) !important; } -body #right-column-inner button.link-btn, body #right-column-inner a.link-btn { +body #right-column-inner button.link-btn, +body #right-column-inner a.link-btn { background-color: var(--primary) !important; } @@ -933,7 +1074,8 @@ body #right-column-inner button.link-btn, body #right-column-inner a.link-btn { border: none !important; } -.listing .course-item.list-item, .courses-listing.mycourses h3 { +.listing .course-item.list-item, +.courses-listing.mycourses h3 { border-bottom: var(--border-size) solid var(--contrast-border) !important; } @@ -942,11 +1084,12 @@ body #right-column-inner button.link-btn, body #right-column-inner a.link-btn { } .sgy-course-search-form__submit-row { - background-color: none !important; + background: none !important; border-color: none !important; } -.sgy-react-select .Select-control, .sgy-react-select .Select-menu-outer { +.sgy-react-select .Select-control, +.sgy-react-select .Select-menu-outer { color: var(--text) !important; border-color: none !important; border-radius: var(--border-radius) !important; @@ -982,7 +1125,8 @@ body #right-column-inner button.link-btn, body #right-column-inner a.link-btn { border-bottom: var(--border-size) solid var(--contrast-border) !important; } -body .enrollment-filters span.active, body .grading-groups-list .grading-group.active { +body .enrollment-filters span.active, +body .grading-groups-list .grading-group.active { background-color: var(--active) !important; } @@ -996,7 +1140,8 @@ body .enrollment-filters span.active, body .grading-groups-list .grading-group.a background-color: var(--accent) !important; } -#site-navigation-breadcrumbs nav li a, #site-navigation-breadcrumbs nav li span { +#site-navigation-breadcrumbs nav li a, +#site-navigation-breadcrumbs nav li span { color: var(--text) !important; } @@ -1021,7 +1166,8 @@ body .enrollment-filters span.active, body .grading-groups-list .grading-group.a background-color: var(--active) !important; } -#library-wrapper .library-collections a:hover, #library-left td:hover { +#library-wrapper .library-collections a:hover, +#library-left td:hover { background-color: var(--active) !important; } @@ -1041,11 +1187,14 @@ body.library-view #library-main { border-left: var(--border-size) solid var(--contrast-border) !important; } -#collection-toolbar, #collection-view-contents { +#collection-toolbar, +#collection-view-contents { border-top: var(--border-size) solid var(--contrast-border) !important; } -#collection-view-contents th, #collection-view-contents td, #library-left .collections-list-wrapper { +#collection-view-contents th, +#collection-view-contents td, +#library-left .collections-list-wrapper { border-bottom: var(--border-size) solid var(--contrast-border) !important; } @@ -1078,15 +1227,20 @@ body.library-view #library-left { color: var(--text) !important; } -.progressContainer, .link-attachment, .attachment-block, .resource-attachment { +.progressContainer, +.link-attachment, +.attachment-block, +.resource-attachment { background: var(--primary) !important; } -.options-reorder-btn, .options-auto-arrange-btn { +.options-reorder-btn, +.options-auto-arrange-btn { color: var(--text) !important; } -.options-reorder-btn:hover, .options-auto-arrange-btn:hover { +.options-reorder-btn:hover, +.options-auto-arrange-btn:hover { background-color: var(--active) !important; } @@ -1097,7 +1251,10 @@ body.library-view #library-left { border-radius: var(--border-radius) !important; } -#sidebar-left #left-nav #menu-s-main ul li a.active, .app-link-wrapper .active, .app-link-wrapper .active:hover, #sidebar-left #menu-s-main .active-trail .active-trail a.course-materials-left-menu { +#sidebar-left #left-nav #menu-s-main ul li a.active, +.app-link-wrapper .active, +.app-link-wrapper .active:hover, +#sidebar-left #menu-s-main .active-trail .active-trail a.course-materials-left-menu { background-color: var(--accent) !important; border: var(--border-size) solid var(--contrast-border) !important; border-right: none !important; @@ -1113,13 +1270,16 @@ th.profile-header { background-color: var(--accent); } -.tab-nav.active, .tab-nav.active:hover { +.tab-nav.active, +.tab-nav.active:hover { background-color: var(--input); } /* Course Page */ -.action-links, .comment.no-comments, .materials-filter-wrapper { +.action-links, +.comment.no-comments, +.materials-filter-wrapper { background-color: var(--secondary) !important; border: var(--border-size) solid var(--contrast-border) !important; border-radius: var(--border-radius) !important; @@ -1135,7 +1295,8 @@ th.profile-header { border-radius: var(--border-radius) !important; } -.has-folder-player #center-top .content-top-upper, .has-materials-player #center-top .content-top-upper { +.has-folder-player #center-top .content-top-upper, +.has-materials-player #center-top .content-top-upper { background-color: var(--secondary) !important; border: none !important; } @@ -1144,7 +1305,9 @@ th.profile-header { background-color: var(--accent) !important; } -.materials-filter-wrapper .action-links-wrapper .action-links-unfold, .action-links-wrapper-gearless .action-links-unfold.active, .action-links-wrapper-gearless .action-links-unfold:active { +.materials-filter-wrapper .action-links-wrapper .action-links-unfold, +.action-links-wrapper-gearless .action-links-unfold.active, +.action-links-wrapper-gearless .action-links-unfold:active { color: var(--text) !important; } @@ -1157,7 +1320,10 @@ body .action-links a:hover { color: var(--text) !important; } -.materials-top, #folder-contents-table td, #right-column h3, .left-block-wrapper h3 { +.materials-top, +#folder-contents-table td, +#right-column h3, +.left-block-wrapper h3 { border: none !important; border-bottom: var(--border-size) solid var(--contrast-border) !important; } @@ -1166,7 +1332,7 @@ body .action-links a:hover { border-top: var(--border-size) solid var(--contrast-border) !important; } -.s-edge-feed li, .s-edge-feed span[style], .s-edge-feed div[style], .s-edge-feed p[style], .discussion-view .discussion-prompt span[style], .discussion-view .discussion-prompt div[style], .discussion-view .discussion-prompt p[style] { +.s-edge-feed .edge-item li { color: var(--text) !important; } @@ -1178,7 +1344,9 @@ body .action-links a:hover { border-bottom: var(--border-size) solid var(--contrast-border) !important; } -.pre-fill, .upcoming-list .empty, .no-attendance-status-dates { +.pre-fill, +.upcoming-list .empty, +.no-attendance-status-dates { color: var(--muted-text) !important; } @@ -1218,7 +1386,8 @@ span#updates-count { background-position: 0 -1425px !important; } -.access-code.left-block-wrapper, #roster-wrapper .parent-code { +.access-code.left-block-wrapper, +#roster-wrapper .parent-code { background-color: var(--accent); color: var(--text); } @@ -1276,11 +1445,13 @@ table.privatemsg-list td.no-messages { border-color: var(--contrast-border) !important; } -.ac-name, .ac-top { +.ac-name, +.ac-top { color: var(--text) !important; } -.ac-row .ac-bot, .ac-row .ac-school { +.ac-row .ac-bot, +.ac-row .ac-school { color: var(--muted-text) !important; } @@ -1300,7 +1471,8 @@ table.privatemsg-list td.no-messages { color: var(--muted-text) !important; } -.message-title, .message-view-row { +.message-title, +.message-view-row { border-bottom: var(--border-size) solid var(--contrast-border) !important; } @@ -1320,6 +1492,11 @@ table.privatemsg-list td.no-messages { border: none !important; } +.discussion-view #s_comments .s_comments_level .comment.on-top, +.discussion-view #main #s_comments .s_comments_level .s_comments_level .comment.on-top { + background-color: var(--active) !important; +} + .grade-title { color: var(--text) !important; } @@ -1332,11 +1509,13 @@ table.privatemsg-list td.no-messages { color: var(--muted-text) !important; } -.assignment-details, .extra-details { +.assignment-details, +.extra-details { border-bottom: var(--border-size) solid var(--contrast-border) !important; } -.discussion-view .sticky-wrapper .s-comments-post-form, .discussion-view .sticky-wrapper .s-comments-post-form-new { +.discussion-view .sticky-wrapper .s-comments-post-form, +.discussion-view .sticky-wrapper .s-comments-post-form-new { background: var(--primary) !important; border-bottom-left-radius: var(--border-radius) !important; border-bottom-right-radius: var(--border-radius) !important; @@ -1355,7 +1534,8 @@ table.privatemsg-list td.no-messages { border-radius: var(--border-radius) !important; } -.discussion-view #content-wrapper .discussion-content div#s_comments .s_comments_level .s_comments_level, .discussion-view #content-wrapper .s-comments-post-form-new div#s_comments .s_comments_level .s_comments_level { +.discussion-view #content-wrapper .discussion-content div#s_comments .s_comments_level .s_comments_level, +.discussion-view #content-wrapper .s-comments-post-form-new div#s_comments .s_comments_level .s_comments_level { background: var(--accent) !important; border: none !important; border-bottom-left-radius: var(--border-radius) !important; @@ -1368,10 +1548,6 @@ table.privatemsg-list td.no-messages { border-top-left-radius: var(--border-radius) !important; } -.discussion-view .comment-body-wrapper span[style] { - color: var(--text) !important; -} - .post-count { color: var(--muted-text) !important; } @@ -1380,7 +1556,8 @@ table.privatemsg-list td.no-messages { border-top: var(--border-size) solid var(--contrast-border) !important; } -.bar-right-wrapper, .comment-counts { +.bar-right-wrapper, +.comment-counts { border-color: var(--contrast-border) !important; } @@ -1412,7 +1589,10 @@ table.privatemsg-list td.no-messages { /* User Page */ -.info-tab th, .info-tab td, .enrollment-view-wrapper td, .enrollment-view-wrapper th { +.info-tab th, +.info-tab td, +.enrollment-view-wrapper td, +.enrollment-view-wrapper th { color: var(--muted-text) !important; border-bottom: var(--border-size) solid var(--contrast-border) !important; } @@ -1439,11 +1619,13 @@ table.privatemsg-list td.no-messages { color: var(--muted-text) !important; } -.tw-bs .portfolio-list__add-new, .tw-bs .portfolio-view__add-new { +.tw-bs .portfolio-list__add-new, +.tw-bs .portfolio-view__add-new { background: transparent !important; } -.tw-bs .portfolio-list__add-new-bg, .tw-bs .portfolio-view__add-new-bg { +.tw-bs .portfolio-list__add-new-bg, +.tw-bs .portfolio-view__add-new-bg { border-bottom: var(--border-size) solid var(--contrast-border) !important; } @@ -1465,7 +1647,8 @@ table.privatemsg-list td.no-messages { background: var(--primary) !important; } -.tw-bs .portfolio-list__list-view>.ui-state-highlight, .tw-bs .portfolio-item-list>.ui-state-highlight { +.tw-bs .portfolio-list__list-view>.ui-state-highlight, +.tw-bs .portfolio-item-list>.ui-state-highlight { background: var(--primary) !important; border-radius: var(--border-radius) !important; } @@ -1481,7 +1664,10 @@ table.privatemsg-list td.no-messages { background-color: var(--accent) !important; } -[page^="/school/"] #content-wrapper, [page^="/school/"] td, [page^="/group/"] #content-wrapper, [page^="/group/"] td { +[page^="/school/"] #content-wrapper, +[page^="/school/"] td, +[page^="/group/"] #content-wrapper, +[page^="/group/"] td { background-color: var(--accent) !important; color: var(--text) !important; } @@ -1494,7 +1680,9 @@ table.privatemsg-list td.no-messages { color: var(--muted-text) !important; } -.enrollment-view-wrapper, .roster-top, .active-loader { +.enrollment-view-wrapper, +.roster-top, +.active-loader { background-color: var(--accent) !important; } @@ -1520,7 +1708,8 @@ table.privatemsg-list td.no-messages { border-radius: var(--border-radius) !important; } -.course-dashboard section.sgy-card, .course-dashboard .sgy-card-lens { +.course-dashboard section.sgy-card, +.course-dashboard .sgy-card-lens { background-color: var(--accent) !important; border-radius: var(--border-radius) !important; } @@ -1569,7 +1758,8 @@ ul.Search-dropdown-3huUv { /* Settings Page */ -ul.primary, .with-tabs #center-top { +ul.primary, +.with-tabs #center-top { background: unset !important; background-color: var(--secondary) !important; } @@ -1580,12 +1770,15 @@ ul.primary li a { color: var(--text) !important; } -ul.primary li.active a, .email-notify, fieldset { +ul.primary li.active a, +.email-notify, +fieldset { background-color: var(--accent) !important; color: var(--text) !important; } -.sticky-header *, .ui-selectmenu-status { +.sticky-header *, +.ui-selectmenu-status { background-color: var(--secondary) !important; color: var(--text) !important; } @@ -1624,7 +1817,8 @@ div.cellphone-container { color: var(--text) !important; } -.ui-selectmenu-menu li:hover a, .ui-selectmenu-menu .ui-selectmenu-item-focus a { +.ui-selectmenu-menu li:hover a, +.ui-selectmenu-menu .ui-selectmenu-item-focus a { background-color: var(--active) !important; } @@ -1632,7 +1826,8 @@ div.cellphone-container { background-position: 0 calc(-242px - 20px * var(--theme-is-dark)) !important; } -.settings-table tbody td.selected, .settings-table tbody td.selected:hover { +.settings-table tbody td.selected, +.settings-table tbody td.selected:hover { background-color: var(--active) !important; } @@ -1640,8 +1835,10 @@ div.cellphone-container { background-color: var(--primary) !important; } -.settings-table tbody td.realm-disabled, .settings-table tbody td.realm-disabled:hover, .settings-table tbody td.area-disabled { - background-color: none !important; +.settings-table tbody td.realm-disabled, +.settings-table tbody td.realm-disabled:hover, +.settings-table tbody td.area-disabled { + background: none !important; } /* Error Page */ @@ -1669,7 +1866,10 @@ table.fc-border-separate .fc-widget-header { border-bottom: var(--border-size) solid var(--contrast-border) !important; } -.fc-agenda-slots td, .fc-agenda-slots th, body .fc-widget-header, .fc-agenda-allday th { +.fc-agenda-slots td, +.fc-agenda-slots th, +body .fc-widget-header, +.fc-agenda-allday th { border-color: var(--contrast-border) !important; } @@ -1695,7 +1895,8 @@ body .fc-widget-header .fc-agenda-divider-inner { border-bottom: var(--border-size) solid var(--border-color) !important; } -.dropbox-viewer-submission-activity, .dropbox-viewer-submission-activity-inner { +.dropbox-viewer-submission-activity, +.dropbox-viewer-submission-activity-inner { background-color: var(--primary) !important; color: var(--text) !important; } @@ -1735,12 +1936,16 @@ table#collection-view-contents tbody tr td { background-color: var(--primary); } -#grading-rubric-edit-grades-slider .bottom, #district-mastery-grading-rubric-edit-grades-slider .bottom, .s-slider .right-column, .rubric-scroll .rubric-table tbody { +#grading-rubric-edit-grades-slider .bottom, +#district-mastery-grading-rubric-edit-grades-slider .bottom, +.s-slider .right-column, +.rubric-scroll .rubric-table tbody { background-color: var(--primary); color: var(--text); } -.view-only .rubric-table .rubric-row-rating span.input-top, .view-only .rubric-table .rubric-row-rating .input-bottom { +.view-only .rubric-table .rubric-row-rating span.input-top, +.view-only .rubric-table .rubric-row-rating .input-bottom { color: var(--text); } @@ -1772,11 +1977,17 @@ table#collection-view-contents tbody tr td { /* New Layout */ -._1wP6w, ._2pDDZ:hover:not(:active), ._3senP:focus:not(:active), .wL3MX:active { +._1wP6w, +._2pDDZ:hover:not(:active), +._3senP:focus:not(:active), +.wL3MX:active { color: var(--text); } -._1IGEH:focus:not(:active), ._1oxpz:hover:not(:active), ._1Z0RM, .Dkh_K:active { +._1IGEH:focus:not(:active), +._1oxpz:hover:not(:active), +._1Z0RM, +.Dkh_K:active { background-color: var(--accent); color: var(--text); } @@ -1798,7 +2009,10 @@ img#loader { /* Assesments */ -._1IGEH:focus:not(:active), ._1oxpz:hover:not(:active), ._1Z0RM, .Dkh_K:active { +._1IGEH:focus:not(:active), +._1oxpz:hover:not(:active), +._1Z0RM, +.Dkh_K:active { background-color: var(--accent) !important; } @@ -1806,7 +2020,10 @@ img#loader { background-color: var(--primary) !important; } -._1wP6w, ._2pDDZ:hover:not(:active), ._3senP:focus:not(:active), .wL3MX:active { +._1wP6w, +._2pDDZ:hover:not(:active), +._3senP:focus:not(:active), +.wL3MX:active { color: var(--text) !important; } @@ -1822,7 +2039,8 @@ img#loader { color: var(--text) !important; } -.lrn_widget .lrn_valid, .lrn_widget .lrn_selected { +.lrn_widget .lrn_valid, +.lrn_widget .lrn_selected { background-color: var(--highlight) !important; } @@ -1833,7 +2051,8 @@ img#loader { color: var(--text) !important; } -#s-assessment-view-submission-form .incorrect span.option-span.legacy-true-false-question, #s-assessment-view-submission-form .incorrect span.option-span.legacy-multiple-choice-question { +#s-assessment-view-submission-form .incorrect span.option-span.legacy-true-false-question, +#s-assessment-view-submission-form .incorrect span.option-span.legacy-multiple-choice-question { background-color: var(--highlight) !important; color: var(--text) !important; } @@ -1853,16 +2072,21 @@ img#loader { color: var(--text) !important; } -.lrn .pagination>li>a, .lrn .pagination>li>span { +.lrn .pagination>li>a, +.lrn .pagination>li>span { background-color: var(--border-color) !important; } -.lrn .pagination>li>a, .lrn .pagination>li>span { +.lrn .pagination>li>a, +.lrn .pagination>li>span { background-color: var(--border-color); - color: var(--text)!important; + color: var(--text) !important; } -.lrn.lrn-assess .lrn-horizontal-toc .pagination .lrn-assess-btn:focus, .lrn.lrn-assess .lrn-horizontal-toc .pagination .lrn-assess-btn:hover, .lrn.lrn-assess .lrn-horizontal-toc .lrn-assess-pagination .lrn-assess-btn:focus, .lrn.lrn-assess .lrn-horizontal-toc .lrn-assess-pagination .lrn-assess-btn:hover { +.lrn.lrn-assess .lrn-horizontal-toc .pagination .lrn-assess-btn:focus, +.lrn.lrn-assess .lrn-horizontal-toc .pagination .lrn-assess-btn:hover, +.lrn.lrn-assess .lrn-horizontal-toc .lrn-assess-pagination .lrn-assess-btn:focus, +.lrn.lrn-assess .lrn-horizontal-toc .lrn-assess-pagination .lrn-assess-btn:hover { background: var(--border-color) !important; color: var(--accent) !important; } @@ -1894,7 +2118,9 @@ img#loader { background-color: var(--border-color); } -.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_active, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button.lrn_active, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue.lrn_active { +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_active, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button.lrn_active, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue.lrn_active { border: var(--border-size) solid var(--text) !important; border: var(--border-size) solid var(--contrast-border) !important; background: var(--border-color) !important; @@ -1927,7 +2153,9 @@ img#loader { background-color: var(--primary) !important; } */ -.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue { +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue { background-color: var(--accent) !important; border: none !important; } @@ -1936,12 +2164,18 @@ img#loader { background-image: none !important; } -.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn:before, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn .btn-label, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button:before, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button .btn-label, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue:before, .lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue .btn-label { +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn:before, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn .btn-label, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button:before, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_widget.lrn_feature>button .btn-label, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue:before, +.lrn.lrn-assess .lrn-right-region .right-wrapper .lrn_btn.lrn_btn_blue .btn-label { color: var(--text) !important; /* Menu Icons Color */ } -.lrn.lrn-assess .lrn-region:not(.lrn-items-region) .lrn_btn, .lrn.lrn-assess .dialogs .lrn_btn { +.lrn.lrn-assess .lrn-region:not(.lrn-items-region) .lrn_btn, +.lrn.lrn-assess .dialogs .lrn_btn { color: var(--text) !important; } @@ -1992,7 +2226,8 @@ img#loader { /* Timeout Alert */ } -.lrn.lrn-assess .lrn-region:not(.lrn-items-region) .lrn_btn, .lrn.lrn-assess .dialogs .lrn_btn { +.lrn.lrn-assess .lrn-region:not(.lrn-items-region) .lrn_btn, +.lrn.lrn-assess .dialogs .lrn_btn { background-color: var(--accent) !important; } @@ -2012,16 +2247,19 @@ img#loader { color: var(--text) !important } -.lrn .lrn_possibilityList, .lrn .lrn_possibilityListContainer { +.lrn .lrn_possibilityList, +.lrn .lrn_possibilityListContainer { /* Drag Blank */ background-color: var(--accent) !important; } -.lrn .lrn_possibilityList, .lrn .lrn_possibilityListContainer { +.lrn .lrn_possibilityList, +.lrn .lrn_possibilityListContainer { border-top: none !important; } -.lrn .lrn_possibilityList.lrn_list_bottom:before, .lrn .lrn_possibilityListContainer.lrn_list_bottom:before { +.lrn .lrn_possibilityList.lrn_list_bottom:before, +.lrn .lrn_possibilityListContainer.lrn_list_bottom:before { border-bottom: 12px solid var(--muted-text) !important; /* Just trust me, it's needed for contrast */ } @@ -2036,7 +2274,8 @@ img#loader { } .lrn-annotations-c-modal--notepad { - background: var(--accent) !important/* Notepad Tool */ + background: var(--accent) !important + /* Notepad Tool */ } .lrn .lrn-mask rect { @@ -2049,7 +2288,8 @@ img#loader { /* Calculator tool */ } -.lrn_feature.lrn_calculator .lrn_calc_content .lrn_calc .lrn_calc_btn_opt, .lrn_feature.lrn_calculator .lrn_calc_content .lrn_calc .lrn_calc_btn_opt:disabled:hover { +.lrn_feature.lrn_calculator .lrn_calc_content .lrn_calc .lrn_calc_btn_opt, +.lrn_feature.lrn_calculator .lrn_calc_content .lrn_calc .lrn_calc_btn_opt:disabled:hover { background-color: var(--accent) !important; color: var(--text) !important; } @@ -2143,7 +2383,9 @@ img#loader { border: none !important; } -.lrn_widget.lrn_chemistryessayV2 .lrn_texteditor_editable.wysihtml-placeholder, .lrn_widget.lrn_formulaessayV2 .lrn_texteditor_editable.wysihtml-placeholder, .lrn_widget.lrn_longtextV2 .lrn_texteditor_editable.wysihtml-placeholder { +.lrn_widget.lrn_chemistryessayV2 .lrn_texteditor_editable.wysihtml-placeholder, +.lrn_widget.lrn_formulaessayV2 .lrn_texteditor_editable.wysihtml-placeholder, +.lrn_widget.lrn_longtextV2 .lrn_texteditor_editable.wysihtml-placeholder { color: var(--text) !important; background: var(--accent) !important; border: none !important; @@ -2231,7 +2473,8 @@ img#loader { /* Assesment Rubric */ -#grading-rubric-edit-slider .controls, #district-mastery-grading-rubric-edit-slider .controls { +#grading-rubric-edit-slider .controls, +#district-mastery-grading-rubric-edit-slider .controls { /* Left side Menu*/ background: var(--accent) !important; color: var(--text) !important; @@ -2243,19 +2486,24 @@ img#loader { /* rubric Background color */ } -#grading-rubric-edit-slider .rubric-table .input-top, .rubric-table span.input-bottom, #district-mastery-grading-rubric-edit-slider .rubric-table .input-top, .rubric-table span.input-bottom { +#grading-rubric-edit-slider .rubric-table .input-top, +.rubric-table span.input-bottom, +#district-mastery-grading-rubric-edit-slider .rubric-table .input-top, +.rubric-table span.input-bottom { color: var(--contrast-text) !important; /* Top part of each row */ } -#grading-rubric-edit-slider .rubric-table tr.header-row, #district-mastery-grading-rubric-edit-slider .rubric-table tr.header-row { +#grading-rubric-edit-slider .rubric-table tr.header-row, +#district-mastery-grading-rubric-edit-slider .rubric-table tr.header-row { border-top: var(--border-size) solid var(--border-color) !important; /* Border for header */ border-bottom: var(--border-size) solid var(--border-color) !important; border: none !important; } -#grading-rubric-edit-slider .rubric-table .header-row th, #district-mastery-grading-rubric-edit-slider .rubric-table .header-row th { +#grading-rubric-edit-slider .rubric-table .header-row th, +#district-mastery-grading-rubric-edit-slider .rubric-table .header-row th { background-color: var(--accent) !important; /* Header Color */ } @@ -2264,7 +2512,8 @@ img#loader { background: var(---accent) !important; } -#grading-rubric-edit-slider .bottom-ctrls-wrapper, #district-mastery-grading-rubric-edit-slider .bottom-ctrls-wrapper { +#grading-rubric-edit-slider .bottom-ctrls-wrapper, +#district-mastery-grading-rubric-edit-slider .bottom-ctrls-wrapper { background: var(--accent) !important; border: none !important; color: var(--text) !important; @@ -2276,7 +2525,8 @@ img#loader { /* Assesment Review*/ -.lrn_widget .lrn_valid, .lrn_widget .lrn_selected { +.lrn_widget .lrn_valid, +.lrn_widget .lrn_selected { background-color: var(--input) !important; } From 987f05897cebaabfb1648c3a0c66fc9f450516f3 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 15:02:08 -0700 Subject: [PATCH 04/30] removed domain change alert --- js/all.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/all.js b/js/all.js index 03f8dedd..0bf05e06 100644 --- a/js/all.js +++ b/js/all.js @@ -113,12 +113,12 @@ let themes = s.themes.filter(x => x.name !== `Auto Generated Theme for ${window.location.host}`); themes.push(t); chrome.storage.sync.set({ themes: themes }, () => { - alert(`Schoology Plus has updated the domain on which it runs. Click OK to reload the page.\nPrevious: ${dd}\nNew: ${window.location.host}`); + Logger.log(`Schoology Plus has updated the domain on which it runs.\nPrevious: ${dd}\nNew: ${window.location.host}`); location.reload(); }); }); } else { - alert(`Schoology Plus has updated the domain on which it runs. Click OK to reload the page.\nPrevious: ${dd}\nNew: ${window.location.host}`); + Logger.log(`Schoology Plus has updated the domain on which it runs.\nPrevious: ${dd}\nNew: ${window.location.host}`); location.reload(); } } From 90d76d699ce9caa224f338180265edcb459e1777 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 15:17:24 -0700 Subject: [PATCH 05/30] added homepage to manifest --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index f314e0f8..d1754f60 100644 --- a/manifest.json +++ b/manifest.json @@ -3,6 +3,7 @@ "name": "Schoology Plus", "short_name": "Schoology+", "description": "Schoology Plus enhances your Schoology experience with numerous interface improvements", + "homepage_url": "https://schoologypl.us?utm_source=ext-homepage-link", "applications": { "gecko": { "id": "schoology.plus@aopell.me" From 48745823b3cafe41ddecb77c7617cd247f5ba058 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 15:39:36 -0700 Subject: [PATCH 06/30] Fix first install --- js/version-specific.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/version-specific.js b/js/version-specific.js index 233a8c40..f5c1c995 100644 --- a/js/version-specific.js +++ b/js/version-specific.js @@ -120,6 +120,7 @@ function createBroadcast(id, title, message, timestamp = Date.now()) { function deleteBroadcasts(...ids) { for (let id of ids) { let unreadBroadcasts = Setting.getValue("unreadBroadcasts"); + if(!unreadBroadcasts) continue; unreadBroadcasts.splice(unreadBroadcasts.findIndex(x => x.id == id), 1); Setting.setValue("unreadBroadcasts", unreadBroadcasts); @@ -241,7 +242,7 @@ let migrationsTo = { ]); }, "6.6.4": function (currentVersion, previousVersion) { - if (currentVersion === "6.6.4") { + if (previousVersion && currentVersion === "6.6.4") { saveBroadcasts([ createBroadcast( 660, From 010c9ef6b20973fc7ee8f49767fe09bcbbfa57b1 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 16:34:17 -0700 Subject: [PATCH 07/30] Added modern color model to theme model --- css/modern.css | 14 ++--- js/theme-model.js | 152 +++++++++++++++++++++++++++++++++++++++++++++- themes/README.md | 34 +++++++++++ 3 files changed, 191 insertions(+), 9 deletions(-) diff --git a/css/modern.css b/css/modern.css index 80ffa16b..9fba32bd 100644 --- a/css/modern.css +++ b/css/modern.css @@ -172,8 +172,8 @@ pre { display: inline-block !important; color: var(--text) !important; background-color: var(--secondary) !important; - padding: 10px !important; - margin-top: 10px !important; + padding: var(--padding) !important; + margin-top: var(--padding) !important; border-radius: var(--border-radius) !important; } @@ -1258,8 +1258,8 @@ body.library-view #library-left { background-color: var(--accent) !important; border: var(--border-size) solid var(--contrast-border) !important; border-right: none !important; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; + border-top-left-radius: var(--border-radius) !important; + border-bottom-left-radius: var(--border-radius) !important; } th.profile-header { @@ -1413,8 +1413,8 @@ table.privatemsg-list td.no-messages { #attachment-selector { background: var(--secondary) !important; border: none !important; - border-bottom-left-radius: 5px !important; - border-bottom-right-radius: 5px !important; + border-bottom-left-radius: var(--border-radius) !important; + border-bottom-right-radius: var(--border-radius) !important; } #attachment-selector li { @@ -2674,7 +2674,7 @@ img#loader { .s_comments_level { background: var(--primary) !important; border-radius: var(--border-radius) !important; - padding: 10px !important; + padding: var(--padding) !important; } .discussion-card>.s_comments_level { diff --git a/js/theme-model.js b/js/theme-model.js index f2ff8823..77e2a4ba 100644 --- a/js/theme-model.js +++ b/js/theme-model.js @@ -100,17 +100,165 @@ class RainbowColorDefinition { } } +class ModernInterfaceColorDefinition { + /** + * Defines individual colors for different Schoology interface components + * @param {string} primary Primary interface color -- should be the lightest of the main colors + * @param {string} accent Accent interface color -- should be darker than primary, but lighter than secondary + * @param {string} secondary Secondary interface color -- should be the darkest of the main colors + * @param {string} input Color for textboxes and other input fields + * @param {string} border Color for element borders + * @param {string} highlight Color for highlights, warnings, and wrong answers + * @param {string} active Color for active elements, selected items, and correct answers + * @param {string} grades Color for grades and scores + * @param {string} error Color for error messages and icons + */ + constructor(primary, accent, secondary, input, border, highlight, active, grades, error) { + this.primary = primary; + this.accent = accent; + this.secondary = secondary; + this.input = input; + this.border = border; + this.highlight = highlight; + this.active = active; + this.grades = grades; + this.error = error; + } + + /** + * Creates and returns a `ModernInterfaceColorDefinition` given a valid JSON object + * @param {*} o JSON representation of a `ModernInterfaceColorDefinition` + * @returns {ModernInterfaceColorDefinition} + */ + static loadFromObject(o) { + return o + ? new ModernInterfaceColorDefinition( + o.primary, + o.accent, + o.secondary, + o.input, + o.border, + o.highlight, + o.active, + o.grades, + o.error + ) + : undefined; + } +} + +class ModernTextColorDefinition { + /** + * Defines colors for textual elements of the Schoology interface + * @param {string} primary Main text color, should contrast with `interface.primary` + * @param {string} muted Muted text color, should stand out less than primary + * @param {string} contrast Contrast text color, should contrast with primary text color + * @param {string} link Color for links and other interactive text + */ + constructor(primary, muted, contrast, link) { + this.primary = primary; + this.muted = muted; + this.contrast = contrast; + this.link = link; + } + + /** + * Creates and returns a `ModernTextColorDefinition` given a valid JSON object + * @param {*} o JSON representation of a `ModernTextColorDefinition` + * @returns {ModernTextColorDefinition} + */ + static loadFromObject(o) { + return o + ? new ModernTextColorDefinition( + o.primary, + o.muted, + o.contrast, + o.link + ) + : undefined; + } +} + +class ModernOptionsDefinition { + /** + * Configures style options for the modern theme engine + * @param {number} borderRadius The size of border radius rounded corners (in pixels) + * @param {number} borderSize The width of borders (in pixels) + * @param {number} padding The amount of padding for certain elements (in pixels) + */ + constructor(borderRadius, borderSize, padding) { + this.borderRadius = borderRadius; + this.borderSize = borderSize; + this.padding = padding; + } + + /** + * Creates and returns a `ModernOptionsDefinition` given a valid JSON object + * @param {*} o JSON representation of a `ModernOptionsDefinition` + * @returns {ModernOptionsDefinition} + */ + static loadFromObject(o) { + return o + ? new ModernOptionsDefinition( + o.borderRadius, + o.borderSize, + o.padding + ) + : undefined; + } +} + +class ModernColorDefinition { + /** + * Utilizes the modern theme engine to control significantly more of the interface's colors. + * @param {boolean} dark Whether the theme is dark or light + * @param {CustomColorDefinition} navbar Colors for the navigation bar + * @param {ModernInterfaceColorDefinition} interface Colors for main interface components + * @param {string[]} calendar Colors for Schoology calendar events (specify exactly 20) + * @param {ModernTextColorDefinition} text Colors for text elements + * @param {ModernOptionsDefinition} options Style options for the interface + */ + constructor(dark, navbar, interface, calendar, text, options) { + this.dark = dark; + this.navbar = navbar; + this.interface = interface; + this.calendar = calendar; + this.text = text; + this.options = options; + } + + /** + * Creates and returns a `ModernColorDefinition` given a valid JSON object + * @param {*} o JSON representation of a `ModernColorDefinition` + * @returns {ModernColorDefinition} + */ + static loadFromObject(o) { + return o + ? new ModernColorDefinition( + o.dark, + CustomColorDefinition.loadFromObject(o.navbar), + ModernInterfaceColorDefinition.loadFromObject(o.interface), + o.calendar, + ModernTextColorDefinition.loadFromObject(o.text), + ModernOptionsDefinition.loadFromObject(o.options) + ) + : undefined; + } +} + class ThemeColor { /** * Describes the colors to use for the Schoology interface * @param {number} hue The theme's HSL color hue, used to color the interface by modifying the saturation and lightness values * @param {CustomColorDefinition} custom Allows fine control over individual colors in the interface * @param {RainbowColorDefinition} rainbow Allows for animations of hue, saturation, and lightness of interface colors + * @param {ModernColorDefinition} modern Utilizes the modern theme engine to control significantly more of the interface's colors */ - constructor(hue, custom, rainbow) { + constructor(hue, custom, rainbow, modern) { this.hue = hue; this.custom = custom; this.rainbow = rainbow; + this.modern = modern; } /** @@ -119,7 +267,7 @@ class ThemeColor { * @returns {ThemeColor} */ static loadFromObject(o) { - return o ? new ThemeColor(o.hue, CustomColorDefinition.loadFromObject(o.custom), RainbowColorDefinition.loadFromObject(o.rainbow)) : new ThemeColor(210); + return o ? new ThemeColor(o.hue, CustomColorDefinition.loadFromObject(o.custom), RainbowColorDefinition.loadFromObject(o.rainbow), ModernColorDefinition.loadFromObject(o.modern)) : new ThemeColor(210); } } diff --git a/themes/README.md b/themes/README.md index efa7d3a0..3197d3ba 100644 --- a/themes/README.md +++ b/themes/README.md @@ -43,6 +43,40 @@ A Schoology Plus theme has the following format and components (each component w "lightness": { "value": 50 } + }, + "modern": { + "dark": true, + "navbar": { + "primary": "red", + "hover": "rgb(0,0,255)", + "background": "hsl(150,50%,50%)", + "border": "#000000" + }, + "interface": { + "primary": "", + "accent": "", + "secondary": "", + "input": "", + "border": "", + "highlight": "", + "active": "", + "grades": "", + "error": "" + }, + "calendar": [ + // Array of 20 calendar colors + ], + "text": { + "primary": "", + "muted": "", + "contrast": "", + "link": "" + }, + "options": { + "borderRadius": 5, + "borderSize": 1, + "padding": 10, + } } }, "logo": { From 5303b94df45f1442fb6945d744c685ef75156f04 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 16:42:32 -0700 Subject: [PATCH 08/30] Revised modern color model to remove navbar theming --- js/theme-model.js | 5 +---- themes/README.md | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/js/theme-model.js b/js/theme-model.js index 77e2a4ba..ca56131f 100644 --- a/js/theme-model.js +++ b/js/theme-model.js @@ -212,15 +212,13 @@ class ModernColorDefinition { /** * Utilizes the modern theme engine to control significantly more of the interface's colors. * @param {boolean} dark Whether the theme is dark or light - * @param {CustomColorDefinition} navbar Colors for the navigation bar * @param {ModernInterfaceColorDefinition} interface Colors for main interface components * @param {string[]} calendar Colors for Schoology calendar events (specify exactly 20) * @param {ModernTextColorDefinition} text Colors for text elements * @param {ModernOptionsDefinition} options Style options for the interface */ - constructor(dark, navbar, interface, calendar, text, options) { + constructor(dark, interface, calendar, text, options) { this.dark = dark; - this.navbar = navbar; this.interface = interface; this.calendar = calendar; this.text = text; @@ -236,7 +234,6 @@ class ModernColorDefinition { return o ? new ModernColorDefinition( o.dark, - CustomColorDefinition.loadFromObject(o.navbar), ModernInterfaceColorDefinition.loadFromObject(o.interface), o.calendar, ModernTextColorDefinition.loadFromObject(o.text), diff --git a/themes/README.md b/themes/README.md index 3197d3ba..e6ce9544 100644 --- a/themes/README.md +++ b/themes/README.md @@ -46,12 +46,6 @@ A Schoology Plus theme has the following format and components (each component w }, "modern": { "dark": true, - "navbar": { - "primary": "red", - "hover": "rgb(0,0,255)", - "background": "hsl(150,50%,50%)", - "border": "#000000" - }, "interface": { "primary": "", "accent": "", From 54e6ccccb4a4818a20e49cfcf5e910c1b4e92a8b Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 21:27:12 -0700 Subject: [PATCH 09/30] Fix typo --- js/course.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/course.js b/js/course.js index 99724536..bd847f46 100644 --- a/js/course.js +++ b/js/course.js @@ -25,7 +25,7 @@ modals.push(new Modal("course-settings-modal", "Course Options", createElement(" createElement("label", ["centered-label"], { textContent: "Nickname: ", htmlFor: "setting-input-course-alias" }), createElement("input", [], { type: "text", id: "setting-input-course-alias" }, []) ]), - createElement("p", ["setting-description"], { textContent: "A frendlier name for a course that shows anywhere the full name for the course would normally" }) + createElement("p", ["setting-description"], { textContent: "A friendlier name for a course that shows anywhere the full name for the course would normally" }) ]), createElement("div", ["setting-entry"], {}, [ createElement("h2", [], { textContent: "Grading Scale" }), From 356f818b82694255af86298825e00765f8dc4173 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 21:38:25 -0700 Subject: [PATCH 10/30] Override user styles option --- css/modern.css | 2 +- js/theme-model.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/css/modern.css b/css/modern.css index 9fba32bd..df577d1e 100644 --- a/css/modern.css +++ b/css/modern.css @@ -186,7 +186,7 @@ input[type=text] { border-radius: var(--border-radius) !important; } -/* All user-styled elements -- should be for dark only */ +/* All user-styled elements -- should be for override user styles only */ .s-edge-feed .edge-item *[style], .discussion-view .discussion-prompt *[style], .discussion-view .comment-body-wrapper *[style], diff --git a/js/theme-model.js b/js/theme-model.js index ca56131f..2124cd50 100644 --- a/js/theme-model.js +++ b/js/theme-model.js @@ -185,11 +185,13 @@ class ModernOptionsDefinition { * @param {number} borderRadius The size of border radius rounded corners (in pixels) * @param {number} borderSize The width of borders (in pixels) * @param {number} padding The amount of padding for certain elements (in pixels) + * @param {boolean} overrideUserStyles Whether to override user-styled elements (like homefeed posts) */ - constructor(borderRadius, borderSize, padding) { + constructor(borderRadius, borderSize, padding, overrideUserStyles) { this.borderRadius = borderRadius; this.borderSize = borderSize; this.padding = padding; + this.overrideUserStyles = overrideUserStyles; } /** From 17237ff61d501e9945460a764a8102178a84e063 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 21:49:19 -0700 Subject: [PATCH 11/30] Don't run scripts on register page --- manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.json b/manifest.json index d1754f60..ab998a98 100644 --- a/manifest.json +++ b/manifest.json @@ -62,6 +62,7 @@ ], "exclude_matches": [ "https://*.schoology.com/login*", + "https://*.schoology.com/register*", "*://asset-cdn.schoology.com/*", "*://developer.schoology.com/*", "*://support.schoology.com/*", @@ -94,6 +95,7 @@ "https://*.schoology.com/*" ], "exclude_matches": [ + "https://*.schoology.com/register*", "https://*.schoology.com/login*" ], "css": [ @@ -243,6 +245,7 @@ "https://*.schoology.com/*" ], "exclude_matches": [ + "https://*.schoology.com/register*", "https://*.schoology.com/login*" ], "js": [ From 2defb23076fb06254129287f7a1bd27dc9a7e768 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 22:05:41 -0700 Subject: [PATCH 12/30] Fixes multiple DARK bugs --- css/modern.css | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/css/modern.css b/css/modern.css index df577d1e..21d6f060 100644 --- a/css/modern.css +++ b/css/modern.css @@ -722,6 +722,10 @@ div.les2- ._2wOCj { background-color: var(--active) !important; } +.util-focus-background-color-cloud-grey-3x07X:focus { + background-color: var(--active) !important; +} + ._33zXx { background-color: var(--active) !important; } @@ -1295,6 +1299,10 @@ th.profile-header { border-radius: var(--border-radius) !important; } +.navigator-buttons a.navbtn.link-btn { + color: var(--text) !important; +} + .has-folder-player #center-top .content-top-upper, .has-materials-player #center-top .content-top-upper { background-color: var(--secondary) !important; @@ -1764,13 +1772,15 @@ ul.primary, background-color: var(--secondary) !important; } -ul.primary li a { +ul.primary li a, +ul.primary li .link-wrapper a { background: unset !important; background-color: var(--secondary) !important; color: var(--text) !important; } ul.primary li.active a, +ul.primary li.active .link-wrapper a, .email-notify, fieldset { background-color: var(--accent) !important; @@ -1841,6 +1851,10 @@ div.cellphone-container { background: none !important; } +.terms-msg { + color: var(--text) !important; +} + /* Error Page */ #error-page { From 1fa96e6a07e3a3ffae2fc811b1416daab42043a9 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Thu, 22 Oct 2020 22:21:59 -0700 Subject: [PATCH 13/30] Fix readonly upcoming assignments --- css/modern.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/modern.css b/css/modern.css index 21d6f060..5f8e26c7 100644 --- a/css/modern.css +++ b/css/modern.css @@ -1354,6 +1354,7 @@ body .action-links a:hover { .pre-fill, .upcoming-list .empty, +.readonly-title, .no-attendance-status-dates { color: var(--muted-text) !important; } From b1cc58d45d55572f8c04c00228e28c39c3548ca4 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Fri, 23 Oct 2020 19:38:11 -0700 Subject: [PATCH 14/30] Google docs submission modals --- css/modern.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/css/modern.css b/css/modern.css index 5f8e26c7..dd2e768f 100644 --- a/css/modern.css +++ b/css/modern.css @@ -2022,6 +2022,18 @@ img#loader { background-color: var(--accent) !important; } +/* Google Docs */ +.modal-modal-1369068783, +.layout-row-inner-3835588998 { + background: var(--accent) !important; +} + +.typography-button-secondary-button-3933442342 { + background: var(--primary) !important; + color: var(--text) !important; + border-color: var(--contrast-border) !important; +} + /* Assesments */ ._1IGEH:focus:not(:active), From 301879a0468afb145c23ce634fb40fcf51c86430 Mon Sep 17 00:00:00 2001 From: Aaron Opell Date: Sun, 25 Oct 2020 17:53:43 -0700 Subject: [PATCH 15/30] Checkmarks on course dashboard; no checks for google drive --- js/all.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++- js/dashboard.js | 1 + js/home.js | 52 +------------------------------------------------ 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/js/all.js b/js/all.js index 0bf05e06..33869bd7 100644 --- a/js/all.js +++ b/js/all.js @@ -1011,4 +1011,53 @@ async function createQuickAccess() { } } -Logger.log("Finished loading all.js"); \ No newline at end of file +function indicateSubmittedAssignments() { + let upcomingList = document.querySelector(".upcoming-events .upcoming-list"); + // Indicate submitted assignments in Upcoming + async function indicateSubmitted() { + Logger.log("Checking to see if upcoming assignments are submitted"); + upcomingList = document.querySelector(".upcoming-events .upcoming-list"); + switch (Setting.getValue("indicateSubmission")) { + case "strikethrough": + upcomingList.classList.add("splus-mark-completed-strikethrough"); + break; + case "hide": + upcomingList.classList.add("splus-mark-completed-hide"); + break; + case "disabled": + break; + case "check": + default: + upcomingList.classList.add("splus-mark-completed-check"); + break; + } + + let upcomingEventElements = upcomingList.querySelectorAll(".upcoming-event"); + + for (let eventElement of upcomingEventElements) { + let assignmentElement = eventElement.querySelector(".infotip a[href]"); + let assignmentId = assignmentElement.href.match(/\/\d+/); + try { + let revisionData = await fetchApiJson(`dropbox${assignmentId}/${getUserId()}`); + let revisions = revisionData.revision; + + if (revisions && revisions.length && !revisions[revisions.length - 1].draft) { + Logger.log(`Marking submitted assignment ${assignmentId} as complete ✔`); + eventElement.classList.add("splus-assignment-complete"); + } else { + Logger.log(`Assignment ${assignmentId} is not submitted`); + } + } + catch (err) { + Logger.error(`Failed checking assignment ${assignmentId}: `, err); + } + } + } + + let reloadButton = upcomingList.querySelector("button.button-reset.refresh-button"); + if (reloadButton) { + reloadButton.addEventListener("click", () => setTimeout(indicateSubmitted, 2000)); + } + + setTimeout(indicateSubmitted, 3000); +} \ No newline at end of file diff --git a/js/dashboard.js b/js/dashboard.js index 977f23e5..6a8e5a0b 100644 --- a/js/dashboard.js +++ b/js/dashboard.js @@ -1 +1,2 @@ +indicateSubmittedAssignments(); createQuickAccess(); \ No newline at end of file diff --git a/js/home.js b/js/home.js index 4a594236..72a607a6 100644 --- a/js/home.js +++ b/js/home.js @@ -101,55 +101,5 @@ if (Setting.getValue("broadcasts") !== "disabled") { })(); } -(function () { - let upcomingList = document.querySelector(".upcoming-events .upcoming-list"); - // Indicate submitted assignments in Upcoming - async function indicateSubmitted() { - Logger.log("Checking to see if upcoming assignments are submitted"); - upcomingList = document.querySelector(".upcoming-events .upcoming-list"); - switch (Setting.getValue("indicateSubmission")) { - case "strikethrough": - upcomingList.classList.add("splus-mark-completed-strikethrough"); - break; - case "hide": - upcomingList.classList.add("splus-mark-completed-hide"); - break; - case "disabled": - break; - case "check": - default: - upcomingList.classList.add("splus-mark-completed-check"); - break; - } - - let upcomingEventElements = upcomingList.querySelectorAll(".upcoming-event"); - - for (let eventElement of upcomingEventElements) { - let assignmentElement = eventElement.querySelector(".infotip a[href]"); - let assignmentId = assignmentElement.href.match(/\/\d+/); - try { - let revisionData = await fetchApiJson(`dropbox${assignmentId}/${getUserId()}`); - let revisions = revisionData.revision; - - if (revisions && revisions.length) { - Logger.log(`Marking submitted assignment ${assignmentId} as complete ✔`); - eventElement.classList.add("splus-assignment-complete"); - } else { - Logger.log(`Assignment ${assignmentId} is not submitted`); - } - } - catch (err) { - Logger.error(`Failed checking assignment ${assignmentId}: `, err); - } - } - } - - let reloadButton = upcomingList.querySelector("button.button-reset.refresh-button"); - if (reloadButton) { - reloadButton.addEventListener("click", () => setTimeout(indicateSubmitted, 2000)); - } - - setTimeout(indicateSubmitted, 3000); -})(); - +indicateSubmittedAssignments(); createQuickAccess(); \ No newline at end of file From f4001149fb1d34e57f20dd35fe939afd49440603 Mon Sep 17 00:00:00 2001 From: Glen Husman Date: Fri, 6 Nov 2020 15:09:28 -0800 Subject: [PATCH 16/30] Fix typo in checkmarks-for-submitted announcement --- js/version-specific.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/version-specific.js b/js/version-specific.js index f5c1c995..e4768123 100644 --- a/js/version-specific.js +++ b/js/version-specific.js @@ -249,7 +249,7 @@ let migrationsTo = { "Checkmarks for submitted assignments!", `
- Schoology Plus now shows checkmarks for submitted assingments in the Upcoming box! + Schoology Plus now shows checkmarks for submitted assignments in the Upcoming box!

By default, green check marks ✔ are shown on all assignments you've submitted. There are also options for putting a strikethrough From ba4f39400e80ff54228204baabc25a1c210b8efe Mon Sep 17 00:00:00 2001 From: Glen Husman Date: Fri, 6 Nov 2020 15:10:07 -0800 Subject: [PATCH 17/30] Initial work on styling a separate-element completion indication checkmark --- css/all.css | 31 ++++++++++++++++++++++++++++--- js/all.js | 2 ++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/css/all.css b/css/all.css index 3bbd9c2a..f39a9db2 100644 --- a/css/all.css +++ b/css/all.css @@ -720,13 +720,38 @@ a._3_bfp { display: block !important; } -.splus-mark-completed-check .splus-assignment-complete .infotip a[href]::after { - content: "✔" !important; - float: right !important; +.splus-mark-completed-check .infotip { + width: 90% !important; +} + +.splus-mark-completed-check .splus-completed-check-indicator { + max-width: 10%; + font-size: 250% !important; + display: inline-block; +} + +.splus-mark-completed-check .splus-assignment-complete .splus-completed-check-indicator { color: green !important; +} + +.splus-mark-completed-check .splus-assignment-notcomplete .splus-completed-check-indicator { + -moz-text-fill-color: transparent; + -webkit-text-fill-color: transparent; + -moz-text-stroke-color: var(--muted-text); + -webkit-text-stroke-color: var(--muted-text); + -moz-text-stroke-width: 1px; + -webkit-text-stroke-width: 1px; +} + +/* +.splus-mark-completed-check .splus-assignment-notcomplete .infotip a[href]::after { + content: "▢" !important; + float: right !important; + color: var(--muted-text) !important; font-size: 150% !important; display: block !important; } +*/ .splus-mark-completed-strikethrough .splus-assignment-complete .infotip a[href] { text-decoration: line-through !important; diff --git a/js/all.js b/js/all.js index 33869bd7..95706b68 100644 --- a/js/all.js +++ b/js/all.js @@ -1041,10 +1041,12 @@ function indicateSubmittedAssignments() { let revisionData = await fetchApiJson(`dropbox${assignmentId}/${getUserId()}`); let revisions = revisionData.revision; + // add a CSS class for both states, so we can distinguish 'loading' from known-(in)complete if (revisions && revisions.length && !revisions[revisions.length - 1].draft) { Logger.log(`Marking submitted assignment ${assignmentId} as complete ✔`); eventElement.classList.add("splus-assignment-complete"); } else { + eventElement.classList.add("splus-assignment-notcomplete"); Logger.log(`Assignment ${assignmentId} is not submitted`); } } From 2d1f35ebbb13db47571126c7615480c2aba56aa6 Mon Sep 17 00:00:00 2001 From: Glen Husman Date: Fri, 6 Nov 2020 17:18:16 -0800 Subject: [PATCH 18/30] Further work on styling the checkboxes --- css/all.css | 26 +++++++++++++++----------- js/all.js | 13 ++++++++++++- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/css/all.css b/css/all.css index f39a9db2..fde48b50 100644 --- a/css/all.css +++ b/css/all.css @@ -724,10 +724,24 @@ a._3_bfp { width: 90% !important; } +/* .splus-completed-check-indicator is a span containing