Constitution page #11

New Issue

added 1 commit <ul><li>2887568d - Change CSS file name</li></ul> [Compare with previous version](/csc/website/-/merge_requests/11/diffs?diff_id=55364&start_sha=2871e7ea88b5ff61f92b69add12d98182bf57a3f)

j285he commented

2021-05-16 22:58:27 -04:00

(Migrated from git.uwaterloo.ca)

changed the description

j285he commented

2021-05-22 15:18:03 -04:00

(Migrated from git.uwaterloo.ca)

added 5 commits

2887568d...8a9935ba - 2 commits from branch main
baf13af5 - Change css and props
051fa143 - Merge branch 'main' into feat/event-card
1449f987 - Add image tag

Compare with previous version

added 5 commits <ul><li>2887568d...8a9935ba - 2 commits from branch <code>main</code></li><li>baf13af5 - Change css and props</li><li>051fa143 - Merge branch 'main' into feat/event-card</li><li>1449f987 - Add image tag</li></ul> [Compare with previous version](/csc/website/-/merge_requests/11/diffs?diff_id=55916&start_sha=2887568d076bebc76cf9ef7cb1a6fdd35c29cb11)

j285he commented

2021-05-22 15:19:24 -04:00

(Migrated from git.uwaterloo.ca)

changed the description

j285he commented

2021-05-22 15:22:47 -04:00

(Migrated from git.uwaterloo.ca)

Flexbox and width wouldn't work for some reason so I took some ideas from here: https://css-tricks.com/making-width-and-flexible-items-play-nice-together/

j285he commented

2021-05-23 20:45:01 -04:00

(Migrated from git.uwaterloo.ca)

added 2 commits

ed9724a3 - 1 commit from branch main
9227656d - Fix merge conflicts

Compare with previous version

added 2 commits <ul><li>ed9724a3 - 1 commit from branch <code>main</code></li><li>9227656d - Fix merge conflicts</li></ul> [Compare with previous version](/csc/website/-/merge_requests/11/diffs?diff_id=56122&start_sha=1449f987cd32f4047d54afcead4a00d37197523b)

j285he commented

2021-05-23 20:45:33 -04:00

(Migrated from git.uwaterloo.ca)

added 1 commit

297b310e - ESLint

Compare with previous version

added 1 commit <ul><li>297b310e - ESLint</li></ul> [Compare with previous version](/csc/website/-/merge_requests/11/diffs?diff_id=56123&start_sha=9227656dc80c3106db53a3a9905d8b2a14eeabe9)

a3thakra commented

2021-05-24 01:17:33 -04:00

(Migrated from git.uwaterloo.ca)

This should be an article

a3thakra commented

2021-05-24 01:17:47 -04:00

(Migrated from git.uwaterloo.ca)

This should be a section.

a3thakra commented

2021-05-24 01:31:47 -04:00

(Migrated from git.uwaterloo.ca)

you should not prefix css classes with eventCard because we're using css modules. It automatically does that for us.

you should not prefix css classes with `eventCard` because we're using css modules. It automatically does that for us. ![image](/uploads/98d409a14047a8acc1c2e54d2f8af90b/image.png)

a3thakra commented

2021-05-24 01:32:10 -04:00

(Migrated from git.uwaterloo.ca)

this is actually a purple 2 on figma

a3thakra commented

2021-05-24 01:34:45 -04:00

(Migrated from git.uwaterloo.ca)

You shouldn't rely on this being a button. Use a class here instead. Look at how Button is implemented in !8.

a3thakra commented

2021-05-24 01:57:51 -04:00

(Migrated from git.uwaterloo.ca)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/csc/website/-/merge_requests/11/diffs?diff_id=56200&start_sha=297b310e33660379e04e31c2f67dab40a4585bcb#1a5bce3caef7b87cdf5e4c73a60b5e23b4c57cd6_29_28)

a3thakra commented

2021-05-24 01:57:52 -04:00

(Migrated from git.uwaterloo.ca)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/csc/website/-/merge_requests/11/diffs?diff_id=56200&start_sha=297b310e33660379e04e31c2f67dab40a4585bcb#1a5bce3caef7b87cdf5e4c73a60b5e23b4c57cd6_37_36)

a3thakra commented

2021-05-24 01:57:52 -04:00

(Migrated from git.uwaterloo.ca)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/csc/website/-/merge_requests/11/diffs?diff_id=56200&start_sha=297b310e33660379e04e31c2f67dab40a4585bcb#e6d872e4d909fd4c233e90c32652c4446830d686_23_23)

a3thakra commented

2021-05-24 01:57:52 -04:00

(Migrated from git.uwaterloo.ca)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/csc/website/-/merge_requests/11/diffs?diff_id=56200&start_sha=297b310e33660379e04e31c2f67dab40a4585bcb#e6d872e4d909fd4c233e90c32652c4446830d686_33_31)

a3thakra commented

2021-05-24 01:57:52 -04:00

(Migrated from git.uwaterloo.ca)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/csc/website/-/merge_requests/11/diffs?diff_id=56200&start_sha=297b310e33660379e04e31c2f67dab40a4585bcb#e6d872e4d909fd4c233e90c32652c4446830d686_19_19)

a3thakra commented

2021-05-24 01:57:53 -04:00

(Migrated from git.uwaterloo.ca)

added 1 commit

e2f02681 - Final fixes

Compare with previous version

added 1 commit <ul><li>e2f02681 - Final fixes</li></ul> [Compare with previous version](/csc/website/-/merge_requests/11/diffs?diff_id=56200&start_sha=297b310e33660379e04e31c2f67dab40a4585bcb)

a3thakra commented

2021-05-24 01:58:13 -04:00

(Migrated from git.uwaterloo.ca)

approved this merge request

a3thakra commented

2021-05-24 01:59:46 -04:00

(Migrated from git.uwaterloo.ca)

I just pushed e2f02681 to address the comments above. (They were pretty minor comments, so I went ahead and committed them to your branch :) )

Great job on the event card btw!

I just pushed e2f02681 to address the comments above. (They were pretty minor comments, so I went ahead and committed them to your branch :) ) Great job on the event card btw!

a3thakra commented

2021-05-24 02:00:03 -04:00

(Migrated from git.uwaterloo.ca)

enabled an automatic merge when the pipeline for e2f026811a succeeds

enabled an automatic merge when the pipeline for e2f026811aecf23c53e3d0a38edf58772e5be0e8 succeeds

a3thakra added this to the First Draft milestone 2021-07-11 16:29:49 -04:00

w25tran self-assigned this 2021-07-12 19:57:16 -04:00

w25tran added the

In Progress

label 2021-07-12 19:57:34 -04:00

w25tran referenced a pull request that will close this issue

2021-07-25 05:58:23 -04:00