fixed navbar

dailybruin · Dec 9, 2019 · a797cab · a797cab
1 parent 190804d
commit a797cab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/components/ArticleNav/ArticleNav.tsx b/src/components/ArticleNav/ArticleNav.tsx
@@ -43,8 +43,8 @@ export default class ArticleNav extends React.Component {
         <Wrapper>
           <PageTitle to="/">A Wasted Opportunity</PageTitle>
           <RightNav>
-            <NavItem to="/#ZeroWasteatUCLA">Zero Waste at UCLA</NavItem>
-            <NavItem to="/#ZeroWasteintheUCSystem">
+            <NavItem to="#ZeroWasteatUCLA">Zero Waste at UCLA</NavItem>
+            <NavItem to="#ZeroWasteintheUCSystem">
               Zero Waste in the UC System
             </NavItem>
           </RightNav>

diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
@@ -41,12 +41,12 @@ const Box = styled(Link)`
   flex-direction: row-reverse;
   background-color: #6d786a;
   width: 60%;
-  box-shadow: 0 0 5px 2px #282a2d;
+  box-shadow: 0 0 5px 0px #282a2d;
   margin: 10px;
   transition: 0.3s;
   text-decoration: none;
   &:hover {
-    box-shadow: 0 0 5px 3px #282a2d;
+    box-shadow: 0 0 5px 1.5px #282a2d;
   }
   @media only screen and (max-width: 800px) {
     width: 75%;
@@ -141,7 +141,6 @@ const BoxImage = styled('div')`
 
 interface CardProps {
   CategoryName: string
-  // TopicDesc: string
   Cards: {
     PageLink: string
     ImageURL: string
@@ -156,7 +155,7 @@ const TITLE_TO_LINK_MAPPING = {}
 export default class Card extends React.Component<CardProps> {
   render() {
     return (
-      <OutDiv>
+      <OutDiv id={this.props.CategoryName.replace(/\s/g, '')}>
         <p>{this.props.CategoryName}</p>
         {/* <Blurb>
           <p>{this.props.TopicDesc}</p>

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -67,6 +67,11 @@ const IndexPage = ({ data }) => (
       Explainer={data.kerckhoffArticle.Explainer}
     />
     <Page>
+      <div
+        className={css`
+          height: 100px;
+        `}
+      />
       {data.kerckhoffArticle.Categories.map(category => (
         <Card {...category} id={category.CategoryName.replace(' ', '')} />
       ))}

diff --git a/src/templates/article.tsx b/src/templates/article.tsx
@@ -55,13 +55,13 @@ const ArticlePage = ({ data }) => (
         Contributor={data.kerckhoffArticle.Author}
       />
       <Article
-        dropcap={true}
+        dropcap={false}
         content={data.kerckhoffArticle.content}
         style={css`
           color: #fffcf5;
-          max-width: 60%;
+          max-width: 50%;
           font-family: 'Arial';
-          line-height: 38px;
+          line-height: 25px;
           font-size: 1rem;
           min-width: 300px;
           /* background: #6d786a; */