Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dodona 5 redesign ideas #2760

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $enable-rfs: false;
$enable-caret: false;

// other values
$border-radius-base: 6px;
$border-radius-base: 12px;

// font stuff
$font-family-sans-serif: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
@import "components/code_listing.css";
@import "components/heatmap.css";
@import "components/img.css";
@import "components/label.css";
@import "components/link.css";
@import "components/modal.css";
@import "components/notification.css";
Expand All @@ -17,6 +16,7 @@
@import "components/scoresheet.css";
@import "components/stepper.css";
@import "components/table-toolbar.css";
@import "components/tokenfield.css";
@import "components/tutor.css";
@import "components/progress-chart.css";

Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/components/btn.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ button.btn-icon {
display: inline-block;
font-size: 14px;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0;
overflow: hidden;
outline: none;
Expand Down Expand Up @@ -180,7 +179,6 @@ button.btn-icon {
font-size: 14px;
line-height: 36px;
padding-right: 20px;
text-transform: uppercase;
white-space: nowrap;

&.right{
Expand Down
22 changes: 11 additions & 11 deletions app/assets/stylesheets/components/card.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ a.card-title-link:hover {
}

.card-title.card-colored-accent {
color: $header-fg;
color: $text-on-bg-color;
border-top-left-radius: $border-radius-base;
border-top-right-radius: $border-radius-base;

.card-subtitle-text {
margin-top: 3px;
color: $header-fg-secondary;
color: $text-secondary-on-bg-color;
}

.card-subtitle-text + .card-subtitle-text {
Expand All @@ -76,39 +76,39 @@ a.card-title-link:hover {
}

.card-title.card-colored-accent.accent-red {
background-color: $color-red;
background-color: $color-red-bg;
}

.card-title.card-colored-accent.accent-pink {
background-color: $color-pink;
background-color: $color-pink-bg;
}

.card-title.card-colored-accent.accent-purple {
background-color: $color-purple;
background-color: $color-purple-bg;
}

.card-title.card-colored-accent.accent-deep-purple {
background-color: $color-deep-purple;
background-color: $color-deep-purple-bg;
}

.card-title.card-colored-accent.accent-indigo {
background-color: $color-indigo;
background-color: $color-indigo-bg;
}

.card-title.card-colored-accent.accent-teal {
background-color: $color-teal;
background-color: $color-teal-bg;
}

.card-title.card-colored-accent.accent-orange {
background-color: $color-orange;
background-color: $color-orange-bg;
}

.card-title.card-colored-accent.accent-brown {
background-color: $color-brown;
background-color: $color-brown-bg;
}

.card-title.card-colored-accent.accent-blue-grey {
background-color: $color-blue-grey;
background-color: $color-blue-grey-bg;
}

.card-title.card-title-plain li a {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/heatmap.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
position: absolute;
background: black;
border: 0;
border-radius: 5px;
border-radius: $border-radius-base;
color: white;
padding: 5px;
pointer-events: none;
Expand Down
138 changes: 0 additions & 138 deletions app/assets/stylesheets/components/label.css.scss

This file was deleted.

6 changes: 0 additions & 6 deletions app/assets/stylesheets/components/table-toolbar.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@
border: none;
box-shadow: none;

.token {
margin-top: 6px;
margin-bottom: 6px;
font-size: 15px;
}

.twitter-typeahead .token-input.tt-hint {
color: $text-secondary;
margin-top: 7px;
Expand Down
Loading