Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to design + next.js implementation #7

Merged
merged 62 commits into from
Apr 28, 2017
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
272d813
integrate updates and refinements
Mar 14, 2017
8a6e234
Adapt code style
rgbkrk Mar 14, 2017
8dc837b
remove unused dependencies
rgbkrk Mar 15, 2017
89c239e
bump dependencies
rgbkrk Mar 15, 2017
8e2a2a1
prefetch nteract.github.io, move up
rgbkrk Mar 15, 2017
42e5c3e
remove unused navigation component
rgbkrk Mar 15, 2017
7eee94f
extract buttons as components
rgbkrk Mar 15, 2017
db1a690
built out kernels, desktop pages and abstracted out a new component f…
Mar 17, 2017
187a85f
Extract a themeColor property for c/head/head
rgbkrk Mar 17, 2017
3e65232
make kernels pages all keep the same header
rgbkrk Mar 17, 2017
93a995f
created a working mobile menu
Mar 17, 2017
ded85f9
Merge branch 'updates-next' of github.com:nteract/nteract.io into upd…
Mar 17, 2017
5b78b8d
fix mobile menu bugs and adjust kernel page titles
Mar 17, 2017
8a721b0
minor mobile menu bugs
Mar 17, 2017
0c7645b
replace filler text with real prose
rgbkrk Mar 19, 2017
aae10c8
prep download button featurette
rgbkrk Mar 19, 2017
4f94f33
extract DownloadFeaturette
rgbkrk Mar 19, 2017
1f455c4
don't show mac as other when mac chosen
rgbkrk Mar 19, 2017
3117761
move desktop page header into desktop
rgbkrk Mar 20, 2017
4628de8
cleanup imports
rgbkrk Mar 20, 2017
e7e30d5
Introduce context type
rgbkrk Mar 20, 2017
1a7aa9f
extract platform detection
rgbkrk Mar 20, 2017
67aadfe
include comment for server vs. client side
rgbkrk Mar 20, 2017
0666abe
remove unused styles
rgbkrk Mar 20, 2017
acfc9c0
fold main into home
rgbkrk Mar 20, 2017
45a920f
bring home into index.js
rgbkrk Mar 20, 2017
1514208
share os detection types across pages
rgbkrk Mar 20, 2017
124d800
propagate platform through
rgbkrk Mar 20, 2017
5f82707
fall back on navigator when necessary
rgbkrk Mar 20, 2017
0ee927c
trim up the text
rgbkrk Mar 20, 2017
d89f59c
link to the latest release
rgbkrk Mar 20, 2017
7562258
more flow, prettier
rgbkrk Mar 20, 2017
e9320a2
sneak in about and atom
rgbkrk Mar 20, 2017
e318906
rearrange, recolorize
rgbkrk Mar 20, 2017
2b24959
Add initial content for Atom page
lgeiger Mar 21, 2017
2e0343a
Add styling for links
lgeiger Mar 21, 2017
f03c463
Atom: Alternate images and text content
lgeiger Mar 21, 2017
b71fe18
Change Atom page title
lgeiger Mar 21, 2017
0cf2b33
Fix styling for alternating content
lgeiger Mar 21, 2017
6d28ae1
Atom: Add inspector section
lgeiger Mar 24, 2017
5b8c7a1
Atom: Use <img/> instead of <image/>
lgeiger Mar 24, 2017
f88c59e
refinements
Mar 27, 2017
40dcfe6
resolve conflicts
Mar 27, 2017
032febd
updates to overall site, abstract out theme color for each page, adju…
Mar 29, 2017
2f4a002
updates to kernels page and more testing
Apr 27, 2017
19010fe
update deps and about page for deployment"
Apr 27, 2017
4f0b799
include the raw data from github
rgbkrk Apr 27, 2017
e98de7c
create single pages for kernels
Apr 27, 2017
58b8d9b
Merge branch 'updates-next' of github.com:nteract/nteract.io into upd…
Apr 27, 2017
253274d
refine kernels sub-pages
Apr 27, 2017
467d558
update button class
Apr 27, 2017
86073e0
bump nteract members
rgbkrk Apr 27, 2017
52c3e0b
take out overexplanatory text
rgbkrk Apr 27, 2017
23ddb16
bump nteract-members
rgbkrk Apr 27, 2017
594fbcd
update about page
rgbkrk Apr 27, 2017
754fc29
Atom: Use lower res videos
lgeiger Apr 27, 2017
1f8334d
Contributors: Show github login if name is not available
lgeiger Apr 27, 2017
8744b02
Fix social media button position
lgeiger Apr 27, 2017
c567fb5
Clean up R segment
rgbkrk Apr 28, 2017
4ce0656
Merge pull request #11 from nteract/update-r-text
rgbkrk Apr 28, 2017
35d878d
Merge pull request #10 from lgeiger/social-buttons
rgbkrk Apr 28, 2017
a46f3d6
Merge pull request #9 from lgeiger/gh-login
rgbkrk Apr 28, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 35 additions & 22 deletions components/content-section/content-section.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,41 @@ import React from "react";
import styles from "./content-section.scss";
import inView from "in-view";

