changed font family for event list

aleksivaisanen · Nov 15, 2019 · f480afb · f480afb
1 parent b54d11c
commit f480afb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/client/public/index.html b/client/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
     <link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Poppins:100,300,900&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Poppins:100,300,600,900&display=swap" rel="stylesheet">
 
     <meta
       name="viewport"

diff --git a/client/src/App.css b/client/src/App.css
@@ -51,6 +51,10 @@ a:hover, .card-footer a:hover {
 }
 
 /* Bootstrap overrides */
+.card {
+  border-radius: 0 !important;
+}
+
 .card-header {
   padding: .5rem 1rem;
   cursor: pointer;
@@ -187,6 +191,14 @@ a:hover, .card-footer a:hover {
   margin: 2px 5px;
 }
 
+.eventlist-container  {
+  font-family: 'Poppins', sans-serif;
+}
+
+.eventlist-container b {
+  font-weight: 600;
+}
+
 @media only screen and (max-width: 769px) {
   .counter-number {
     font-size: 6rem;

diff --git a/client/src/components/EventList.js b/client/src/components/EventList.js
@@ -67,7 +67,7 @@ class EventList extends Component {
         const futureEvents = events.filter(event => { return this.isFuture(new Date(event.date)) })
 
         return (
-            <Container className="my-5 pt-5">
+            <Container className="my-5 pt-5 eventlist-container">
                 {events.length === 0 &&
                     <h3 className="text-center my-3">Ei tapahtumia!</h3>
                 }

diff --git a/client/src/components/Footer.js b/client/src/components/Footer.js
@@ -14,7 +14,7 @@ class Footer extends Component {
                     <Row>
                         <Col md={6} className="d-flex flex-row justify-content-center align-items-end">
                             <img className="guild-logo" src={digit} alt="Digit ry"/>
-                            <div className="d-flex flex-column justify-content-left">
+                            <div className="d-flex flex-column justify-content-left" style={{width: '170px'}}>
                                 <div className="d-flex flex-row justify-content-left align-items-center">
                                     <a href="https://fi-fi.facebook.com/digitry/" className="social-media-link">
                                         <img className="social-media" src={fb} alt="Digit ry Facebook" /> @digitry    
@@ -34,7 +34,7 @@ class Footer extends Component {
                         </Col>
                         <Col md={6} className="d-flex flex-row justify-content-center align-items-end">
                             <img className="guild-logo" src={nucleus} alt="Nucleus ry"/>
-                            <div className="d-flex flex-column justify-content-left">
+                            <div className="d-flex flex-column justify-content-left" style={{width: '170px'}}>
                                 <div className="d-flex flex-row justify-content-left align-items-center">
                                     <a href="https://fi-fi.facebook.com/Nucleusry/" className="social-media-link">
                                         <img className="social-media" src={fb} alt="Nucleus ry Facebook" /> @Nucleusry