Skip to content

Commit

Permalink
Merge branch 'main' into staging_env
Browse files Browse the repository at this point in the history
  • Loading branch information
SivanYeh committed Aug 30, 2024
2 parents 1c84e5d + c1e09c8 commit b0f13e8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion components/events/SpeechCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default {
},
},
locationMapping: {
'4-r0': 'R0',
'4-r0': 'PSF Hall',
'5-r1': 'R1',
'6-r2': 'R2',
'1-r3': 'R3',
Expand Down
2 changes: 1 addition & 1 deletion components/schedule/ScheduleRoom.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
computed: {
name() {
return {
'4-r0': 'R0',
'4-r0': 'PSF Hall',
'5-r1': 'R1',
'6-r2': 'R2',
'1-r3': 'R3',
Expand Down
2 changes: 1 addition & 1 deletion pages/about/staff.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export default {
{ name: '鈺馨', photo: 'pycast/鈺馨.jpg' },
],
development_web: [
{ name: 'Josix', photo: 'default.jpg' },
{ name: 'Sivan', photo: 'web/Sivan.jpg' },
{ name: 'Benson', photo: 'web/Benson.jpg' },
{ name: 'WinnieBear', photo: 'web/WinnieBear.jpg' },
Expand All @@ -110,6 +109,7 @@ export default {
{ name: 'DerDer', photo: 'default.jpg' },
{ name: 'Fox', photo: 'web/Fox.jpg' },
{ name: '甲魚', photo: 'web/甲魚.jpg' },
{ name: 'Josix', photo: 'default.jpg' },
],
development_data: [
{ name: 'Xch1', photo: 'data/Xch1.jpg' },
Expand Down
1 change: 1 addition & 0 deletions pages/conference/poster-session.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
</div>

<div
class="text-sm md:text-lg"
v-html="$md.render(selectedPoster.summary.trim())"
></div>
</div>
Expand Down

0 comments on commit b0f13e8

Please sign in to comment.