Squashed commit of the following: · ucsddesignco/stride2024@bbfcbc8

Commit

Squashed commit of the following:

commit 3ed2ce2
Author: Aaron Chan <[email protected]>
Date:   Sat Nov 9 20:42:04 2024 -0800

    fix: update nerve asset and remove grad year 2029

commit e576cc8
Author: Aaron Chan <[email protected]>
Date:   Sat Nov 9 20:25:28 2024 -0800

    feat: add support for viewing badges

commit a1f5d4e
Author: Aaron Chan <[email protected]>
Date:   Fri Nov 8 15:48:02 2024 -0800

    Squashed commit of the following:

    commit 99da140
    Author: Aaron Chan <[email protected]>
    Date:   Fri Nov 8 01:09:27 2024 -0800

        Squashed commit of the following:

        commit 787081b
        Author: Aaron Chan <[email protected]>
        Date:   Fri Nov 8 01:05:04 2024 -0800

            fix: use custom hover cursor everywhere and attempt to fix about images

        commit 8546381
        Author: Aaron Chan <[email protected]>
        Date:   Fri Nov 8 00:32:03 2024 -0800

            fix: fix badge accessory bug and update form select styling

        commit f0382a2
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 14:45:31 2024 -0800

            Squashed commit of the following:

            commit e979878
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 14:43:00 2024 -0800

                fix: shorten copy for ucsd library companies section

            commit c52b4d6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 14:04:13 2024 -0800

                fix: fix mobile agenda card

            commit f759e35
            Merge: 26577a1 524c9b6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 13:39:43 2024 -0800

                Merge branch 'develop'

            commit 26577a1
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 00:11:30 2024 -0800

                Squashed commit of the following:

                commit 1489486
                Author: Aaron Chan <[email protected]>
                Date:   Thu Nov 7 00:08:01 2024 -0800

                    fix: adjust registration styling and add register button duck

            commit 41b2778
            Author: Aaron Chan <[email protected]>
            Date:   Wed Nov 6 23:20:08 2024 -0800

                fix: adjust registration styling

        commit 1fcf76a
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 14:06:29 2024 -0800

            Squashed commit of the following:

            commit c52b4d6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 14:04:13 2024 -0800

                fix: fix mobile agenda card

            commit f759e35
            Merge: 26577a1 524c9b6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 13:39:43 2024 -0800

                Merge branch 'develop'

            commit 26577a1
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 00:11:30 2024 -0800

                Squashed commit of the following:

                commit 1489486
                Author: Aaron Chan <[email protected]>
                Date:   Thu Nov 7 00:08:01 2024 -0800

                    fix: adjust registration styling and add register button duck

            commit 41b2778
            Author: Aaron Chan <[email protected]>
            Date:   Wed Nov 6 23:20:08 2024 -0800

                fix: adjust registration styling

    commit b604bbb
    Merge: 8698310 7d23612
    Author: Aaron Chan <[email protected]>
    Date:   Fri Nov 8 00:36:08 2024 -0800

        Merge branch 'main' of https://github.com/ucsddesignco/stride2024

    commit 8698310
    Author: Aaron Chan <[email protected]>
    Date:   Fri Nov 8 00:35:45 2024 -0800

        Squashed commit of the following:

        commit 8546381
        Author: Aaron Chan <[email protected]>
        Date:   Fri Nov 8 00:32:03 2024 -0800

            fix: fix badge accessory bug and update form select styling

        commit f0382a2
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 14:45:31 2024 -0800

            Squashed commit of the following:

            commit e979878
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 14:43:00 2024 -0800

                fix: shorten copy for ucsd library companies section

            commit c52b4d6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 14:04:13 2024 -0800

                fix: fix mobile agenda card

            commit f759e35
            Merge: 26577a1 524c9b6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 13:39:43 2024 -0800

                Merge branch 'develop'

            commit 26577a1
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 00:11:30 2024 -0800

                Squashed commit of the following:

                commit 1489486
                Author: Aaron Chan <[email protected]>
                Date:   Thu Nov 7 00:08:01 2024 -0800

                    fix: adjust registration styling and add register button duck

            commit 41b2778
            Author: Aaron Chan <[email protected]>
            Date:   Wed Nov 6 23:20:08 2024 -0800

                fix: adjust registration styling

        commit 1fcf76a
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 14:06:29 2024 -0800

            Squashed commit of the following:

            commit c52b4d6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 14:04:13 2024 -0800

                fix: fix mobile agenda card

            commit f759e35
            Merge: 26577a1 524c9b6
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 13:39:43 2024 -0800

                Merge branch 'develop'

            commit 26577a1
            Author: Aaron Chan <[email protected]>
            Date:   Thu Nov 7 00:11:30 2024 -0800

                Squashed commit of the following:

                commit 1489486
                Author: Aaron Chan <[email protected]>
                Date:   Thu Nov 7 00:08:01 2024 -0800

                    fix: adjust registration styling and add register button duck

            commit 41b2778
            Author: Aaron Chan <[email protected]>
            Date:   Wed Nov 6 23:20:08 2024 -0800

                fix: adjust registration styling

    commit 7d23612
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 16:10:19 2024 -0800

        Update README.md

    commit e979878
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 14:43:00 2024 -0800

        fix: shorten copy for ucsd library companies section

    commit c52b4d6
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 14:04:13 2024 -0800

        fix: fix mobile agenda card

    commit f759e35
    Merge: 26577a1 524c9b6
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 13:39:43 2024 -0800

        Merge branch 'develop'

    commit 26577a1
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 00:11:30 2024 -0800

        Squashed commit of the following:

        commit 1489486
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 00:08:01 2024 -0800

            fix: adjust registration styling and add register button duck

    commit 41b2778
    Author: Aaron Chan <[email protected]>
    Date:   Wed Nov 6 23:20:08 2024 -0800

        fix: adjust registration styling

