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.

Sign up for GitHub

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

Visual and Style Fixes #136

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Visual and Style Fixes #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"react-icons": "^4.10.1",
"react-remark": "^2.1.0",
"react-router-dom": "^5.1.2",
"react-scripts": "^5.0.0"
"react-scripts": "^5.0.1"
},
"scripts": {
"start": "react-app-rewired start",
Expand Down
5 changes: 5 additions & 0 deletions src/components/Header/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@
p {
font-weight: @semi-bold;
}

h4 {
font-weight: @semi-bold;;
color: white;
}

}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ function Header() {
onClick={() => {
logoutUser();
setUser(defaultUser);
message.success('Logged out');

history.push('/');
}}
>
<p>Login</p>
<h4>Login</h4>
</Button>
</Link>
)}
Expand Down
16 changes: 14 additions & 2 deletions src/components/MainFooter/index.tsx
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the footer has the gradient bar added, why is the gradient also added directly in EventsPage/index.tsx?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MainFooter component was not used for EventsPage which I think is because the Events Page has some customized content they are displaying at the footer, while all the rest of the pages use the same content for the footer, do you want me to change so that the MainFooter would take in parameter for the content of the footer?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm can we move the events page footer info to a different format (similar to the homepage) and add the MainFooter? that way we can standardize the footer component across the site
image

Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@ import React from 'react';
import './index.less';
import { AiOutlineLink } from 'react-icons/ai';
import { BiLogoInstagram, BiLogoDiscord } from 'react-icons/bi';
const { Footer } = Layout;
import '../../newStyles/components.less'
const { Footer, Content } = Layout;

const MainFooter = () => {
interface MainFooterProps {
isMainPage: boolean;
}

// const MainFooter = (isMainPage: boolean) => {
const MainFooter: React.FC<MainFooterProps> = ({ isMainPage }) => {
return (
<>
<Content>
<div className=" gradient-bar"></div>
</Content>
{/* <Footer className={`mainFooter ${isMainPage ? '' : 'gradient-bar'}`}> */}
<Footer className="mainFooter">
<Row className="splitRow">
<Col className="infoText">
Expand Down Expand Up @@ -110,6 +121,7 @@ const MainFooter = () => {

<h3>ACM AI at UCSD 2023</h3>
</Footer>
</>
);
};

Expand Down
12 changes: 6 additions & 6 deletions src/components/ProjectCard/index.less
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the responsiveness of this. Might be better to follow devpost's style of limiting the title and description text instead?
image

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
flex-direction: row;
align-items: center;


.projectQuarter {
font-weight: @semi-bold;
margin-left: 1rem;
Expand All @@ -19,10 +19,8 @@

.ProjectCard {
border: none;

@media screen and (max-width: @md) {
height: 100% !important/* Adjusted width for smaller screens */
}
overflow: scroll;
height:50vh !important;

.title {
font-weight: @semi-bold;
Expand All @@ -38,6 +36,7 @@
.descriptionBox {
display: flex;
align-items: center;
flex-grow: 1;
justify-content: flex-start;
border-radius: 10px;
margin: 1rem 0 2rem 0;
Expand All @@ -46,7 +45,7 @@
/* webkit attributes supported in 93% of all browsers*/
-webkit-line-clamp: 2; /* Limit the number of lines to 2 */
-webkit-box-orient: vertical;
overflow: hidden;
height:100%;
p {
margin: 0;
white-space: normal;
Expand Down Expand Up @@ -152,6 +151,7 @@
.description {
margin: 1rem;
}


}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/AboutPage/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
}

h4 {
margin-top: 1rem;
font-weight: @semi-bold;
}

Expand Down Expand Up @@ -210,7 +211,6 @@
background: white;
height: 35px;
width: 35px;
box-shadow: 0px 3px 5px 1px rgba(189, 189, 189, 0.5);
}

a {
Expand Down
6 changes: 3 additions & 3 deletions src/pages/AboutPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ function AboutPage() {
/>
</Content>

<MainFooter />
<MainFooter isMainPage={false}/>
</Content>

{isDrawerVisible && (
Expand All @@ -265,7 +265,7 @@ function AboutPage() {
>
<div className="drawerContent">
<Col>
<Row className="drawerHeader">
<Row className="drawerHeader" gutter={[16, { xs: 8, sm: 16, md: 24, lg: 32 }]}>
<img
style={{
marginRight: '1rem',
Expand All @@ -280,7 +280,7 @@ function AboutPage() {
alt={`profile of ${selectedPerson!!.name}`}
/>
<Col className="titleBox">
<Tag bordered={false} color={'error'}>
<Tag bordered={false} color={'error'} >
{selectedPerson!!.role}
</Tag>
<h4>{selectedPerson!!.name}</h4>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/CompetitionsPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ function CompetitionsPage(props: any) {
</div>
</Content>

<MainFooter />
<MainFooter isMainPage={false}/>
</Content>
</DefaultLayout>
);
Expand Down
4 changes: 4 additions & 0 deletions src/pages/EventsPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ function EventsPage(props: any) {
></Tabs>
</Content>

<Content>
<div className=" gradient-bar"></div>
</Content>

<Footer className="eventsFooter">
<Row className="row">
<Col>
Expand Down
8 changes: 3 additions & 5 deletions src/pages/MainPage/index.tsx
View file
Open in desktop
angelatsai1214 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function MainPage() {

<Content className="homeHeader">
<div className="homeHeaderContent">
<h1 className="homeTitle">ACM AI</h1>
<h1 className="homeTitle">ACM AI<br></br>at UC San Diego</h1>
<h4>
We aspire to inspire the next generation of AI advocates,
engineers, and scientists.
Expand Down Expand Up @@ -185,11 +185,9 @@ function MainPage() {
</div>
</Content>

<Content>
<div className="homeBottomBar"></div>
</Content>


<MainFooter />
<MainFooter isMainPage={true} />
</Content>
</DefaultLayout>
);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ProjectsPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ function ProjectsPage() {
</Content>
</Content>

<MainFooter />
<MainFooter isMainPage={false}/>
</Content>
</DefaultLayout>
);
Expand Down