export default class ContentSection extends React.Component {
constructor(props) {
super(props);
}
export class ContentSectionPane extends React.Component {

componentDidMount() {
inView.offset(50);
inView(".inview").on("enter", el => {
if (!el.classList.contains("showing")) {
el.classList.add("showing");
}
});
}

render() {
return (
<section className="content-section">
<style dangerouslySetInnerHTML={{ __html: styles }} />
<div className="content-section-wrapper inview">
{this.props.children}
</div>
</section>
);
}
render() {

return (<div className={`pane-50 pane ${this.props.layout ? this.props.layout : ""}`}>
{this.props.children}
</div>);
}
}

export class ContentSection extends React.Component {
constructor(props) {
super(props);
}

componentDidMount() {
inView.offset(50);
inView(".inview").on("enter", el => {
if (!el.classList.contains("showing")) {
el.classList.add("showing");
}
});
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we listen to events we'll want to remove the event listener on unmount.


render() {
return (
<section className="content-section">
<style dangerouslySetInnerHTML={{__html: styles}}/>
<div className="content-section-wrapper inview">
<div className="panes center-vertically">
{this.props.children}
</div>
</div>
</section>
);
}
}
11 changes: 11 additions & 0 deletions components/content-section/content-section.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ section{
}

.pane {

&.center{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
text-align: center;
p{
max-width:580px;
}
}
&:first-child {
padding-right: $gutter;

Expand Down
9 changes: 7 additions & 2 deletions components/head/head.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @flow
import React from "react";
import Head from "next/head";

import mdi from '../../static/mdi/css/materialdesignicons.css';
type HeadProps = {
pageTitle: string,
themeColor: string
Expand All @@ -23,7 +23,11 @@ export default (
<link rel="dns-prefetch" href="//nteract.io/" />
<link rel="dns-prefetch" href="//nteract.github.io/" />

<link




<link
rel="apple-touch-icon"
sizes="57x57"
href="https://nteract.github.io/assets/images/icons/apple-icon-57x57.png"
Expand Down Expand Up @@ -157,5 +161,6 @@ export default (
/>

<meta name="theme-color" content={themeColor} />
<style dangerouslySetInnerHTML={{__html: mdi}}/>
</Head>
);
5 changes: 4 additions & 1 deletion components/header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ class Header extends React.Component {
}

render() {
const headerStyleHack = {
color: this.props.themeColor
};
const MobileMenu = () => (
<div className={`mobile-menu ${this.state.mobileMenuOpen? 'is-active' : ''}`}>
<div className="close-button" onClick={this.handleClick.bind(this)}>
Expand All @@ -46,7 +49,7 @@ class Header extends React.Component {
return (
<div>
<style dangerouslySetInnerHTML={{ __html: styles }}/>
<Headroom>
<Headroom style={headerStyleHack}>
<header className="header-main">
<div className="header-main-wrapper">
<div className="header-main-section">
Expand Down
20 changes: 17 additions & 3 deletions components/header/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
top: 0;
height: $header-height;
display: flex;
z-index: 900;
z-index: 2000;
color: #c8d4e5;


&-wrapper { // .header-main-wrapper
@include global-wrapper;
flex: 1;
Expand Down Expand Up @@ -61,9 +62,22 @@
&-wrapper {
position: absolute;
width: 100%;
z-index:999;
}
&--pinned {
background-color: rgba($main-color, 0.95);

&:before{
position: absolute;
top:0;
left:0;
width: 100%;
height:100%;
z-index:-1;
content: '';
background: currentColor;
opacity:0.85;
}

}
position: absolute;
}
Expand Down Expand Up @@ -112,7 +126,7 @@
top: 0;
height: 100vh;
width: 100%;
background-color: $main-color;
background-color: currentColor;
background-image: url(https://nteract.github.io/assets/images/hero_header_bg@2x.png);
background-position: top center;
background-attachment: fixed;
Expand Down
8 changes: 4 additions & 4 deletions components/kernels/kernel-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Head from "next/head";
import LanguageToggle from "../kernels/language-toggle";

import Layout from "../layout/layout";
import ContentSection from "../content-section/content-section";
import { ContentSection } from "../content-section/content-section";
import PageHeader from "./page-header";

export type KernelPageProps = {
Expand All @@ -17,12 +17,12 @@ export const kernels = [
{ name: "node.js", path: "/kernels/node" }
];

export default (props: KernelPageProps) => (
<Layout pageTitle={`: kernels - ${props.language}`}>
export default (props: KernelPageProps, themeColor: '#444') => (
<Layout pageTitle={`: kernels - ${props.language}`} themeColor={themeColor}>
<Head>
<link rel="stylesheet" href="/static/kernels.css" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note about next's <Head> -- these get appended to any prior <Head> entries. 😄

</Head>
<PageHeader />
<PageHeader themeColor={themeColor} />
<ContentSection>
<header>
<LanguageToggle current={props.language} kernels={kernels} />
Expand Down
4 changes: 2 additions & 2 deletions components/kernels/page-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
PageHeaderRight
} from "../page-header/page-header";

export default () => (
<PageHeader color="#353a79">
export default (themeColor) => (
<PageHeader themeColor={themeColor}>
<PageHeaderLeft>
<PageHeaderTitle>Kernels</PageHeaderTitle>
<p>
Expand Down
28 changes: 17 additions & 11 deletions components/layout/layout.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
import React from 'react'
import Head from '../head/head'
import Header from '../header/header'
import Footer from '../footer/footer'
import styles from './layout.scss'


export default ({children, pageTitle}) => (
<div className="layout">
<style dangerouslySetInnerHTML={{__html: styles}}/>
export default class Layout extends React.Component {

<Head pageTitle={pageTitle}/>
<Header />
<div className="page">
{ children }
</div>
<Footer />
</div>
)
render() {
return (
<div className="layout">
<style dangerouslySetInnerHTML={{__html: styles}}/>

<Head pageTitle={this.props.pageTitle}/>
<Header themeColor={this.props.themeColor}/>
<div className="page">
{ this.props.children }
</div>
<Footer />
</div>
);
}
}
2 changes: 1 addition & 1 deletion components/page-header/page-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class PageHeader extends React.Component {
render() {
return (
<section className="page-header" style={{
backgroundColor: this.props.color
backgroundColor: this.props.themeColor
}}>
<style dangerouslySetInnerHTML={{ __html: styles }} />
<div className="page-header-wrapper">
Expand Down
3 changes: 2 additions & 1 deletion components/page-header/page-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ $timing-animation-delay: $timing-animation/2;
overflow: hidden;
&-wrapper {
@include global-wrapper;
color: lighten($main-color, 45%);
color: rgba(white, 0.5);
font-weight:300;
display: flex;
justify-content: space-between;
padding-top:$gutter*2;
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"babel-plugin-wrap-in-js": "^1.1.0",
"glob": "7.1.1",
"in-view": "^0.6.1",
"next": "^2.0.0-beta",
"mdi": "^1.8.36",
"next": "^2.0.0",
"node-sass": "^4.4.0",
"normalize-scss": "^6.0.0",
"postcss-easy-import": "2.0.0",
Expand Down
Loading