Skip to content

Commit

Permalink
Merge pull request #17 from csesoc/CW2-10-redesign-resources-cards-to…
Browse files Browse the repository at this point in the history
…-incorporate-logos

Cw2 10 redesign resources cards to incorporate logos
  • Loading branch information
andrew-l3 authored Jun 24, 2024
2 parents bed8632 + af27612 commit b0e4bfb
Show file tree
Hide file tree
Showing 14 changed files with 318 additions and 98 deletions.
6 changes: 3 additions & 3 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// "plugin:prettier/recommended"
],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"]
// "rules": {
"plugins": ["@typescript-eslint"],
"rules": {
// "prettier/prettier": ["error", { "endOfLine": "auto" }]
// }
}
}
74 changes: 74 additions & 0 deletions frontend/public/assets/circles_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions frontend/public/assets/compclub_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b0e4bfb

Please sign in to comment.