Skip to content

Commit be48fe4

Browse files
authored
Assessment display changes (#2205)
* Display two cards per row max * make category headers smaller * change responsive screen in course index
1 parent e4714ba commit be48fe4

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

app/models/assessment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ def source_config_file_backup_path
461461
end
462462

463463
def date_to_s(date)
464-
date.strftime("%b %e at %l:%M%P")
464+
date.strftime("%a, %b %e at %l:%M%P")
465465
end
466466

467467
def load_dir_to_tar(dir_path, asmt_dir, tar, filters = [], export_dir = "")

app/views/assessments/index.html.erb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
function addClearFix() {
1212
let num_columns;
1313
const cards = document.querySelectorAll('.assessments');
14-
if (window.innerWidth >= 1200) {
15-
num_columns = 3;
16-
} else if (window.innerWidth >= 992) {
14+
if (window.innerWidth >= 992) {
1715
num_columns = 2;
1816
} else {
1917
num_columns = 1;
@@ -74,6 +72,10 @@
7472
.collection-item {
7573
overflow: auto;
7674
}
75+
76+
.card-content.category-card {
77+
padding: 15px 24px;
78+
}
7779
</style>
7880
<%= stylesheet_link_tag "assessments" %>
7981
<%= stylesheet_link_tag "assessment_date" %>
@@ -144,9 +146,9 @@
144146
<% @course.assessment_categories.each do |cat| %>
145147
<% asmts = @course.assessments_with_category(cat, @cud.student?) %>
146148
<% if asmts.any? %>
147-
<div class="col s12 l6 xl4 assessments">
149+
<div class="col s12 l6 assessments">
148150
<div class="card hoverable date">
149-
<div class="card-content red darken-3">
151+
<div class="category-card card-content red darken-3">
150152
<span class="card-title white-text"><%= cat %></span>
151153
</div>
152154

app/views/courses/index.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<% course_cud = CourseUserDatum.find_cud_for_course(course, current_user.id) %>
1818
<% not_student = course_cud.has_auth_level? :course_assistant %>
1919

20-
<div class="col s12 m4">
20+
<div class="col s12 l4">
2121
<div class="card hoverable">
2222
<%= link_to course_path(course), title: "Go to Course Page" do %>
2323
<div class="card-content red darken-4">

0 commit comments

Comments
 (0)