Skip to content

Wm2 5 component links to csesoc resources #218

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jan 21, 2022
Merged

Wm2 5 component links to csesoc resources #218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75ac52b
Make resources more compact, rm img on mobile
jasperdifran Oct 20, 2021
a00abef
Correctly arrange resource cards
jasperdifran Oct 21, 2021
f140c0c
Adjust box sizing
jasperdifran Nov 17, 2021
3c89bfc
Add pre enrolment guide image
jasperdifran Nov 17, 2021
36cbfa0
Add scroll padding
jasperdifran Nov 17, 2021
3f43fb3
Adjust images to be more suitable for small cards
jasperdifran Jan 19, 2022
a0fab13
Merge branch 'dev' of github.com:csesoc/csesoc.unsw.edu.au into WM2-5…
jasperdifran Jan 19, 2022
137ce7b
Add student-resources navigation
jasperdifran Jan 19, 2022
b28538c
Fixed padding and compclub box
munjoonteo Jan 21, 2022
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
Add pre enrolment guide image
  • Loading branch information
@jasperdifran
jasperdifran committed Nov 17, 2021
commit 3c89bfc7ea345fed2e10a07d727f0bf8c9601c77
Binary file added frontend/src/assets/resource-pre-enrolment-guide.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 10 additions & 5 deletions frontend/src/views/Home/StudentResources.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@
<h2>{{resources.pe_guide.title}}</h2>
<h3>{{resources.pe_guide.description}}</h3>
<div class="flex-grow-1"></div>
<v-img data-cy="resources-img" max-height="80px" :src="resources.pe_guide.src" class="image hidden-xs-only" />
<v-img
data-cy="resources-img"
max-height="80px"
:src="resources.pe_guide.src"
class="image hidden-xs-only"
/>
</div>
</a>
</v-col>
Expand Down Expand Up @@ -103,7 +108,7 @@ export default {
link: 'compClub',
title: 'Comp Club',
description: 'Get in contact with one of our partnering societies',
src: require('../../assets/resource-first-year-guide.png')
// TODO: CompClub photo
},
notangles: {
link: 'https://notangles.csesoc.unsw.edu.au/',
Expand All @@ -112,10 +117,10 @@ export default {
src: require('../../assets/resource-notangles.png'),
},
pe_guide: {
link: 'https://notangles.csesoc.unsw.edu.au/',
link: ' https://media.csesoc.org.au/pre-enrolment-guide/',
title: 'Pre-enrollment Guide',
description: 'Learn how to get a headstart on uni',
src: require('../../assets/resource-notangles.png'),
src: require('../../assets/resource-pre-enrolment-guide.jpg'),
}
},
})
Expand Down Expand Up @@ -169,7 +174,7 @@ export default {
.image {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
bottom: 0;
top: 0;
transition: transform .2s;
}
}
Expand Down