Code

[WIP] Fixing Nav Bar merge#65

Code

Open

sarahhpeng wants to merge 22 commits intomaincalblueprint/phs:mainfrom fixing-nav-bar-mergecalblueprint/phs:fixing-nav-bar-mergeCopy head branch name to clipboard

+662-784

Commits

Commits on Apr 11, 2024

• done with popup styling

  

  miha-bhaskaran

  authored and

  oahnh

  committed
  3893b85

  Copy full SHA for 3893b85

• updated package lock for npm install

  

  sarahhpeng

  authored and

  oahnh

  committed
  15e2cd0

  Copy full SHA for 15e2cd0

• Revert "fix: remove formatting changes to media/queries.tsx"

  Show description for 2ecb503
  oahnh

  committed
  2ecb503

  Copy full SHA for 2ecb503

• cont. rebase

  oahnh

  committed
  57b4668

  Copy full SHA for 57b4668

• cont. rebase

  oahnh

  committed
  027bea8

  Copy full SHA for 027bea8

• rebase 3

  oahnh

  committed
  b292e54

  Copy full SHA for b292e54

• rebase 4

  oahnh

  committed
  fdaaddb

  Copy full SHA for fdaaddb

• refactor: add formatting changes

  oahnh

  committed
  25c618e

  Copy full SHA for 25c618e

• refactor: add jsdoc, imports, change queries.tsx -> .ts

  oahnh

  committed
  9d37b4e

  Copy full SHA for 9d37b4e

• edited to accomodate database changes for categories and exhibits

  jxmoose

  committed
  a0d3c1c

  Copy full SHA for a0d3c1c

Commits on Apr 12, 2024

• claire's approval

  miha-bhaskaran

  committed
  d484703

  Copy full SHA for d484703

Commits on Apr 21, 2024

• figma dev changes resolved

  miha-bhaskaran

  committed
  e28a546

  Copy full SHA for e28a546

• updated desktop version

  miha-bhaskaran

  committed
  b5fecb1

  Copy full SHA for b5fecb1

Commits on May 9, 2024

• finished all desktop feedback - delted display component (not using) changed navbar component to huntergreen

  miha-bhaskaran

  committed
  937ea21

  Copy full SHA for 937ea21

Commits on May 10, 2024

• done with claire's mobile edits

  miha-bhaskaran

  committed
  4ae3305

  Copy full SHA for 4ae3305

• Merge branch 'main' of github.com:calblueprint/phs into claire_fixes

  miha-bhaskaran

  committed
  83758b8

  Copy full SHA for 83758b8

Commits on May 14, 2024

• added working nav bar to mihas pr

  sarahhpeng

  committed
  e629b6c

  Copy full SHA for e629b6c

• fixed bracket issue in the siteMapPage

  sarahhpeng

  committed
  52fb463

  Copy full SHA for 52fb463

• filter button duplicated import statement

  sarahhpeng

  committed
  3fd6535

  Copy full SHA for 3fd6535

• changed hunterGreen to hunter-green for filter button

  sarahhpeng

  committed
  ac2f6ec

  Copy full SHA for ac2f6ec

• testing w-auto

  sarahhpeng

  committed
  1146cc1

  Copy full SHA for 1146cc1

• minor change

  sarahhpeng

  committed
  def3fdc

  Copy full SHA for def3fdc