diff --git a/src/assets/facebookLogo.png b/src/assets/facebookLogo.png new file mode 100644 index 0000000..16ebc1d Binary files /dev/null and b/src/assets/facebookLogo.png differ diff --git a/src/assets/githubLogo.png b/src/assets/githubLogo.png new file mode 100644 index 0000000..9962ab2 Binary files /dev/null and b/src/assets/githubLogo.png differ diff --git a/src/assets/logoMini.png b/src/assets/logoMini.png new file mode 100644 index 0000000..26181c7 Binary files /dev/null and b/src/assets/logoMini.png differ diff --git a/src/assets/slackLogo.png b/src/assets/slackLogo.png new file mode 100644 index 0000000..086ed3d Binary files /dev/null and b/src/assets/slackLogo.png differ diff --git a/src/components/Bio.js b/src/components/Bio.js index 87173f0..f47c111 100644 --- a/src/components/Bio.js +++ b/src/components/Bio.js @@ -1,11 +1,8 @@ -import React from 'react' +import React from 'react'; -// Import typefaces -import 'typeface-montserrat' -import 'typeface-merriweather' +import profilePic from './profile-pic.jpg'; -import profilePic from './profile-pic.jpg' -import { rhythm } from '../utils/typography' +import styles from './Bio.module.css'; class Bio extends React.Component { render() { @@ -13,17 +10,13 @@ class Bio extends React.Component {
{`Kyle

@@ -34,8 +27,8 @@ class Bio extends React.Component {

- ) + ); } } -export default Bio +export default Bio; diff --git a/src/components/Bio.module.css b/src/components/Bio.module.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js index d5fbce9..38d75f0 100644 --- a/src/components/Footer/Footer.js +++ b/src/components/Footer/Footer.js @@ -1,25 +1,21 @@ import React from 'react'; -import MainContainer from '../MainContainer/MainContainer'; +import FooterTop from '../Footer/FooterTop/FooterTop'; +import FooterMiddle from '../Footer/FooterMiddle/FooterMiddle'; import FooterBottom from '../Footer/FooterBottom/FooterBottom'; -import './Footer.css'; + +import styles from './Footer.module.css'; export default function Footer() { return (
-
- - Miss - +
+
-
- - Muss - +
+
-
- - - +
+
); diff --git a/src/components/Footer/Footer.css b/src/components/Footer/Footer.module.css similarity index 91% rename from src/components/Footer/Footer.css rename to src/components/Footer/Footer.module.css index 1ed8375..b0d4412 100644 --- a/src/components/Footer/Footer.css +++ b/src/components/Footer/Footer.module.css @@ -2,7 +2,7 @@ background-color: #1d73be; height: 300px; } -.footerMid { +.footerMiddle { background-color: #2b5aa2; height: 180px; } diff --git a/src/components/Footer/FooterBottom/FooterBottom.js b/src/components/Footer/FooterBottom/FooterBottom.js index cb25aa8..37314a2 100644 --- a/src/components/Footer/FooterBottom/FooterBottom.js +++ b/src/components/Footer/FooterBottom/FooterBottom.js @@ -1,17 +1,18 @@ import React from 'react'; import MainContainer from '../../MainContainer/MainContainer'; -import './FooterBottom.css'; + +import styles from './FooterBottom.module.css'; export default function FooterBottom() { return ( -
-
+
+ -
+ diff --git a/src/components/Footer/FooterBottom/FooterBottom.css b/src/components/Footer/FooterBottom/FooterBottom.module.css similarity index 62% rename from src/components/Footer/FooterBottom/FooterBottom.css rename to src/components/Footer/FooterBottom/FooterBottom.module.css index 7fac49e..342dbeb 100644 --- a/src/components/Footer/FooterBottom/FooterBottom.css +++ b/src/components/Footer/FooterBottom/FooterBottom.module.css @@ -7,10 +7,13 @@ font-weight: 300; } -.links { +.footerBottomContainer > .links { display: flex; align-self: center; } -.links > a { +.footerBottomContainer > .links > a { margin-right: 1.5em; +} +.footerBottomContainer > .links > a:last-child { + margin-right: 0; } \ No newline at end of file diff --git a/src/components/Footer/FooterMiddle/FooterMiddle.js b/src/components/Footer/FooterMiddle/FooterMiddle.js new file mode 100644 index 0000000..6da1a0d --- /dev/null +++ b/src/components/Footer/FooterMiddle/FooterMiddle.js @@ -0,0 +1,54 @@ +import React from 'react'; +import MainContainer from '../../MainContainer/MainContainer'; + +import styles from './FooterMiddle.module.css'; +import logoMini from './../../../assets/logoMini.png'; +import githubLogo from './../../../assets/githubLogo.png'; +import facebookLogo from './../../../assets/facebookLogo.png'; +import slackLogo from './../../../assets/slackLogo.png'; + +export default function FooterMiddle() { + return ( + +
+
+
+
+ logo +
+
+ ItalianCoders +
+
+
+ Il blog italiano per eccellenza
sullo sviluppo software
+
+
+ logo + logo + logo +
+
+
+ +
+
+
+ ); +} diff --git a/src/components/Footer/FooterMiddle/FooterMiddle.module.css b/src/components/Footer/FooterMiddle/FooterMiddle.module.css new file mode 100644 index 0000000..eea7925 --- /dev/null +++ b/src/components/Footer/FooterMiddle/FooterMiddle.module.css @@ -0,0 +1,64 @@ +.footerMiddleContainer { + display: flex; + justify-content: space-between; + align-items: center; + height: 180px; + color: #fff; + text-align: center; +} + +.info { +} + +.infoTitle { + display: flex; + justify-content: center; +} + +.infoDescription { + font-weight: 300; + line-height: 1.3em; +} + +.infoSocial { + margin-top: 1em; +} +.infoSocial > a { + margin-right: 1em; +} +.infoSocial > a:last-child { + margin-right: 0; +} +.infoSocial > a > img { + height: 30px; +} + +.infoNav { + display: flex; + flex-direction: row; + font-weight: 300; +} +.infoNav > div { + margin-right: 5em; +} +.infoNav > div:last-child { + margin-right: 0; +} + +.infoMenu { + display: flex; + flex-direction: column; + margin-top: .5em; +} +.infoMenu > a { + line-height: 1.3em; + margin-top: .5em; + text-align: right; + -webkit-transition: color .2s ease-out; + -moz-transition: color .2s ease-out; + -o-transition: color .2s ease-out; + transition: color .2s ease-out; +} +.infoMenu > a:hover { + color: #d5e8ff; +} \ No newline at end of file diff --git a/src/components/Footer/FooterTop/FooterTop.js b/src/components/Footer/FooterTop/FooterTop.js new file mode 100644 index 0000000..3ff4a12 --- /dev/null +++ b/src/components/Footer/FooterTop/FooterTop.js @@ -0,0 +1,12 @@ +import React from 'react'; +import MainContainer from '../../MainContainer/MainContainer'; + +import styles from './FooterTop.module.css'; + +export default function FooterMiddle() { + return ( + + Miss + + ); +} \ No newline at end of file diff --git a/src/components/Footer/FooterTop/FooterTop.module.css b/src/components/Footer/FooterTop/FooterTop.module.css new file mode 100644 index 0000000..9753ac3 --- /dev/null +++ b/src/components/Footer/FooterTop/FooterTop.module.css @@ -0,0 +1,8 @@ +.footerTopContainer { + display: flex; + justify-content: space-between; + align-items: center; + height: 180px; + color: #fff; + text-align: center; +} \ No newline at end of file diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index f29765e..eb8a3ac 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -1,21 +1,21 @@ import React from 'react'; -import './Header.css'; +import styles from './Header.module.css'; import logo from './../../assets/logo.png'; export default function () { return ( -
-
-
- ;Programmazione - peopleAutori +
+
+ -
+
logo
-
- +
+
diff --git a/src/components/Header/Header.css b/src/components/Header/Header.module.css similarity index 100% rename from src/components/Header/Header.css rename to src/components/Header/Header.module.css diff --git a/src/components/MainContainer/MainContainer.js b/src/components/MainContainer/MainContainer.js index 8fbd8e5..b8d76c3 100644 --- a/src/components/MainContainer/MainContainer.js +++ b/src/components/MainContainer/MainContainer.js @@ -1,9 +1,10 @@ import React from 'react'; -import './MainContainer.css'; + +import styles from './MainContainer.module.css'; export default function MainContainer({ children }) { return ( -
+
{children}
); diff --git a/src/components/MainContainer/MainContainer.css b/src/components/MainContainer/MainContainer.module.css similarity index 100% rename from src/components/MainContainer/MainContainer.css rename to src/components/MainContainer/MainContainer.module.css diff --git a/src/layouts/index.css b/src/layouts/index.css index aaeab8a..09333a1 100644 --- a/src/layouts/index.css +++ b/src/layouts/index.css @@ -24,7 +24,7 @@ input { padding: 5px; } -.material-icons { +.materialIcons { font-family: 'Material Icons'; font-weight: normal; font-style: normal; diff --git a/src/layouts/index.js b/src/layouts/index.js index 3b0c800..56c8e15 100644 --- a/src/layouts/index.js +++ b/src/layouts/index.js @@ -4,10 +4,10 @@ import React from 'react'; import Helmet from 'react-helmet'; -import './index.css'; import Header from '../components/Header/Header'; import Footer from '../components/Footer/Footer'; +import './index.css'; import favicon from '../assets/favicon.png'; class Template extends React.Component { diff --git a/src/templates/blog-post.js b/src/templates/blog-post.js index 1231b3d..2331443 100644 --- a/src/templates/blog-post.js +++ b/src/templates/blog-post.js @@ -4,7 +4,6 @@ import Link from 'gatsby-link' import get from 'lodash/get' import Bio from '../components/Bio' -import { rhythm, scale } from '../utils/typography' class BlogPostTemplate extends React.Component { render() { diff --git a/src/utils/typography.js b/src/utils/typography.js index bfd348e..b48ba73 100644 --- a/src/utils/typography.js +++ b/src/utils/typography.js @@ -1,19 +1,19 @@ -import Typography from 'typography' -import Wordpress2016 from 'typography-theme-wordpress-2016' +import Typography from 'typography'; +import Wordpress2016 from 'typography-theme-wordpress-2016'; Wordpress2016.overrideThemeStyles = () => ({ 'a.gatsby-resp-image-link': { boxShadow: 'none', }, -}) +}); -delete Wordpress2016.googleFonts +delete Wordpress2016.googleFonts; -const typography = new Typography(Wordpress2016) +const typography = new Typography(Wordpress2016); // Hot reload typography in development. if (process.env.NODE_ENV !== 'production') { - typography.injectStyles() + typography.injectStyles(); } -export default typography +export default typography;