From c75ed15b6ee005b7de1d005bbcb270d82a6ac56d Mon Sep 17 00:00:00 2001
From: Flejk <snowflake@cocaine.ninja>
Date: Thu, 1 Jul 2021 19:08:02 +0200
Subject: [PATCH] tiny CSS update and deployment url change

---
 README.md                                     |  2 +-
 src/pages/404.js                              | 33 +++++++---
 .../{MarkdownRemark.frontmatter__slug}.js     | 19 +++++-
 src/resources/style.css                       |  8 +--
 src/statComponents/BottomBar.js               |  9 ++-
 src/statComponents/Layout.js                  | 63 +++++++------------
 src/statComponents/SideContactBar.js          |  1 +
 src/statComponents/TopNavBar.js               |  9 ++-
 8 files changed, 83 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index 2b957c1..dd21a86 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 ## Currently deployed at:
 
-<a href="https://romantic-yonath-0742bf.netlify.app/" style="text-decoration: none;">romantic-yonath-0742bf.netlify.app/</a>
+<a href="https://sor-it.netlify.app/" style="text-decoration: none;">sor-it.netlify.app/</a>
 
 ## TO DO:
 
diff --git a/src/pages/404.js b/src/pages/404.js
index 90a8caa..5e64f51 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,17 +1,32 @@
+
+/* <--- Imports ---> */
 import * as React from "react"
-import Layout from '../statComponents/Layout';
 import { Link } from "gatsby"
+import { Helmet } from "react-helmet"
+import Layout from '../statComponents/Layout'
+
+/* <--- Resources ---> */
+import favicon from '../resources/favicon.ico'
+import logo192 from '../resources/logo192.png'
+
 
 const NotFoundPage = () => {
   return (
-      <Layout pageTitle="Ooops... Obsah nenalezen">
-        <h2>Ooops... Obsah nenalezen</h2>
-        <p>Sorry{" "}
-          <span role="img" aria-label="Pensive emoji">
-            😔
-          </span>{" "}
-        </p>
-        <Link to="/"><em>Vrátit na domovskou stránku</em></Link>
+      <Layout>
+        <Helmet htmlAttributes={{ lang: 'cs',}}>
+          <meta charSet="utf-8" />
+          <title>Ooops... - Studentská oborová rada IT PedF UK v Praze</title>
+          <meta name="viewport" content="width=device-width, initial-scale=1" />
+          <meta name="theme-color" content="#000000" />
+          <link rel="icon" href={favicon}/>
+          <link rel="apple-touch-icon" href={logo192} />
+        </Helmet>
+        <div className="mainContent" >
+          <h2>Ooops... Obsah nenalezen</h2>
+            <p>
+              <Link to="/"><em>Vrátit na domovskou stránku</em></Link>
+            </p>
+        </div>
       </Layout>
   )
 }
diff --git a/src/pages/{MarkdownRemark.frontmatter__slug}.js b/src/pages/{MarkdownRemark.frontmatter__slug}.js
index feb8abc..97ebb15 100644
--- a/src/pages/{MarkdownRemark.frontmatter__slug}.js
+++ b/src/pages/{MarkdownRemark.frontmatter__slug}.js
@@ -1,6 +1,13 @@
+/* <--- Imports ---> */
 import React from "react"
 import { graphql } from "gatsby"
