diff --git a/app/components/Navigation/Navigation.js b/app/components/Navigation/Navigation.js index b025f9d..7cc1319 100644 --- a/app/components/Navigation/Navigation.js +++ b/app/components/Navigation/Navigation.js @@ -75,7 +75,7 @@ function NavItem(props: NavItemProps) { return {props.children} } -const MENU_WIDTH = 1395; +const MENU_WIDTH = 1420; class Navigation extends React.Component { diff --git a/app/pages/Partners/Partners.js b/app/pages/Partners/Partners.js index 89844b2..d068963 100644 --- a/app/pages/Partners/Partners.js +++ b/app/pages/Partners/Partners.js @@ -226,7 +226,7 @@ function Partners() {
- + diff --git a/app/pages/Program/Program.js b/app/pages/Program/Program.js index 486f20c..8212ec8 100644 --- a/app/pages/Program/Program.js +++ b/app/pages/Program/Program.js @@ -11,6 +11,7 @@ import Page from '../../components/Page/Page'; import { Grid, Row, Col } from 'react-flexbox-grid'; import { Circle, CheckCircle } from 'react-feather'; import * as React from 'react'; +import { PlayCircle } from 'react-feather'; import Button from '../../components/Button/Button.js'; import { Container, Heading, LargeHeading, SmallHeading } from '../../components/page'; import { Block, Header, Content, P } from '../../components/block'; @@ -94,6 +95,7 @@ function SessionItem(props: SessionItemProps) { + {props.session.video ? : null} {props.session.title} diff --git a/app/pages/Program/Program.less b/app/pages/Program/Program.less index e63232a..f9d843d 100644 --- a/app/pages/Program/Program.less +++ b/app/pages/Program/Program.less @@ -175,4 +175,25 @@ .text-wrap { white-space: pre-wrap; +} + +.program-details-video { + width: 100%; + height: 600px; + @media only screen and (max-width: @screen-md) { + height: 450px; + } + @media only screen and (max-width: @screen-sm) { + height: 350px; + } + @media only screen and (max-width: @screen-xs) { + height: 300px; + } + @media only screen and (max-width: @screen-xxs) { + height: 240px; + } +} + +.program-video-icon { + margin-right: 0.7rem; } \ No newline at end of file diff --git a/app/pages/Program/ProgramDetails.js b/app/pages/Program/ProgramDetails.js index 3c991df..4f14465 100644 --- a/app/pages/Program/ProgramDetails.js +++ b/app/pages/Program/ProgramDetails.js @@ -69,6 +69,7 @@ class ProgramDetails extends React.Component Program details -
+
) } else { return ( {title} + {video ?
+ +
: null}
-

+

{abstract}

{speakers ? speakers.map(speaker => { return -

+

{speaker.bio}

@@ -107,17 +112,17 @@ class ProgramDetails extends React.Component -

+

{room}

-

+

{language === 'en' ? 'English' : 'Norwegian'}

-

+

{format}

Tickets for employees (Late-Bird) NOK 6.190,-