flejk
/
sor-it-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tiny CSS update and deployment url change

Browse Source
master
Flejk 4 years ago
parent b34daa4c09
commit c75ed15b6e
8 changed files with 83 additions and 61 deletions
Show Stats Download Patch File Download Diff File

2
README.md
Unescape Escape View File

@ -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:

33
src/pages/404.js
Unescape Escape View File

@ -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>
)
}

19
src/pages/{MarkdownRemark.frontmatter__slug}.js
Unescape Escape View File

@ -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 }}

8
src/resources/style.css
Unescape Escape View File

@ -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;}

9
src/statComponents/BottomBar.js
Unescape Escape View File

@ -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>

63
src/statComponents/Layout.js
Unescape Escape View File

@ -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

1
src/statComponents/SideContactBar.js
Unescape Escape View File

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

9
src/statComponents/TopNavBar.js
Unescape Escape View File

@ -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 = () => {

Write Preview
Loading…
Cancel
Save