Skip to content

**Merch Page Update** from committees branch#102

Open
shazebs wants to merge 28 commits into
mainfrom
committee
Open

**Merch Page Update** from committees branch#102
shazebs wants to merge 28 commits into
mainfrom
committee

Conversation

@shazebs

@shazebs shazebs commented Mar 4, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor

Summary of Changes

Resolves #81

  • Added new temporary images to showcase what the full merch page would look like.
  • Made the webpage responsive to different screen-sizes using media tags.
  • I took out the previously coded checkboxes in the filters section.
  • I took out the page navigation for viewing products.
  • I changed the color from purple to a more dark themed black and white with purple navbar.
  • Most of CSS is inline within the <style> tags.
  • Hardly any JavaScript was used, it was mostly just HTML and CSS.
  • Page uses a Google Fonts.

Imagery

  • The page uses 4 T-SHIRT models from the local images folder but the rest of the image url's were taken from the GCU Lopes Shop just as place-holder images

image

Additional Notes

  • n/a

shazebs and others added 28 commits November 18, 2021 18:55
@shazebs
Added: committee.js, committee.css, committee.html. Added images: img…
78441a2 
…1 and cyber_img. Added the main navbar to committee.html.
@shazebs
Worked on mobile responsiveness and inserting text content into main …
3be97ef 
…content div.
@shazebs
Fixed more css styling, adding more @media responsiveness, created a …
a9a664b 
…'highlightSelection' function, did some navbar @media responsiveness styling, and styled the committee text content paragraphs.
@elijaholmos
some js changes
4d832e7
@GCUCoding
Merge branch 'main' into committee
43b332a
@shazebs
showed max template committees page
25e75ff
@shazebs
Merge branch 'committee' of https://github.com/GCUCoders/Tech-Club-Site…
654b048 
… into committee
@shazebs
Merge branch 'main' into committee
2914dff
@shazebs
Added in comments (no serious code changes)
e4560fe
@shazebs
Merge branch 'main' into committee
6ec38c1
@shazebs
moved temp css from page to css file , added more comments
a399ade
@shazebs
Fixed minor bugs based mostly around page responsiveness and css styl…
25bb7a6 
…ing.
@shazebs
Merge branch 'main' into committee
bcd5082
@elijaholmos
Merge branch 'main' into committee
45da6f9
@shazebs
Merge branch 'main' into committee
e258452
@shazebs
Merge branch 'main' into committee
1f9dd12
@shazebs
Merge branch 'committee' of https://github.com/GCUCoders/Tech-Club-Site…
1a091e8 
… into committee
@shazebs
Updated committee.js page and fixed content height on committee.html
f416068
@shazebs
Fixed committee.js code to be more DOM appropriate
1ab5ec8
@shazebs
Fixed committee.js code to be more DOM appropriate
d261299
@shazebs
Merge branch 'main' into committee
fdd939d
@elijaholmos
Squashed commit of the following:
bf41b00 
commit 2699ed6
Author: Michael Duisenberg <53163559+MrDuise@users.noreply.github.com>
Date:   Thu Feb 17 17:55:59 2022 -0700

    About page - Update spelling (#97)

commit 70c7f90
Author: David Segovia Gutierrez <83076588+typhlosion64@users.noreply.github.com>
Date:   Thu Feb 10 17:09:40 2022 -0700

    admin panel template (#93)

commit 9cf363c
Author: Michael Duisenberg <53163559+MrDuise@users.noreply.github.com>
Date:   Mon Feb 7 20:33:51 2022 -0700

    New about (#92)

    * Redesign of About page

    Updated layout and CSS of about page

    * update footer

    * change the brightness of my img because it irked me

    * Added new leaders and updated css

    Co-authored-by: elijaholmos <eli.olmos9@gmail.com>

commit 4054025
Author: Kayla Currier <59896865+KCurrier1@users.noreply.github.com>
Date:   Mon Feb 7 18:03:52 2022 -0700

    Kaylas styling tweaks (#90)

    * Few Style Tweaks

    Deleted unused style sheets

    * More slight tweaks

commit a887448
Author: elijaholmos <eli.olmos9@gmail.com>
Date:   Mon Feb 7 17:53:13 2022 -0700

    refactor committee page to remove jquery
@elijaholmos
Revert "Squashed commit of the following:"
fa37575 
This reverts commit bf41b00.
@elijaholmos
fix images
0191583
@elijaholmos
Merge branch 'main' into committee
4b23b8b
@shazebs
Merge branch 'main' into committee
162d6c2
@shazebs
I changed up the entire "merch.html" doc.
46cf495 
Added images, changed CSS, and design of the page.
@shazebs
Merge branch 'committee' of https://github.com/GCUCoders/Tech-Club-Site…
44ffa0b 
… into committee
@shazebs shazebs added enhancement New feature or request frontend Frontend development labels Mar 4, 2022
@shazebs shazebs self-assigned this Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@elijaholmos elijaholmos Awaiting requested review from elijaholmos elijaholmos is a code owner
@GCUCoding GCUCoding Awaiting requested review from GCUCoding GCUCoding is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

@shazebs shazebs

Labels

enhancement New feature or request frontend Frontend development

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@shazebs @elijaholmos @GCUCoding