Skip to content

Commit

Permalink
fewer todo's
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmesuere
bmesuere committed Jun 6, 2022
1 parent ad58f2c commit 8a96d58
Show file tree
Hide file tree
Showing 17 changed files with 56 additions and 100 deletions.
1 change: 0 additions & 1 deletion app/assets/stylesheets/base.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "../../../node_modules/bootstrap/scss/functions";

// 2. Include any default variable overrides here
//@import "theme/colors.css.scss"; // todo remove
@import "theme/m3-theme-light.css.scss";
@import "bootstrap_variable_overrides.css.scss";
@import "mixins.css.scss";
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/components/btn.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@
align-items: center;
margin-bottom: 15px;
padding: 12px;
//TODO
//background-color: $content-bg;
background-color: $surface;
border-radius: 2px;
transition: box-shadow 0.1s cubic-bezier(.4, 0, .2, 1);
@include shadow-z2;
Expand Down
28 changes: 9 additions & 19 deletions app/assets/stylesheets/components/card.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ a.card-title-link:hover {

.card-subtitle-text {
margin-top: 3px;
// TODO
//color: $text-secondary-on-container-color;
opacity: 75%;
}

.card-subtitle-text+.card-subtitle-text {
Expand All @@ -83,7 +82,6 @@ a.card-title-link:hover {
}
}

//TODO
.card-title.card-colored-accent {
&.accent-red {
background-color: $red-container;
Expand Down Expand Up @@ -196,8 +194,6 @@ a.card-title-link:hover {

.card-subtitle-text {
font-size: 14px;
//TODO
//color: $text-secondary;
margin: 0;
font-weight: normal;
line-height: 1.1;
Expand All @@ -208,12 +204,6 @@ a.card-title-link:hover {
padding: inherit;
}

.card-title-colored .card-subtitle-text,
.card-title-colored .card-subtitle-text a {
// TODO
//color: $header-fg-secondary;
}

.card-supporting-text {
color: $text-color;
font-size: 14px;
Expand Down Expand Up @@ -309,8 +299,7 @@ a.card-title-link:hover {
margin-right: 10px;
height: 55px;
border: none;
//TODO
//border-bottom: 5px solid $header-accent;
border-bottom: 5px solid $secondary-container;
font-size: 18px;
transition-duration: 0.2s;
transition-property: height;
Expand Down Expand Up @@ -351,8 +340,7 @@ a.card-title-link:hover {
.card-title .nav-tabs li a.active {
border: none;
background: inherit;
// TODO
//border-bottom: 5px solid $header-accent;
border-bottom: 5px solid $secondary-container;
height: 50px;
}

Expand All @@ -368,16 +356,18 @@ a.card-title-link:hover {

.card-nav .badge {
margin-left: 3px;
background-color: $secondary;
background-color: $secondary-container;
color: $on-secondary-container;
}

.nav-tabs .badge {
// todo
background-color: $text-muted;
background-color: $surface-variant;
color: $on-surface-variant;
}

.nav-tabs .active .badge {
background-color: $secondary;
background-color: $secondary-container;
color: $on-secondary-container;
}

.card-title-fab {
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/components/evaluations.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@
}

&.not-started {
//TODO
//border-bottom: 3px solid $hairlinegray;
border-bottom: 3px solid $surface-variant;
}

.done,
Expand Down
6 changes: 2 additions & 4 deletions app/assets/stylesheets/components/heatmap.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@

.day-cell {
&.empty {
//TODO
//fill: $heatmap-empty-fg;
fill: $off-surface;
}

&:hover {
//TODO
//stroke: $heatmap-hover-fg;
stroke: $primary;
stroke-width: 2;
}
}
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/components/toast.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
.toasts .toast {
background-color: $inverse-surface;
border-radius: 3px;
//TODO
//box-shadow: 0 0 2px $toast-inner-shadow, 0 2px 4px $toast-outer-shadow;
color: $inverse-on-surface;
display: block;
line-height: 20px;
Expand Down
9 changes: 2 additions & 7 deletions app/assets/stylesheets/components/tokenfield.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@
padding-left: 12px;
padding-right: 12px;
border-width: 0px;
//TODO
//color: $text-on-bg-color;
text-transform: capitalize;
white-space: nowrap;
cursor: default;
Expand All @@ -161,8 +159,7 @@
font-size: 18px;
margin-left: 8px;
margin-right: -4px; // a token with a close button has a right padding of 8 instead of 12px
//TODO
//color: $text-on-bg-color;
color: inherit;
}

.token .close:hover {
Expand All @@ -179,8 +176,7 @@ d-search-token>.token {
margin-right: 8px;
}

// TODO
/*.token.accent-red {
.token.accent-red {
color: $on-red-container;
background-color: $red-container;
}
Expand Down Expand Up @@ -225,7 +221,6 @@ d-search-token>.token {
background-color: $blue-gray-container;
}

*/
.tokenfield {

.form-control {
Expand Down
6 changes: 2 additions & 4 deletions app/assets/stylesheets/components/visualisations.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@

.day-cell {
&.empty {
//TODO
//fill: $heatmap-empty-fg;
fill: $off-surface;
}

&:hover {
//TODO
//stroke: $heatmap-hover-fg;
stroke: $primary;
stroke-width: 2;
}
}
Expand Down
8 changes: 3 additions & 5 deletions app/assets/stylesheets/layout/footer.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ $footer-height-sm: 180px;
flex-shrink: 0;
width: 100%;
padding: 32px;
//TODO
color: $on-tertiary;
background-color: $tertiary;
color: $on-gray;
background-color: $gray;
height: $footer-height;
}

Expand All @@ -37,8 +36,7 @@ $footer-height-sm: 180px;
margin-left: 1em;

&:hover {
//TODO
//color: $footer-fg-hover;
opacity: 80%;
text-decoration: none;
}
}
Expand Down
6 changes: 2 additions & 4 deletions app/assets/stylesheets/layout/navbar.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,7 @@ $navbar-height: 50px;

.crumb:last-child:not(:first-child),
.crumb:last-child:not(:first-child) a {
// TODO
//color: $header-fg-secondary;
opacity: 75%;
pointer-events: none;
cursor: default;
}
Expand All @@ -425,8 +424,7 @@ a.notification:before {
border-radius: 50%;
border: 1px solid white;
display: inline-block;
// TODO
//background-color: $pending-color;
background-color: $danger;
position: relative;
margin-left: -15px;
left: 30px;
Expand Down
33 changes: 15 additions & 18 deletions app/assets/stylesheets/material_icons.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,59 +173,56 @@
}
}

// TODO
/*.mdi.mdi-colored-accent {
.mdi.mdi-colored-accent {
&.accent-red {
color: $color-red-bg;
color: $red-container;
}

&.accent-pink {
color: $color-pink-bg;
color: $pink-container;
}

&.accent-purple {
color: $purple;
color: $purple-container;
}

&.accent-deep-purple {
color: $deep-purple;
color: $deep-purple-container;
}

&.accent-indigo {
color: $indigo;
color: $indigo-container;
}

&.accent-teal {
color: $teal;
color: $teal-container;
}

&.accent-orange {
color: $orange;
color: $orange-container;
}

&.accent-brown {
color: $brown;
color: $brown-container;
}

&.accent-blue-gray {
color: $blue-gray;
&.accent-blue-gray {
color: $blue-gray-container;
}

&.accent-blue {
color: $blue;
color: $blue-container;
}

&.accent-yellow {
color: $yellow;
color: $yellow-container;
}

&.accent-green {
color: $green;
color: $green-container;
}

&.accent-cyan {
color: $cyan;
color: $cyan-container;
}
}
*/
2 changes: 1 addition & 1 deletion app/assets/stylesheets/models/course.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.badge-pending {
//TODO background-color: $pending-color;
background-color: $danger;
}

.card.course {
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/models/series.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

.submission-status-button {
a {
//TODO color: $btn-accent;
color: $primary;
}
}

Expand Down Expand Up @@ -78,7 +78,7 @@
font-size: 22px;
margin-right: 16px;
border-radius: 50%;
//TODO background-color: $series-summary-icon-bg;
background-color: $gray;

&>.mdi::before {
line-height: 24px;
Expand Down Expand Up @@ -109,7 +109,7 @@
}

i {
//TODO color: $series-summary-icon-bg;
color: $gray;
background: $content-bg;
border-radius: 50%;
border: 5px solid $content-bg;
Expand Down
16 changes: 8 additions & 8 deletions app/assets/stylesheets/models/submissions.css.scss
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
$feedback-diff-table-header-bg: $surface-variant;
$feedback-diff-table-header-fg: $on-surface-variant;
$feedback-diff-table-ins: $success-container;
$feedback-diff-table-ins-strong: $success;
$feedback-diff-table-del: $danger-container;
$feedback-diff-table-del-strong: $danger;

.submissions-table {
th.status-column {
Expand Down Expand Up @@ -142,19 +138,23 @@ $feedback-diff-table-del-strong: $danger;
}

.ins {
background: $feedback-diff-table-ins;
background: $success-container;
color: $on-success-container;
}

.del {
background: $feedback-diff-table-del;
background: $danger-container;
color: $on-success-container;
}

.ins strong {
background: $feedback-diff-table-ins-strong;
background: $success;
color: $on-success;
}

.del strong {
background: $feedback-diff-table-del-strong;
background: $danger;
color: $on-danger;
}

.line-nr {
Expand Down
Loading

0 comments on commit 8a96d58

Please sign in to comment.