Skip to content

Commit

Permalink
Merge pull request #185 from aopell/develop
Browse files Browse the repository at this point in the history
Version 6.2.2
  • Loading branch information
aopell authored May 28, 2020
2 parents 0fa2b0a + 6b79af6 commit 013fd27
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 19 deletions.
34 changes: 31 additions & 3 deletions css/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,11 @@ video.easter-egg {
.splus-modal-header {
padding: 2px 16px;
background-color: var(--primary-color);
color: white;
color: white !important;
}

.splus-modal-title {
color: white !important;
}

.splus-modal-body {
Expand Down Expand Up @@ -504,14 +508,37 @@ body #content-left-top .item-list li a,
body .popups-tab,
body .enrollment-filters span,
body .grading-groups-list .grading-group,
body #grading-group-
span.ajax-post-comment,
body #grading-group- span.ajax-post-comment,
span[role=button],
.period-row .title,
.category-row .title,
._2mWUT a {
color: var(--hover-color) !important;
}

body #nav ul li a:hover,
body #nav #primary-home a:hover,
body #nav #profile a:hover,
body .primary-activities .clickable:hover,
body .primary-activities .active,
body #nav ul li.active-trail a,
body .ac_results ul .ac_over .ac-top,
body .schoology:hover,
body .ac_over .schoology,
body .action-links a:hover,
body .action-links span:hover,
body .edit-profile-picture-hover:hover,
body .edit-profile-picture-hover.active,
body #sidebar-left .action-links a:hover,
.component-add-link:hover,
body .search-toggle:hover,
#edit-course-switcher-select-nid-menu .ui-selectmenu-group li a:hover,
body #primary-settings .unfold:hover,
#nav ul li a:hover {
background-color: var(--hover-color) !important;
color: white !important;
}

body a.link-btn {
color: #333333 !important;
}
Expand All @@ -521,6 +548,7 @@ header li a,
.splus-modal-footer-text a,
body a.link-btn.active,
div.courses-left-menu,
.portfolio-list a.btn,
a._3_bfp {
color: white !important;
}
4 changes: 2 additions & 2 deletions js/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

// Check Schoology domain
{
const BLACKLISTED_DOMAINS = ["asset-cdn.schoology.com", "ui.schoology.com", "www.schoology.com", "api.schoology.com", "developers.schoology.com", "schoology.com"];
const BLACKLISTED_DOMAINS = ["asset-cdn.schoology.com", "ui.schoology.com", "www.schoology.com", "api.schoology.com", "developers.schoology.com", "schoology.com", "support.schoology.com"];
let dd = Setting.getValue("defaultDomain");

if (dd !== window.location.host && !BLACKLISTED_DOMAINS.includes(window.location.host)) {
if (dd !== window.location.host && !BLACKLISTED_DOMAINS.includes(window.location.host) && !dd.match(/.*\.app\.schoology\.com/)) {
Setting.setValue("defaultDomain", window.location.host);

let bgColor = document.querySelector("#header header").style.backgroundColor;
Expand Down
28 changes: 15 additions & 13 deletions js/icons.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"id": "[email protected]"
}
},
"version": "6.2.1",
"version": "6.2.2",
"icons": {
"128": "imgs/[email protected]",
"64": "imgs/[email protected]",
Expand Down

0 comments on commit 013fd27

Please sign in to comment.