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

🔨 updated officers page with images and corrections #1

Merged
merged 1 commit into from
Jan 20, 2021
Merged

🔨 updated officers page with images and corrections #1

merged 1 commit into from
Jan 20, 2021

Conversation

samuelsandoval1
Copy link
Contributor

Proposed Changes

I removed the interns from the about page, added a few officer images.

@vercel
Copy link

vercel bot commented Jan 20, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/ethanthatonekid/acm-csuf-site/c1pl5oapz
✅ Preview: https://acm-csuf-site-git-fork-samuelsandoval1-aboutpgupdates.ethanthatonekid.vercel.app

@vercel vercel bot temporarily deployed to Preview January 20, 2021 18:04 Inactive
@EthanThatOneKid EthanThatOneKid merged commit 7a45445 into EthanThatOneKid:master Jan 20, 2021
@ghost ghost mentioned this pull request Mar 27, 2022
EvanCPSC added a commit that referenced this pull request Dec 3, 2023
EthanThatOneKid added a commit that referenced this pull request Dec 6, 2023
commit c52c09a
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 00:25:55 2023 -0800

    add gamedev team section

    - introduce rumble animation.

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit b8459c8
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 00:10:10 2023 -0800

    add special events team section

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit 11d201c
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:52:37 2023 -0800

    add splash of color to team title elements

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit ca0f0f5
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:45:06 2023 -0800

    update tiers of marketing officers/historians

commit 1ed6cfe
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:36:58 2023 -0800

    refactor `Members` component props

commit 96c0f84
Merge: 77c2f6b 3f6bd73
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:12:26 2023 -0800

    Merge branch 'main' into switching-terms

commit 77c2f6b
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:06:43 2023 -0800

    Update package-lock.json

commit b2c8cd8
Merge: 27ab1e7 3ee4672
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:02:13 2023 -0800

    Merge branch 'main' into switching-terms

commit 27ab1e7
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:29:01 2023 -0800

    Game Dev and Nodebuds toggle based on term

commit fcfbad9
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:15:29 2023 -0800

    As #1 Matt fan, I updated Matt's discord username

commit 2e88798
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:05:48 2023 -0800

    cleaned up conditions

commit 1fae3f3
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 22:51:35 2023 -0800

    Changed Dev and Algo logos, added oldLogoSrc to every team

commit 78d9d8b
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 21:05:16 2023 -0800

    formatted, added alt text

commit 60a07fd
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 21:02:54 2023 -0800

    Changed Design logo to Create logo when switching terms

commit 37aec5f
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 20:33:48 2023 -0800

    Changed pop-up animation to portrait-rotate animation
EthanThatOneKid added a commit that referenced this pull request Dec 7, 2023
* Squashed commit of the following:

commit c52c09a
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 00:25:55 2023 -0800

    add gamedev team section

    - introduce rumble animation.

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit b8459c8
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 00:10:10 2023 -0800

    add special events team section

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit 11d201c
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:52:37 2023 -0800

    add splash of color to team title elements

    Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

commit ca0f0f5
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:45:06 2023 -0800

    update tiers of marketing officers/historians

commit 1ed6cfe
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:36:58 2023 -0800

    refactor `Members` component props

commit 96c0f84
Merge: 77c2f6b 3f6bd73
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:12:26 2023 -0800

    Merge branch 'main' into switching-terms

commit 77c2f6b
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:06:43 2023 -0800

    Update package-lock.json

commit b2c8cd8
Merge: 27ab1e7 3ee4672
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Tue Dec 5 23:02:13 2023 -0800

    Merge branch 'main' into switching-terms

commit 27ab1e7
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:29:01 2023 -0800

    Game Dev and Nodebuds toggle based on term

commit fcfbad9
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:15:29 2023 -0800

    As #1 Matt fan, I updated Matt's discord username

commit 2e88798
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 23:05:48 2023 -0800

    cleaned up conditions

commit 1fae3f3
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 22:51:35 2023 -0800

    Changed Dev and Algo logos, added oldLogoSrc to every team

commit 78d9d8b
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 21:05:16 2023 -0800

    formatted, added alt text

commit 60a07fd
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 21:02:54 2023 -0800

    Changed Design logo to Create logo when switching terms

commit 37aec5f
Author: Evan Jimenez <evanmji1123@gmail.com>
Date:   Sat Dec 2 20:33:48 2023 -0800

    Changed pop-up animation to portrait-rotate animation

* add multiple positions per term per officer

Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

* wip

* Update +page.svelte

* fix colors

---------

Co-authored-by: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>
EthanThatOneKid added a commit that referenced this pull request Dec 7, 2023
* Changed pop-up animation to portrait-rotate animation

* Changed Design logo to Create logo when switching terms

* formatted, added alt text

* Changed Dev and Algo logos, added oldLogoSrc to every team

* cleaned up conditions

* As #1 Matt fan, I updated Matt's discord username

* Game Dev and Nodebuds toggle based on term

* Update package-lock.json

* refactor `Members` component props

* update tiers of marketing officers/historians

* add splash of color to team title elements

Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

* add special events team section

Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

* add gamedev team section

- introduce rumble animation.

Co-Authored-By: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>

* add tomas!

---------

Co-authored-by: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Co-authored-by: Karnikaa Velumani <60043611+karnikaavelumani@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants