Skip to content

Commit

Permalink
Merge pull request #66 from acm-ucr/Fuyuki/Mobile-Event
Browse files Browse the repository at this point in the history
Fuyuki/Mobile-Responsiveness-Event
  • Loading branch information
menthy-wu authored Nov 11, 2023
2 parents 01e4343 + 2a2efc5 commit 468fcf4
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nextjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"
- name: Setup Pages
uses: actions/configure-pages@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16.14.2"
node-version: "18"
- run: npm ci
- run: npm run check
lint:
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16.14.2"
node-version: "18"
- run: npm ci
- run: npm run eslint
build:
Expand All @@ -38,6 +38,6 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16.14.2"
node-version: "18"
- run: npm ci
- run: npm run build
90 changes: 45 additions & 45 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 @@ -14,7 +14,7 @@
},
"dependencies": {
"bootstrap": "^5.3.0",
"next": "^13.5.4",
"next": "^14.0.2",
"react": "^18.2.0",
"react-bootstrap": "^2.8.0",
"react-dom": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/home/Event.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Event = ({ start, end, location, name, descripton, color }) => {
return (
<div className="bg-ewb-blue-100 flex w-full font-bold">
<div
className={`text-4xl text-white text-center w-1/6 aspect-square flex flex-col items-center justify-center ${COLORS[color].bg}`}
className={`text-4xl text-white text-center w-1/2 md:w-1/6 aspect-square flex flex-col items-center justify-center ${COLORS[color].bg}`}
>
<div>{start.toString().split(" ")[1]}</div>
<div>{start.getDate()}</div>
Expand All @@ -18,7 +18,7 @@ const Event = ({ start, end, location, name, descripton, color }) => {
<div className="p-3 w-5/6 text-ewb-black ">
<div className={`text-2xl ${COLORS[color].text}`}>{name}</div>
<div className="text-base">{location}</div>
<div className="text-base font-normal">{descripton}</div>
<div className="text-sm md:text-base font-normal">{descripton}</div>
</div>
</div>
);
Expand Down

0 comments on commit 468fcf4

Please sign in to comment.