commit 787081b
Author: Aaron Chan <[email protected]>
Date:   Fri Nov 8 01:05:04 2024 -0800

    fix: use custom hover cursor everywhere and attempt to fix about images

commit 8546381
Author: Aaron Chan <[email protected]>
Date:   Fri Nov 8 00:32:03 2024 -0800

    fix: fix badge accessory bug and update form select styling

commit f0382a2
Author: Aaron Chan <[email protected]>
Date:   Thu Nov 7 14:45:31 2024 -0800

    Squashed commit of the following:

    commit e979878
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 14:43:00 2024 -0800

        fix: shorten copy for ucsd library companies section

    commit c52b4d6
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 14:04:13 2024 -0800

        fix: fix mobile agenda card

    commit f759e35
    Merge: 26577a1 524c9b6
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 13:39:43 2024 -0800

        Merge branch 'develop'

    commit 26577a1
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 00:11:30 2024 -0800

        Squashed commit of the following:

        commit 1489486
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 00:08:01 2024 -0800

            fix: adjust registration styling and add register button duck

    commit 41b2778
    Author: Aaron Chan <[email protected]>
    Date:   Wed Nov 6 23:20:08 2024 -0800

        fix: adjust registration styling

commit 1fcf76a
Author: Aaron Chan <[email protected]>
Date:   Thu Nov 7 14:06:29 2024 -0800

    Squashed commit of the following:

    commit c52b4d6
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 14:04:13 2024 -0800

        fix: fix mobile agenda card

    commit f759e35
    Merge: 26577a1 524c9b6
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 13:39:43 2024 -0800

        Merge branch 'develop'

    commit 26577a1
    Author: Aaron Chan <[email protected]>
    Date:   Thu Nov 7 00:11:30 2024 -0800

        Squashed commit of the following:

        commit 1489486
        Author: Aaron Chan <[email protected]>
        Date:   Thu Nov 7 00:08:01 2024 -0800

            fix: adjust registration styling and add register button duck

    commit 41b2778
    Author: Aaron Chan <[email protected]>
    Date:   Wed Nov 6 23:20:08 2024 -0800

        fix: adjust registration styling

Loading branch information

aaronchan32 committed Nov 10, 2024

1 parent 393f9e4 commit bbfcbc8

