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

Attachment categories #1983

Merged
merged 26 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3ac4c73
Add category_name field and update course attachment UI
damianhxy Sep 17, 2023
60e01f3
Improve styling of list items
damianhxy Sep 22, 2023
8b1902f
Merge master
damianhxy Sep 22, 2023
ad1fc32
Merge master
damianhxy Sep 22, 2023
78c2d87
Remove anchor link for unreleased badge, simplify delete button logic
damianhxy Sep 22, 2023
954e181
Hide assessment attachments from course landing page
damianhxy Sep 22, 2023
b04bfec
Add release_at field, remove released field
damianhxy Sep 24, 2023
73a3c7c
Fix tests
damianhxy Sep 24, 2023
7998aa4
Add fixtures
damianhxy Sep 24, 2023
559ac22
Simplify variable names
damianhxy Sep 29, 2023
7235d5e
Remove bullet points
damianhxy Nov 5, 2023
cb4d4e9
Group buttons together
damianhxy Nov 5, 2023
9c8cabc
Make font-family consistent
damianhxy Nov 5, 2023
23597c5
Merge branch 'master' into attachments-category
damianhxy Nov 5, 2023
517045c
Hide category for assessment attachments
damianhxy Nov 5, 2023
70d5786
Add cancel button, remove delete button, improve styling
damianhxy Nov 5, 2023
e216c1f
Improve migration to be backwards compatible / reversible
damianhxy Nov 10, 2023
925d581
Use update instead of update_attribute
damianhxy Nov 10, 2023
4972c3b
Display when attachment will be released
damianhxy Nov 10, 2023
573c6b0
Update tests
damianhxy Nov 10, 2023
8b61b7a
Simplify code
damianhxy Nov 10, 2023
dd4e03b
Use Time instead of DateTime
damianhxy Nov 10, 2023
b7c0c8d
Add download icon for students
damianhxy Dec 7, 2023
3522426
Vertically align icons
damianhxy Dec 7, 2023
7b17fe5
Hide assessment attachments from course attachment index
damianhxy Dec 7, 2023
2549bd4
Add vertical space above release date
damianhxy Dec 7, 2023
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
Prev Previous commit
Next Next commit
Make font-family consistent
  • Loading branch information
damianhxy committed Nov 5, 2023
commit 9c8cabc9ce9a87a80822f538f3c84eab7865007d
7 changes: 6 additions & 1 deletion app/assets/stylesheets/style.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,12 @@ body.autolab {
.h3,
.h4,
.h5,
.h6 {
.h6,
button,
input,
optgroup,
select,
textarea {
font-family: "Source Sans Pro", sans-serif;
}

Expand Down
2 changes: 1 addition & 1 deletion app/views/attachments/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<%= f.datetime_select :release_at, help_text: "Release attachment after this time" %>
damianhxy marked this conversation as resolved.
Show resolved Hide resolved
damianhxy marked this conversation as resolved.
Show resolved Hide resolved
</li>
<li>
<%= f.submit(@attachment.new_record? ? "Create Attachment" : "Save Changes", class: "btn primary") %>
<%= f.submit(@attachment.new_record? ? "Create Attachment" : "Save Changes") %>
<% unless @attachment.new_record? %>
<%= link_to "Delete Attachment",
course_attachment_path(@course, @attachment),
Expand Down
Loading