Skynet/ldap_frontend
7
0
Fork 0
Code Issues3 Pull requests1 Projects Releases Packages Wiki Activity Actions

Resolve "Styling of the website" #12

Merged
eoghanconlon73 merged 41 commits from 2-styling-of-the-website into main 2023-09-18 11:29:03 +00:00
Conversation 12 Commits 41 Files changed 8 +378 -74
eoghanconlon73 commented 2023-08-05 16:01:46 +00:00 (Migrated from gitlab.skynet.ie)

Closes

Closes #2
eoghanconlon73 commented 2023-08-05 16:01:46 +00:00 (Migrated from gitlab.skynet.ie)

assigned to @eoghanconlon73

assigned to @eoghanconlon73
eoghanconlon73 commented 2023-08-05 17:17:30 +00:00 (Migrated from gitlab.skynet.ie)

added 4 commits

  • 70a4284b - Merging styling into new branch based on most up to date branch of main
  • 05f71c10 - Feat. Adding image of sharky
  • c151c02d - Fix. Stylesheet ref now matches this iteration
  • 570347c4 - Fix. Sharky image now saved as a .svg rather than a .png

Compare with previous version

added 4 commits <ul><li>70a4284b - Merging styling into new branch based on most up to date branch of main</li><li>05f71c10 - Feat. Adding image of sharky</li><li>c151c02d - Fix. Stylesheet ref now matches this iteration</li><li>570347c4 - Fix. Sharky image now saved as a .svg rather than a .png</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=60&start_sha=82ce64688931294f990ca45875e5c939fe66afd2)
eoghanconlon73 commented 2023-08-06 16:44:22 +00:00 (Migrated from gitlab.skynet.ie)

added 1 commit

  • ee7c6446 - Fix. Backgrounds colour set for password reset and modify options

Compare with previous version

added 1 commit <ul><li>ee7c6446 - Fix. Backgrounds colour set for password reset and modify options</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=72&start_sha=570347c497deec72fec4aa637a4f80f56df4a402)
eoghanconlon73 commented 2023-08-07 18:05:24 +00:00 (Migrated from gitlab.skynet.ie)

added 4 commits

  • ee7c6446...476ab143 - 3 commits from branch main
  • dbfb7438 - Merge branch 'main' into '2-styling-of-the-website'

Compare with previous version

added 4 commits <ul><li>ee7c6446...476ab143 - 3 commits from branch <code>main</code></li><li>dbfb7438 - Merge branch &#39;main&#39; into &#39;2-styling-of-the-website&#39;</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=107&start_sha=ee7c6446622db7712afd66ada4c84f1859805979)
eoghanconlon73 commented 2023-08-08 14:58:10 +00:00 (Migrated from gitlab.skynet.ie)

added 4 commits

  • d5bcd29e - Adding something to try help with setting options in a grid
  • 8ffad7fb - Webpage created for test
  • 427b4cf2 - [Test] Removing test files
  • c9cbc1d4 - Items now centered on webpage

Compare with previous version

added 4 commits <ul><li>d5bcd29e - Adding something to try help with setting options in a grid</li><li>8ffad7fb - Webpage created for test</li><li>427b4cf2 - [Test] Removing test files</li><li>c9cbc1d4 - Items now centered on webpage</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=110&start_sha=dbfb7438e2e3c7ad1bc0c407e324af98e37ad6ef)
eoghanconlon73 commented 2023-08-08 16:19:11 +00:00 (Migrated from gitlab.skynet.ie)

added 7 commits

  • 740686b4 - Header one and image in title div are now in their box
  • e5b5b626 - Background changed from solid colour to image
  • 08e689be - Removing title div from boxes class as it doesn't affect anything
  • 9b441d0f - Fix. Title bar now displays on one line if window is wide enough
  • 59ee34f6 - Simplifying CSS to make it more uniform between the options
  • 7b4d02b1 - Adding a gap between the options
  • af419064 - Colour suggestions from using this...

Compare with previous version

