tiny CSS update and deployment url change

master
Flejk 3 years ago
parent b34daa4c09
commit c75ed15b6e

@ -10,7 +10,7 @@
## Currently deployed at: ## 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: ## TO DO:

@ -1,17 +1,32 @@
/* <--- Imports ---> */
import * as React from "react" import * as React from "react"
import Layout from '../statComponents/Layout';
import { Link } from "gatsby" 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 = () => { const NotFoundPage = () => {
return ( return (
<Layout pageTitle="Ooops... Obsah nenalezen"> <Layout>
<h2>Ooops... Obsah nenalezen</h2> <Helmet htmlAttributes={{ lang: 'cs',}}>
<p>Sorry{" "} <meta charSet="utf-8" />
<span role="img" aria-label="Pensive emoji"> <title>Ooops... - Studentská oborová rada IT PedF UK v Praze</title>
😔 <meta name="viewport" content="width=device-width, initial-scale=1" />
</span>{" "} <meta name="theme-color" content="#000000" />
</p> <link rel="icon" href={favicon}/>
<Link to="/"><em>Vrátit na domovskou stránku</em></Link> <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> </Layout>
) )
} }

@ -1,6 +1,13 @@
/* <--- Imports ---> */
import React from "react" import React from "react"
import { graphql } from "gatsby" 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({ export default function Template({
data, // this prop will be injected by the GraphQL query below. 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 { markdownRemark } = data // data.markdownRemark holds your post data
const { frontmatter, html } = markdownRemark const { frontmatter, html } = markdownRemark
return ( 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 <div
className="mainContent" className="mainContent"
dangerouslySetInnerHTML={{ __html: html }} dangerouslySetInnerHTML={{ __html: html }}

@ -43,7 +43,8 @@ ul.shapeShiftBar li{
line-height: 60px; line-height: 60px;
display: inline-block; display: inline-block;
position: relative; position: relative;
padding: 2em; padding-left: 2em;
padding-right: 2em;
} }
ul.shapeShiftBar li:hover{ ul.shapeShiftBar li:hover{
@ -239,13 +240,12 @@ a[href^="mailto"] {
} }
.SpinLogo { .SpinLogo {
padding: 15px; padding: 20px;
} }
} }
@media print { @media print {
.mainContent {background-color: transparent; padding: 0; margin: 0;} .mainContent {background-color: transparent; padding: 0; margin: 0; width: 96%;}
.topNavBar {display: none;} .topNavBar {display: none;}
aside {display:none;} aside {display:none;}
.bottomBar {display: none;} .bottomBar {display: none;}

@ -1,5 +1,8 @@
/* <--- Imports ---> */
import { Link } from 'gatsby'; import { Link } from 'gatsby';
import React from 'react'; import React from 'react';
/* <--- Resources ---> */
import logoSORIT from '../resources/logoSORIT.svg'; import logoSORIT from '../resources/logoSORIT.svg';
import znakUK from '../resources/UKZnakTransparent.png'; import znakUK from '../resources/UKZnakTransparent.png';
import znakUKHover from '../resources/UKZnakTransparentHover.png'; import znakUKHover from '../resources/UKZnakTransparentHover.png';
@ -10,7 +13,7 @@ const BottomBar = () => {
<li> <li>
<ul className="bottomBar"> <ul className="bottomBar">
<li> <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>
<li> <li>
<ul className="bottomNav"> <ul className="bottomNav">
@ -53,8 +56,8 @@ const BottomBar = () => {
</li> </li>
<li className="logoCuni"> <li className="logoCuni">
<a href="https://www.cuni.cz" className="card"> <a href="https://www.cuni.cz" className="card">
<img src={znakUK} alt="Znak Karlovy Univerzity" width="80" className="img-bot"/> <img src={znakUK} alt="Znak Karlovy Univerzity" width="70" className="img-bot"/>
<img src={znakUKHover} alt="Znak Karlovy Univerzity" width="80" className="img-top" /> <img src={znakUKHover} alt="Znak Karlovy Univerzity" width="70" className="img-top" />
</a> </a>
</li> </li>
</ul> </ul>

@ -1,48 +1,33 @@
/* <--- Imports ---> */ /* <--- Imports ---> */
import { Helmet } from "react-helmet" import React from 'react'
import BottomBar from './BottomBar'
import React from 'react'; import SideContactBar from './SideContactBar'
import BottomBar from './BottomBar'; import TopNavBar from './TopNavBar'
import SideContactBar from './SideContactBar';
import TopNavBar from './TopNavBar';
/* <--- Resources ---> */ /* <--- Resources ---> */
import '../resources/style.css'
import '../resources/style.css';
import favicon from '../resources/favicon.ico'
import logo192 from '../resources/logo192.png'
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> const Layout = ({ children }) => {
<TopNavBar /> return (
{/* ---TO DO: Banner--- */} <div className="Layout">
</header> <header>
<TopNavBar />
{/* ---TO DO: Banner--- */}
</header>
<div className="FeedWrap"> <div className="FeedWrap">
{children}
{children} <SideContactBar />
</div>
<SideContactBar /> <footer>
</div> <hr/>
<BottomBar />
</footer>
</div>
)
}
<footer> export default Layout
<hr/>
<BottomBar />
</footer>
</div>
)
}
export default Layout

@ -1,3 +1,4 @@
/* <--- Imports ---> */
import React from 'react'; import React from 'react';
const SideContactBar = () => { const SideContactBar = () => {

@ -1,6 +1,9 @@
import React from 'react'; /* <--- Imports ---> */
import { Link } from 'gatsby'; import React from 'react'
import logoSORIT from '../resources/logoSORIT.svg'; import { Link } from 'gatsby'
/* <--- Resources ---> */
import logoSORIT from '../resources/logoSORIT.svg'
const TopNavBar = () => { const TopNavBar = () => {

Loading…
Cancel
Save