Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Community and Competition Icon Redesign #147

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
11 changes: 6 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^24.0.0",
"@types/node": "^12.20.55",
"@types/react": "^16.9.0",
"@types/react": "^16.14.62",
"@types/react-dom": "^16.9.0",
"@types/react-router-dom": "^5.1.3",
"antd": "^5.8.2",
Expand Down
5 changes: 5 additions & 0 deletions public/ai_diamond.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/aimlpath.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/comp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/cyber_diamond.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/design_diamond.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/diamond_bottom_left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions public/diamond_top_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/elementai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/elemental.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/energium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/hack_diamond.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/hns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/home_icon_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/nnm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/project.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/team.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/temp_comp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/trophy_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/wavy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import CompetitionSpecificTeamPage from './pages/Competitions/CompetitionTeamPag
import CompetitionAllTeamsPage from './pages/Competitions/CompetitionTeamPages/AllTeamsPage';
import CompetitionLeaderboardPage from './pages/Competitions/CompetitionLeaderboardPage';
import CompetitionSubmissionDetailsPage from './pages/Competitions/CompetitionTeamPages/SubmissionDetailsPage';

import LoggedInMainPage from './pages/LoggedInMainPage';
import NotFoundPage from './pages/404Page';

import ProjectPage from './pages/ProjectsPage/index';
Expand Down Expand Up @@ -108,6 +108,9 @@ function App() {
<UserProvider value={{ user: user, setUser: setUser }}>
<Switch>
<Route path="/" exact component={MainPage} />
<Route path="/testLoggedInMain" exact component={LoggedInMainPage} />


<Route path="/about" exact component={AboutPage} />
<Route path="/competitions" exact component={CompetitionsPage} />
<Route path="/alumni" exact component={AlumniPage} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/MainFooter/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
justify-content: space-between;
flex-wrap: wrap;

// pargraph text on left side of split row
// paragraph text on left side of split row
.infoText {
width: 50%;

Expand Down
5 changes: 4 additions & 1 deletion src/components/Statistic/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
font-size: @font4;
line-height: @font4;
font-weight: @semi-bold;
@media only screen and (max-width: @xs) {
font-size: @font5;
}
}

.description {
display: block;
font-size: @font2;
@media only screen and (max-width: @xs) {
font-size: 14px;
font-size: @font4;
}
font-weight: @regular;
line-height: 32.25px;
Expand Down
Loading