Skip to content

Commit

Permalink
Merge pull request #147 from aopell/develop
Browse files Browse the repository at this point in the history
Version 5.2
  • Loading branch information
aopell authored Mar 15, 2019
2 parents 5ccdf7e + 1268530 commit caa92bc
Show file tree
Hide file tree
Showing 15 changed files with 1,590 additions and 1,274 deletions.
41 changes: 41 additions & 0 deletions css/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,12 @@ h1.setting-title {
display: inline;
}

.popups-body .no-answer-provided {
background: url('https://lms.lausd.net/sites/all/themes/schoology_theme/images/error_404.png') no-repeat 0 0;
padding: 0 0 0 25px;
font-weight: bold;
}

#grading-scale-wrapper {
margin-top: 7px !important;
}
Expand All @@ -386,6 +392,24 @@ h1.setting-title {
margin-left: 15px;
}

/*
#139 fix
We reskin background but not foreground in .popups-buttons
This overrides our reskin of the background to match other cancellations
*/
#popup_cancel {
background-color: rgba(0, 0, 0, 0) !important;
}

/*
In the same vein as #139, to address stylistic discreptancies between the buttons
*/
.popups-buttons span {
border: 1px solid !important;
border-color: #999 #999 #888 !important;
background: url('https://asset-cdn.schoology.com/sites/all/themes/schoology_theme/images/gray-btn-bg.gif') repeat-x 0 1px !important;
}

/*
newfangled trim and UI w/ obfuscated class names
the selector matches inside notifications in the new notifs dropdown
Expand All @@ -406,6 +430,23 @@ the selector matches inside notifications in the new notifs dropdown
display: block;
}

#popups-overlay {
width: 100% !important;
}

.splus-modal-open {
overflow: hidden;
}

.popups-small {
left: calc(50vw - 225px) !important;
}

.popups-large {
left: calc(50vw - 300px) !important;
}

/* I believe this is unused, but we might want it in the future for replacing rainbow with proper CSS animations if easily possible */
@keyframes rainbow {
0% {
background-color: hsl(0, 50%, 50%);
Expand Down
21 changes: 21 additions & 0 deletions css/grades.css
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,12 @@ input#enable-modify {
align-items: center;
}

.splus-gradeedit-checkbox-holder-wrapper > * {
display: inline-flex;
padding-left: 5px;
padding-right: 5px;
}

.grade-add-indicator.hidden,
.report-row.item-row.hidden {
display: none !important;
Expand Down Expand Up @@ -202,4 +208,19 @@ input#enable-modify {
visibility: visible;
word-spacing:normal;
letter-spacing:normal;
}

img.splus-coursegradebox-taint {
width: 1em;
height: 1em;
vertical-align: middle;
filter: brightness(0.0625); /* 1/16; corresponds with Schoology's #111111 */
padding-right: 0.1em;
}

.splus-weighted-gradebook-indicator {
font-size: 12px;
font-weight: normal;
margin-left: 15px;
color: #ee00ce;
}
Loading

0 comments on commit caa92bc

Please sign in to comment.