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

Development to master -> Minor fixes #555

Merged
merged 32 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
00d3b0c
2024 base (#508)
carlotacb Mar 19, 2024
f2039cd
Talks and Challenges set to secret (#510)
AdriMM26 Apr 4, 2024
0da6462
The mission (#517)
AdriMM26 Apr 4, 2024
bd9ae51
Upadate Home page (#518)
AdriMM26 Apr 6, 2024
7bb4cd6
Erase Devpost link (#519)
AdriMM26 Apr 6, 2024
8cbd870
Modified some styles (#520)
carlotacb Apr 6, 2024
7a89b1a
Schedule & live (#521)
carlotacb Apr 6, 2024
9a9798b
Challenges concept page (#523)
AdriMM26 Apr 7, 2024
de6cfeb
Redesign arriving methods (#524)
AdriMM26 Apr 7, 2024
8e54652
Fix in schedule view: Change buttons to make it more clear that are a…
carlotacb Apr 7, 2024
00334bd
Mentors page concept (#522)
AdriMM26 Apr 12, 2024
84fc705
Mission public part exposed (#531)
AdriMM26 Apr 12, 2024
7998d66
Add new feature: Secret description is now dinamic (#532)
carlotacb Apr 12, 2024
dc3a4e5
New section: Travel reimbursement processes (#533)
carlotacb Apr 13, 2024
b20eccd
Style fixes (#534)
carlotacb Apr 13, 2024
48606e1
New section: Meals v1 (#525)
carlotacb Apr 14, 2024
376fe49
New section: Rules and judging (#526)
carlotacb Apr 14, 2024
0c50c09
Improvements (#535)
carlotacb Apr 15, 2024
341941b
Apply feedback (#541)
carlotacb Apr 15, 2024
179d3fd
Fixed background and typos (#542)
carlotacb Apr 15, 2024
a1af143
Add clarity (#543)
carlotacb Apr 15, 2024
c20cb24
Feedback Gerard (#544)
carlotacb Apr 15, 2024
ae52f51
Emergency contact (#546)
AdriMM26 Apr 16, 2024
87c84ab
Apply feedback and add more better things :) (#547)
carlotacb Apr 17, 2024
f428756
New section: Activities (#545)
carlotacb Apr 17, 2024
626962c
Last retoques (#549)
carlotacb Apr 18, 2024
d1ee20f
Map fixes (#550)
AdriMM26 Apr 18, 2024
cb8cffb
Feedback last retoques (#551)
carlotacb Apr 18, 2024
decd326
add travelId route (#552)
carlotacb Apr 18, 2024
dd7147a
Merge branch 'master' of https://github.com/hackupc/hackupc-live into…
carlotacb Apr 18, 2024
f660f9d
Merge branch 'development' of https://github.com/hackupc/hackupc-live…
carlotacb Apr 18, 2024
025dade
Minor fixes (#554)
carlotacb Apr 19, 2024
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
2 changes: 1 addition & 1 deletion src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const routes: RouteRecordRaw[] = [
component: () => import('@/views/Meals.vue'),
},
{
path: '/travel',
path: '/travel/:travelId?',
name: 'travel',
component: () => import('@/views/Travel.vue'),
},
Expand Down
4 changes: 2 additions & 2 deletions src/views/Mentors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const currentView = computed<'generalInfo' | 'meetThem'>(() => {
<template #icon>
<FontAwesomeIcon class="link__icon" :icon="['fab', 'slack']" />
</template>
#help
#mentors
</IconLabel>
You can always find a mentor in the Mentors lobby, located at A5105 next
to the Cafeteria.
Expand Down Expand Up @@ -130,11 +130,11 @@ const currentView = computed<'generalInfo' | 'meetThem'>(() => {
.explore {
display: flex;
width: 100%;
flex-wrap: wrap;
justify-content: flex-end;
margin-top: 20px;
margin-right: 20px;
margin-left: 20px;
gap: 0.5rem;
}

.button {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Mission.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ strong {
.explore {
display: flex;
width: 100%;
flex-wrap: wrap;
justify-content: flex-start;
margin-top: 20px;
margin-right: 20px;
margin-left: 20px;
gap: 0.5rem;
}

.button {
Expand Down
Loading