Skip to content

Commit

Permalink
Merge pull request #289 from aopell/develop
Browse files Browse the repository at this point in the history 
Version 7.5
  • Loading branch information
@aopell
aopell authored Oct 22, 2022
2 parents 9d85c5e + e4cb837 commit 6c9c42d
Show file tree
Hide file tree
Showing 10 changed files with 632 additions and 70 deletions.
175 changes: 168 additions & 7 deletions css/modern/all.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ variable-intellisense {
--cal18: #00543f;
--cal19: #633e11;
--cal20: #461b2d;
--cal21: #00427c;
--cal22: #603073;
--cal23: #8b1941;
--cal24: #970c0c;
--cal25: #9c3b07;
--cal26: #685203;
--cal27: #2a5f16;
--cal28: #09584f;
--cal29: #005a75;
--cal30: #4d5557;
}

[modern=true]:root {
Expand Down Expand Up @@ -223,6 +233,10 @@ variable-intellisense {
color: var(--muted-text) !important;
}

[modern=true]:root .drGks a:hover, [modern=true]:root .drGks a:focus {
background-color: var(--highlight);
}

[modern=true]:root .splus-modal-title {
color: var(--contrast-text) !important;
}
Expand Down Expand Up @@ -296,10 +310,10 @@ variable-intellisense {
}

[modern=true]:root .action-links-wrapper-expanded .action-links-unfold .action-links-unfold-text {
background-color: var(--text) !important;
color: var(--secondary) !important;
filter: Invert(var(--theme-is-dark)) !important;
background-color: var(--secondary) !important;
color: var(--text) !important;
border-radius: var(--border-radius) !important;
background-blend-mode: screen;
}

[modern=true]:root .action-links-unfold {
Expand Down Expand Up @@ -550,7 +564,17 @@ variable-intellisense {
[modern=true]:root .color-13,
[modern=true]:root .color-14,
[modern=true]:root .color-15,
[modern=true]:root .color-16 {
[modern=true]:root .color-16,
[modern=true]:root .color-dark-1,
[modern=true]:root .color-dark-2,
[modern=true]:root .color-dark-3,
[modern=true]:root .color-dark-4,
[modern=true]:root .color-dark-5,
[modern=true]:root .color-dark-6,
[modern=true]:root .color-dark-7,
[modern=true]:root .color-dark-8,
[modern=true]:root .color-dark-9,
[modern=true]:root .color-dark-10 {
border-color: rgba(0, 0, 0, 0.4) !important;
}

Expand Down Expand Up @@ -658,6 +682,46 @@ variable-intellisense {
background: var(--cal20) !important;
}

[modern=true]:root .color-dark-1 {
background: var(--cal21) !important;
}

[modern=true]:root .color-dark-2 {
background: var(--cal22) !important;
}

[modern=true]:root .color-dark-3 {
background: var(--cal23) !important;
}

[modern=true]:root .color-dark-4 {
background: var(--cal24) !important;
}

[modern=true]:root .color-dark-5 {
background: var(--cal25) !important;
}

[modern=true]:root .color-dark-6 {
background: var(--cal26) !important;
}

[modern=true]:root .color-dark-7 {
background: var(--cal27) !important;
}

[modern=true]:root .color-dark-8 {
background: var(--cal28) !important;
}

[modern=true]:root .color-dark-9 {
background: var(--cal29) !important;
}

[modern=true]:root .color-dark-10 {
background: var(--cal30) !important;
}

[modern=true]:root .fc-state-default {
background-color: var(--primary) !important;
border-color: none !important;
Expand Down Expand Up @@ -874,6 +938,20 @@ variable-intellisense {
background-image: url("/sites/all/themes/schoology_theme/images/btn-sprite.png?5f89e2e4127348b5") !important;
}

[modern=true]:root .immersive-reader-button-container span svg path {
fill: var(--text);
}

[modern=true]:root .immersive-reader-button-container button {
background-color: var(--primary);
color: var(--text);
border: var(--modern-border);
}

[modern=true]:root .immersive-reader-button-container button:hover, [modern=true]:root .immersive-reader-button-container button:focus {
background-color: var(--active);
}

[modern=true]:root .gradebook-course.hierarchical-grading-report .period-row .grade-column,
[modern=true]:root .gradebook-course.hierarchical-grading-report .category-row .grade-column,
[modern=true]:root .gradebook-course.hierarchical-grading-report .item-row .grade-column {
Expand All @@ -897,6 +975,7 @@ variable-intellisense {
[modern=true]:root .course-grade-text,
[modern=true]:root .total-points-wrapper *,
[modern=true]:root .percentage-grade,
[modern=true]:root .comment-body-wrapper,
[modern=true]:root .no-grade {
color: var(--text) !important;
}
Expand Down Expand Up @@ -1306,11 +1385,15 @@ variable-intellisense {
background-color: var(--accent);
}

[modern=true]:root .tab-nav.active {
[modern=true]:root .tab-nav:hover {
background-color: var(--active);
}

[modern=true]:root .tab-nav .active {
background-color: var(--input);
}

[modern=true]:root .tab-nav.active:hover {
[modern=true]:root .tab-nav .active:hover {
background-color: var(--input);
}

Expand Down Expand Up @@ -1448,6 +1531,38 @@ variable-intellisense {
color: var(--text);
}

[modern=true]:root #ui-datepicker-div {
background-color: var(--input) !important;
}

[modern=true]:root #ui-datepicker-div .ui-datepicker-days-cell a {
background-color: var(--primary) !important;
border-color: var(--modern-border) !important;
}

[modern=true]:root #ui-datepicker-div .ui-datepicker-days-cell .ui-datepicker-current-day a {
background-color: var(--highlight) !important;
}

[modern=true]:root #ui-datepicker-div .ui-datepicker-days-cell.ui-datepicker-days-cell-over a {
background-color: var(--active) !important;
}

[modern=true]:root #ui-datepicker-div .ui-datepicker-links > div:hover > a {
background-color: var(--hover-color);
}

[modern=true]:root #ui-datepicker-div .ui-datepicker-links > div > a {
background-color: var(--input);
background-blend-mode: screen;
border: var(--modern-border);
border-radius: var(--border-radius);
}

[modern=true]:root #ui-datepicker-div .ui-datepicker-unselectable {
background-color: var(--accent) !important;
}

[modern=true]:root .shuffleParent div.sshuffleContainer,
[modern=true]:root .shuffleParent .mediaThumbContainer {
background: var(--secondary) !important;
Expand Down Expand Up @@ -1730,16 +1845,54 @@ variable-intellisense {
background: var(--accent) !important;
}

[modern=true]:root .portfolio-card {
[modern=true]:root .portfolio-card, [modern=true]:root .item-card {
background: var(--primary) !important;
}

[modern=true]:root .tw-bs .portfolio-card__item-count-num {
color: var(--contrast-text) !important;
}

[modern=true]:root .tw-bs .btn {
background-color: var(--primary) !important;
border: var(--modern-border) !important;
border-radius: var(--border-radius) !important;
color: var(--contrast-text) !important;
}

[modern=true]:root .tw-bs .item-form__title-inline .sgy-autosave-input .form-group:hover label, [modern=true]:root .tw-bs .item-form__title-inline .sgy-autosave-input .form-group:hover label span {
color: var(--muted-text) !important;
}

[modern=true]:root .tw-bs .portfolio-list__list-view > .ui-state-highlight,
[modern=true]:root .tw-bs .portfolio-item-list > .ui-state-highlight {
background: var(--primary) !important;
border-radius: var(--border-radius) !important;
}

[modern=true]:root .tw-bs .remaining-char-len {
color: var(--text) !important;
}

[modern=true]:root .tw-bs .add-item-dropdown__add-new-icon::before, [modern=true]:root .tw-bs .portfolio-list__add-new-icon::before {
background-color: var(--primary) !important;
border-color: var(--modern-border) !important;
}

[modern=true]:root .tw-bs .item-view-container, [modern=true]:root .tw-bs .item-form__title-bar, [modern=true]:root .tw-bs .item-page {
background-color: var(--background-color) !important;
border-color: var(--border-color) !important;
outline-color: var(--border-color) !important;
}

[modern=true]:root .tw-bs .item-card__title-link {
color: var(--link-color) !important;
}

[modern=true]:root .sgy-autosave-input.sgy-autosave-input--editing label span, [modern=true]:root .sgy-autosave-input.sgy-autosave-input--editing .form-group:hover label span {
color: var(--text) !important;
}

[modern=true]:root #school-events {
padding: var(--padding) !important;
border-radius: var(--border-radius) !important;
Expand Down Expand Up @@ -1972,6 +2125,14 @@ variable-intellisense {
border-color: var(--contrast-border) !important;
}

[modern=true]:root .update-comments-pagenation {
background-color: var(--accent);
}

[modern=true]:root .feed-comments-viewall-container {
color: var(--link-color);
}

[modern=true]:root #dropbox-viewer-right-toggle {
border: var(--border-size) solid var(--input) !important;
background-color: var(--secondary) !important;
Expand Down
10 changes: 10 additions & 0 deletions css/modern/theme-editor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ variable-intellisense {
--modern-cal18: #00543f;
--modern-cal19: #633e11;
--modern-cal20: #461b2d;
--modern-cal21: #00427c;
--modern-cal22: #603073;
--modern-cal23: #8b1941;
--modern-cal24: #970c0c;
--modern-cal25: #9c3b07;
--modern-cal26: #685203;
--modern-cal27: #2a5f16;
--modern-cal28: #09584f;
--modern-cal29: #005a75;
--modern-cal30: #4d5557;
}

[modern=true]:root body {
Expand Down
36 changes: 33 additions & 3 deletions js/default-themes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ let __defaultThemes = [
"#fce8d1",
"#e1f1e7",
"#f0dfed",
"#e9e9ea"
"#e9e9ea",
"#00427c",
"#603073",
"#8b1941",
"#970c0c",
"#9c3b07",
"#685203",
"#2a5f16",
"#09584f",
"#005a75",
"#4d5557",
],
"text": {
"primary": "#2A2A2A",
Expand Down Expand Up @@ -107,7 +117,17 @@ let __defaultThemes = [
"#164152",
"#00543f",
"#633e11",
"#461b2d"
"#461b2d",
"#00427c",
"#603073",
"#8b1941",
"#970c0c",
"#9c3b07",
"#685203",
"#2a5f16",
"#09584f",
"#005a75",
"#4d5557",
],
"text": {
"primary": "#DCDDDE",
Expand Down Expand Up @@ -179,7 +199,17 @@ let __defaultThemes = [
"#fce8d1",
"#e1f1e7",
"#f0dfed",
"#e9e9ea"
"#e9e9ea",
"#00427c",
"#603073",
"#8b1941",
"#970c0c",
"#9c3b07",
"#685203",
"#2a5f16",
"#09584f",
"#005a75",
"#4d5557",
],
"text": {
"primary": "#2A2A2A",
Expand Down
Loading

0 comments on commit 6c9c42d

Please sign in to comment.