Merge branch 'dev' into add-news-page
# Conflicts: # src/pages/Page.tsx
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 18 additions, 58 deletions.gitlab-ci.yml
- Dockerfile 1 addition, 1 deletionDockerfile
- README.md 0 additions, 8 deletionsREADME.md
- docker-compose.dev.yml 0 additions, 29 deletionsdocker-compose.dev.yml
- src/App.tsx 1 addition, 1 deletionsrc/App.tsx
- src/components/Footer.tsx 218 additions, 1 deletionsrc/components/Footer.tsx
- src/components/svg/DevTeamIcon.tsx 44 additions, 0 deletionssrc/components/svg/DevTeamIcon.tsx
- src/components/svg/SchdesignIcon.tsx 46 additions, 0 deletionssrc/components/svg/SchdesignIcon.tsx
- src/context/ThemeProvider.tsx 4 additions, 5 deletionssrc/context/ThemeProvider.tsx
- src/pages/Page.tsx 16 additions, 20 deletionssrc/pages/Page.tsx
- src/setupProxy.js 1 addition, 1 deletionsrc/setupProxy.js
- src/styles/darkTheme.ts 6 additions, 19 deletionssrc/styles/darkTheme.ts
- src/styles/lightTheme.ts 24 additions, 0 deletionssrc/styles/lightTheme.ts
- src/styles/material-ui.d.ts 10 additions, 0 deletionssrc/styles/material-ui.d.ts
- src/styles/styled-components.d.ts 0 additions, 0 deletionssrc/styles/styled-components.d.ts
Loading
Please register or sign in to comment