-import Layout from '../statComponents/Layout';
+import { Helmet } from "react-helmet"
+import Layout from '../statComponents/Layout'
+
+
+/* <--- Resources ---> */
+import favicon from '../resources/favicon.ico'
+import logo192 from '../resources/logo192.png'
 
 export default function Template({
   data, // this prop will be injected by the GraphQL query below.
@@ -8,7 +15,15 @@ export default function Template({
   const { markdownRemark } = data // data.markdownRemark holds your post data
   const { frontmatter, html } = markdownRemark
   return (
-    <Layout pageTitle={frontmatter.pageTitle}>
+   <Layout>
+      <Helmet htmlAttributes={{ lang: 'cs',}}>
+        <meta charSet="utf-8" />
+        <title>{frontmatter.pageTitle} - Studentská oborová rada IT PedF UK v Praze</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name="theme-color" content="#000000" />
+        <link rel="icon" href={favicon}/>
+        <link rel="apple-touch-icon" href={logo192} />
+      </Helmet>
         <div
           className="mainContent"
           dangerouslySetInnerHTML={{ __html: html }}
diff --git a/src/resources/style.css b/src/resources/style.css
index f024841..a1289b4 100644
--- a/src/resources/style.css
+++ b/src/resources/style.css
@@ -43,7 +43,8 @@ ul.shapeShiftBar li{
   line-height: 60px;
   display: inline-block;
   position: relative;
-  padding: 2em;
+  padding-left: 2em;
+  padding-right: 2em;
 }
 
 ul.shapeShiftBar li:hover{
@@ -239,13 +240,12 @@ a[href^="mailto"] {
   }
 
   .SpinLogo {
-    padding: 15px;
+    padding: 20px;
   }
-
 }
 
 @media print {
-  .mainContent {background-color: transparent; padding: 0; margin: 0;}
+  .mainContent {background-color: transparent; padding: 0; margin: 0; width: 96%;}
   .topNavBar {display: none;}
   aside {display:none;}
   .bottomBar {display: none;}
diff --git a/src/statComponents/BottomBar.js b/src/statComponents/BottomBar.js
index 62ea14e..3a9d1f6 100644
--- a/src/statComponents/BottomBar.js
+++ b/src/statComponents/BottomBar.js
@@ -1,5 +1,8 @@
+/* <--- Imports ---> */
 import { Link } from 'gatsby';
 import React from 'react';
+
+/* <--- Resources ---> */
 import logoSORIT from '../resources/logoSORIT.svg';
 import znakUK from '../resources/UKZnakTransparent.png';
 import znakUKHover from '../resources/UKZnakTransparentHover.png';
@@ -10,7 +13,7 @@ const BottomBar = () => {
             <li>
                 <ul className="bottomBar">
                     <li>
-                        <Link to="/"><img src={logoSORIT} className="SpinLogo" alt="Logo Oborové rady IT" width="80"/></Link>
+                        <Link to="/"><img src={logoSORIT} className="SpinLogo" alt="Logo Oborové rady IT" width="70"/></Link>
                     </li>
                     <li>
                         <ul className="bottomNav">
@@ -53,8 +56,8 @@ const BottomBar = () => {
                     </li>
                     <li className="logoCuni">
                         <a href="https://www.cuni.cz" className="card">
-                            <img src={znakUK} alt="Znak Karlovy Univerzity" width="80" className="img-bot"/>
-                            <img src={znakUKHover} alt="Znak Karlovy Univerzity" width="80" className="img-top" />
+                            <img src={znakUK} alt="Znak Karlovy Univerzity" width="70" className="img-bot"/>
+                            <img src={znakUKHover} alt="Znak Karlovy Univerzity" width="70" className="img-top" />
                         </a>
                     </li>
                 </ul>
diff --git a/src/statComponents/Layout.js b/src/statComponents/Layout.js
index 57ae7a7..5ff85d3 100644
--- a/src/statComponents/Layout.js
+++ b/src/statComponents/Layout.js
@@ -1,48 +1,33 @@
 /* <--- Imports ---> */
-import { Helmet } from "react-helmet"
-
-import React from 'react';
-import BottomBar from './BottomBar';
-import SideContactBar from './SideContactBar';
-import TopNavBar from './TopNavBar';
-
+import React from 'react'
+import BottomBar from './BottomBar'
+import SideContactBar from './SideContactBar'
+import TopNavBar from './TopNavBar'
 
 /* <--- Resources ---> */
-
-import '../resources/style.css';
-import favicon from '../resources/favicon.ico'
-import logo192 from '../resources/logo192.png'
+import '../resources/style.css'
 
 
-  const Layout = ({ pageTitle, children }) => {
-    return (
-        <div className="Layout">
-          <Helmet>
-            <meta charSet="utf-8" />
-            <title>{pageTitle} - Studentská oborová rada IT PedF UK v Praze</title>
-            <meta name="viewport" content="width=device-width, initial-scale=1" />
-            <meta name="theme-color" content="#000000" />
-            <link rel="icon" href={favicon}></link>
-            <link rel="apple-touch-icon" href={logo192} />
-          </Helmet>
 
-          <header>
-            <TopNavBar />
-            {/* ---TO DO: Banner--- */}
-          </header>
+const Layout = ({ children }) => {
+  return (
+      <div className="Layout">
+        <header>
+          <TopNavBar />
+          {/* ---TO DO: Banner--- */}
+        </header>
 
-          <div className="FeedWrap">
-
-            {children}
+        <div className="FeedWrap">
+          {children}
+          <SideContactBar />
+        </div>
 
-            <SideContactBar />
-          </div>
+        <footer>
+          <hr/>
+          <BottomBar />
+        </footer>
+      </div>
+  )
+}
 
-          <footer>
-            <hr/>
-            <BottomBar />
-          </footer>
-        </div>
-    )
-  }
-  export default Layout
+export default Layout
diff --git a/src/statComponents/SideContactBar.js b/src/statComponents/SideContactBar.js
index d3fe1fb..b8560e2 100644
--- a/src/statComponents/SideContactBar.js
+++ b/src/statComponents/SideContactBar.js
@@ -1,3 +1,4 @@
+/* <--- Imports ---> */
 import React from 'react';
 
 const SideContactBar = () => {
diff --git a/src/statComponents/TopNavBar.js b/src/statComponents/TopNavBar.js
index 2162a33..eaefe66 100644
--- a/src/statComponents/TopNavBar.js
+++ b/src/statComponents/TopNavBar.js
@@ -1,6 +1,9 @@
-import React from 'react';
-import { Link } from 'gatsby';
-import logoSORIT from '../resources/logoSORIT.svg';
+/* <--- Imports ---> */
+import React from 'react'
+import { Link } from 'gatsby'
+
+/* <--- Resources ---> */
+import logoSORIT from '../resources/logoSORIT.svg'
 
 
 const TopNavBar = () => {