Skip to content

Commit

Permalink
fix: remove antd and fix some styles
Browse files Browse the repository at this point in the history
  • Loading branch information
tc-imba committed Mar 19, 2022
1 parent 7b33cc1 commit d4f11f3
Show file tree
Hide file tree
Showing 7 changed files with 3,470 additions and 4,250 deletions.
4 changes: 3 additions & 1 deletion example/content/research/diretide/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ title: "Dire Tide 2020"
tags:
- "dota2"
- "game"
- "moba"
- "event"
date: 2020-10-04
venue: DOTA2
venue: a very very very very long long long long long long venue
authors:
- name: "Valve"
url: "https://www.valvesoftware.com/"
Expand Down
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"gatsby": "^3.14.0",
"gatsby-theme-academic": "*",
"gatsby-theme-academic": "2.0.0-alpha.1",
"react": "^16.14.0",
"react-dom": "^16.14.0"
}
Expand Down
1 change: 0 additions & 1 deletion gatsby-theme-academic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"academicons": "^1.9.1",
"antd": "^4.16.13",
"autocomplete.js": "^0.38.0",
"canvas": "^2.8.0",
"classnames": "^2.3.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Col, Row } from 'rsuite';
import { Col, FlexboxGrid } from 'rsuite';
import { useStaticQuery, graphql } from 'gatsby';
import _ from 'lodash';
import React from 'react';
Expand Down Expand Up @@ -64,15 +64,15 @@ const SelectedResearch = () => {
return (data.allMdx && data.allMdx.edges && data.allMdx.edges.length) ? (
<div className={styles.homepageSection}>
<h2 style={{ marginBottom: '1rem' }}>Selected Research</h2>
<Row gutter={[20, 20]}>
<FlexboxGrid fluid className="spacing-grid">
{data.allMdx &&
data.allMdx.edges.map((val, key) => (
// eslint-disable-next-line react/no-array-index-key
<Col key={key} xs={24} sm={24} md={24} lg={24}>
<FlexboxGrid.Item as={Col} xs={24} sm={24} md={24} lg={24}>
<ResearchCard data={val} tagsMap={tagsMap} />
</Col>
</FlexboxGrid.Item>
))}
</Row>
</FlexboxGrid>
</div>
) : (
<></>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,14 @@ const SidebarWrapper = (props) => {
}
return (
<>
<Container className={`${style.content} ${style.background}`}>
<Content className={`${style.content} ${style.background}`}>
<Container className={`${style.content}`}>
<Content className={`${style.content}`}>
<FlexboxGrid style={{ marginBottom: '4rem' }}>
<FlexboxGrid.Item as={Col} xs={24} sm={24} md={8} lg={7} className={style.sidebarContent}>
{domContent}
</FlexboxGrid.Item>
<FlexboxGrid.Item as={Col} xs={24} sm={24} md={16} lg={17}>
<Container className={`${style.background} ${style.boxContent} borderRadiusSection`}>
<Container className={`${style.boxContent} borderRadiusSection`}>
{children}
</Container>
</FlexboxGrid.Item>
Expand All @@ -183,10 +183,10 @@ export const Sidebar404 = (props) => {
const { children } = props;
return (
<Container>
<Content className={`${style.content} ${style.background} `}>
<Content className={`${style.content}`}>
<Row type="flex">
<Col sm={24} md={24} lg={24}>
<Container className={`${style.background} ${style.boxContent} ${style.sideBar404Radius}`}>
<Container className={`${style.boxContent} ${style.sideBar404Radius}`}>
{children}
</Container>
</Col>
Expand Down
4 changes: 2 additions & 2 deletions gatsby-theme-academic/src/components/ResearchCard/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ const ResearchCard = (props) => {
<FlexboxGrid>
{authors ? authors.map(generateAuthor) : null}
</FlexboxGrid>
<Stack divider={<Divider vertical className={style.divider} />}>
<Stack wrap divider={<Divider vertical className={style.divider} />}>
{infoLine}
</Stack>
<a href={Utils.generateFullUrl(siteMetadata, url)}>
<p style={{ marginTop: '1rem' }} dangerouslySetInnerHTML={{ __html: excerptHTML }} />
</a>
{links && links.length ? (
<Stack wrap spacing={6} style={{ marginTop: '1rem' }}>
<Stack wrap spacing={6} style={{ marginTop: '1rem'}}>
{links.map(generateLink) }
</Stack>
) : null}
Expand Down
Loading

0 comments on commit d4f11f3

Please sign in to comment.