src/components/Register/FormSteps/FormStep1/FormStep1.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,6 @@ export default function FormStep1({ @@
               { label: 'Class of 2026', value: '2026' },
               { label: 'Class of 2027', value: '2027' },
               { label: 'Class of 2028', value: '2028' },
-              { label: 'Class of 2029', value: '2029' },
               { label: 'NA', value: 'NA' }
             ]}
             label="Graduation Year"
@@ Expand Down @@

src/components/Register/Mascot/Mascot.scss

-Original file line number
+Diff line change
@@ Expand Up / @@ -48,9 +48,10 @@ @@
         &nerve {
           width: 15%;
-          top: -14%;
+          top: -42%;
           left: 0;
           right: 0;
+          z-index: -1;
         }
         &tophat {
@@ Expand Down @@

src/components/Register/MascotHats/NerveHat.tsx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,20 +2,21 @@ export default function NerveHat() {
  
      return (

        <svg

          width="98"

          height="171"

          viewBox="0 0 98 171"

          fill="none"

          xmlns="http://www.w3.org/2000/svg"

        >

          <g clipPath="url(#clip0_6510_9480)">

          <g clip-path="url(#clip0_6895_8843)">

            <path

              fillRule="evenodd"

              clipRule="evenodd"

              d="M54.2915 93.7432C55.8655 94.0355 57.5113 94.268 59.232 94.4354C70.7498 95.5565 75.3094 92.7903 76.7356 91.3379C77.9528 90.0984 78.4371 88.2522 77.5638 85.9024C76.6471 83.4361 74.5978 81.6219 72.2863 81.15C70.3141 80.7473 65.9713 80.922 59.7428 87.0276C57.6122 89.1162 55.8066 91.3655 54.2915 93.7432ZM47.9008 112.842C50.8971 113.521 54.0287 114.023 57.2945 114.341C71.8782 115.761 83.632 112.86 91.0057 105.351C98.5884 97.6293 99.3903 87.2203 96.3108 78.9347C93.2747 70.7657 86.1321 63.5643 76.2872 61.5542C66.103 59.4749 55.3248 63.3518 45.7423 72.7453C41.6325 76.774 38.3709 81.1145 35.8128 85.6341C35.3071 85.2272 34.8175 84.8104 34.3434 84.3844C28.5472 79.1766 24.5238 72.1049 22.2323 63.7213C17.5759 46.6861 20.4548 25.454 28.5996 8.77679L10.6282 0C0.703072 20.3227 -3.19495 46.5502 2.94001 68.9947C6.04414 80.351 11.8086 91.0242 20.9766 99.2615C23.3968 101.436 26.017 103.407 28.8353 105.158C26.8 116.14 27.4376 127.093 28.9721 136.39C30.5674 146.055 33.2216 154.588 35.4555 160.676C36.5778 163.735 37.6077 166.214 38.3696 167.954C38.7508 168.825 39.0661 169.513 39.2935 169.999C39.4073 170.241 39.4992 170.434 39.5666 170.574C39.6003 170.643 39.6279 170.7 39.649 170.743L39.6758 170.798L39.6855 170.817L39.6894 170.825C39.691 170.829 39.6926 170.832 48.6511 166.388C57.6097 161.945 57.611 161.948 57.6123 161.95L57.5796 161.883C57.5448 161.811 57.486 161.688 57.4058 161.516C57.2455 161.174 57.0001 160.639 56.6903 159.932C56.0701 158.515 55.1962 156.416 54.2316 153.787C52.2917 148.5 50.0397 141.219 48.7051 133.133C47.5896 126.375 47.1704 119.47 47.9008 112.842Z"

              fill="#565656"

              fill="#FBFEFC"

            />

          </g>

          <defs>

            <clipPath id="clip0_6510_9480">

            <clipPath id="clip0_6895_8843">

              <rect width="97.9935" height="170.826" fill="white" />

            </clipPath>

          </defs>

0 comments on commit `bbfcbc8`

Please sign in to comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

0 comments on commit `bbfcbc8`

Commit

There are no files selected for viewing

0 comments on commit bbfcbc8

0 comments on commit `bbfcbc8`