added 7 commits <ul><li>740686b4 - Header one and image in title div are now in their box</li><li>e5b5b626 - Background changed from solid colour to image</li><li>08e689be - Removing title div from boxes class as it doesn&#39;t affect anything</li><li>9b441d0f - Fix. Title bar now displays on one line if window is wide enough</li><li>59ee34f6 - Simplifying CSS to make it more uniform between the options</li><li>7b4d02b1 - Adding a gap between the options</li><li>af419064 - Colour suggestions from using this...</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=111&start_sha=c9cbc1d49a0f728f8bf718f5e50ad496376140ff)
eoghanconlon73 commented 2023-09-08 15:29:48 +00:00 (Migrated from gitlab.skynet.ie)

added 17 commits

  • af419064...947124c3 - 15 commits from branch main
  • cba1a33b - Merge branch '2-styling-of-the-website' into 'merge-main-to-styling'
  • bf18821e - Merge branch 'merge-main-to-styling' into '2-styling-of-the-website'

Compare with previous version

added 17 commits <ul><li>af419064...947124c3 - 15 commits from branch <code>main</code></li><li>cba1a33b - Merge branch &#39;2-styling-of-the-website&#39; into &#39;merge-main-to-styling&#39;</li><li>bf18821e - Merge branch &#39;merge-main-to-styling&#39; into &#39;2-styling-of-the-website&#39;</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=169&start_sha=af41906468fae35fd31db474294a764c84e7a2f0)
eoghanconlon73 commented 2023-09-11 12:20:30 +00:00 (Migrated from gitlab.skynet.ie)

added 21 commits

  • bf18821e...272ae7a1 - 11 earlier commits
  • f2e45e36 - Adding title and form information to the modify page
  • 575de8df - Fix. Table is an id not a class
  • 5dcc5663 - Adding form information to the password reset page
  • 1794dceb - Adding stylesheet to the register page
  • 815e1148 - Adding title to register page
  • d4f75a25 - Adding title to register page
  • 12b1ecd2 - Adding the boxes div to the register form
  • 6d07efc4 - Making the register form into a table
  • 8cec75b2 - Fix. Form title now matches what it is
  • 2e72c1de - Keeping the page specific css inside the style tags

Compare with previous version

added 21 commits <ul><li>bf18821e...272ae7a1 - 11 earlier commits</li><li>f2e45e36 - Adding title and form information to the modify page</li><li>575de8df - Fix. Table is an id not a class</li><li>5dcc5663 - Adding form information to the password reset page</li><li>1794dceb - Adding stylesheet to the register page</li><li>815e1148 - Adding title to register page</li><li>d4f75a25 - Adding title to register page</li><li>12b1ecd2 - Adding the boxes div to the register form</li><li>6d07efc4 - Making the register form into a table</li><li>8cec75b2 - Fix. Form title now matches what it is</li><li>2e72c1de - Keeping the page specific css inside the style tags</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=171&start_sha=bf18821e339596e5f317dc3514a6f129fd0b47a1)
eoghanconlon73 commented 2023-09-17 17:42:01 +00:00 (Migrated from gitlab.skynet.ie)

marked this merge request as ready

marked this merge request as **ready**
eoghanconlon73 commented 2023-09-18 11:18:53 +00:00 (Migrated from gitlab.skynet.ie)

added 1 commit

Compare with previous version

added 1 commit <ul><li>c9e91ba1 - Code standardisation</li></ul> [Compare with previous version](/compsoc1/skynet/ldap/frontend/-/merge_requests/2/diffs?diff_id=178&start_sha=2e72c1deaf41162ba68e06afee7aef22c712b303)
eoghanconlon73 (Migrated from gitlab.skynet.ie) closed this pull request 2023-09-18 11:25:25 +00:00
eoghanconlon73 (Migrated from gitlab.skynet.ie) reopened this pull request 2023-09-18 11:28:39 +00:00
eoghanconlon73 commented 2023-09-18 11:29:00 +00:00 (Migrated from gitlab.skynet.ie)

Feck, I closed in error

Feck, I closed in error
eoghanconlon73 (Migrated from gitlab.skynet.ie) merged commit 4d6b8a01f0 into main 2023-09-18 11:29:03 +00:00
eoghanconlon73 commented 2023-09-18 11:29:04 +00:00 (Migrated from gitlab.skynet.ie)

mentioned in commit 4d6b8a01f0

mentioned in commit 4d6b8a01f0091bc2e10db04f7ccabd396817c21d
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Skynet/ldap_frontend#12
No description provided.
Delete branch "2-styling-of-the-website"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?