Merge branch 'ArtPage' into 'master' (10b1100d) · Commits · Anne Mosvold Ørke / Prosjekt 2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Prosjekt 2
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

10b1100d

Commit 10b1100d authored 4 years ago by Edvard Dønvold Sjøborg

Downloads
- Plain Diff

Merge branch 'ArtPage' into 'master'

Art page

See merge request it2810-h20/team-75/prosjekt-2!16

parents 9ff42df1 98606505

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

frontend/package-lock.json 22 additions, 0 deletions

frontend/package-lock.json
frontend/src/Components/ArtPage.tsx 1 addition, 0 deletions

frontend/src/Components/ArtPage.tsx
frontend/src/Components/FavoriteButton.tsx 2 additions, 2 deletions

frontend/src/Components/FavoriteButton.tsx
frontend/src/Components/LandingPage.tsx 3 additions, 0 deletions

frontend/src/Components/LandingPage.tsx
frontend/src/Components/NavButton.tsx 1 addition, 1 deletion

frontend/src/Components/NavButton.tsx
frontend/src/Style/ArtPage.css 75 additions, 28 deletions

frontend/src/Style/ArtPage.css
frontend/src/Style/DropDown.css 6 additions, 6 deletions

frontend/src/Style/DropDown.css
frontend/src/Style/LandingPage.css 94 additions, 14 deletions

frontend/src/Style/LandingPage.css
frontend/src/Style/MainPage.css 34 additions, 1 deletion

frontend/src/Style/MainPage.css

with 238 additions and 52 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment