From 45b0c6ecb7da085c41f2fd35b7d2512467fc7f69 Mon Sep 17 00:00:00 2001 From: Lukas Brabec Date: Jan 11 2019 14:01:55 +0000 Subject: timeline design change --- diff --git a/src/Blockers.js b/src/Blockers.js index c846fbb..7ec3249 100644 --- a/src/Blockers.js +++ b/src/Blockers.js @@ -1,80 +1,84 @@ import React, { Component } from 'react'; -import { Row} from 'reactstrap'; +import { Row } from 'reactstrap'; class Blockers extends Component { - constructor(props) { - super(props); - this.state = { blockerbugs: {}, release: 0 }; - } + constructor(props) { + super(props); + this.state = { blockerbugs: {}, release: 0 }; + } - componentDidMount() { - fetch(this.props.apiurl + 'blockerbugs') - .then(data => { - return data.json(); - }) - .then(data => { - console.log(data); - this.setState({ - blockerbugs: data.blockerbugs, - release: data.release - }); - }); - } - render() { - if(this.state.blockerbugs) - return ( -
- -
Fedora {this.state.release} blockers and FEs
-
- -
- - - - - - - - - - - - - - - - - - -
Beta
Proposed Blockers{this.state.blockerbugs.beta_blockers_proposed}
Accepted Blockers{this.state.blockerbugs.beta_blockers}
Proposed FEs{this.state.blockerbugs.beta_fe_proposed}
Accepted FEs{this.state.blockerbugs.beta_fe}
-
+ componentDidMount() { + fetch(this.props.apiurl + 'blockerbugs') + .then(data => { + return data.json(); + }) + .then(data => { + console.log(data); + this.setState({ + blockerbugs: data.blockerbugs, + release: data.release + }); + }); + } + render() { + if (this.state.blockerbugs) + return ( +
+ +
Fedora {this.state.release} blockers and FEs{' '} + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + +
Beta
Proposed Blockers{this.state.blockerbugs.beta_blockers_proposed}
Accepted Blockers{this.state.blockerbugs.beta_blockers}
Proposed FEs{this.state.blockerbugs.beta_fe_proposed}
Accepted FEs{this.state.blockerbugs.beta_fe}
+
-
- - - - - - - - - - - - - - - - - - -
Final
Proposed Blockers{this.state.blockerbugs.final_blockers_proposed}
Accepted Blockers{this.state.blockerbugs.final_blockers}
Proposed FEs{this.state.blockerbugs.final_fe_proposed}
Accepted FEs{this.state.blockerbugs.final_fe}
-
-
-
- ); - } +
+ + + + + + + + + + + + + + + + + + +
Final
Proposed Blockers{this.state.blockerbugs.final_blockers_proposed}
Accepted Blockers{this.state.blockerbugs.final_blockers}
Proposed FEs{this.state.blockerbugs.final_fe_proposed}
Accepted FEs{this.state.blockerbugs.final_fe}
+
+
+
+ ); + } } diff --git a/src/Events.js b/src/Events.js index 9020f98..d00f0a8 100644 --- a/src/Events.js +++ b/src/Events.js @@ -19,11 +19,16 @@ class Events extends Component { render() { const meetings = this.state.meetings.map(meeting => { //return (
  • {meeting.start} - {meeting.summary}
  • ) - return () + return () }); return (
    -
    Meetings and testdays in the next 7 days
    +
    + Meetings and testdays in the next 7 days{' '} + + + +
      {meetings}
    @@ -40,10 +45,10 @@ class Event extends Component { render() { return (
  • - {this.props.start} -
    - {this.props.summary} -
    + {this.props.start} +
    + {this.props.summary} +
  • ); } diff --git a/src/LandingPage.js b/src/LandingPage.js index 953036a..acd4e4a 100644 --- a/src/LandingPage.js +++ b/src/LandingPage.js @@ -11,12 +11,16 @@ class LandingPage extends Component { render() { return ( +
    +
    +
    +
    diff --git a/src/Timeline.js b/src/Timeline.js index f188f27..fccc61f 100644 --- a/src/Timeline.js +++ b/src/Timeline.js @@ -48,7 +48,11 @@ class Timeline extends Component { }); return (
    -
    Current development schedule
    +
    Current development schedule{' '} + + + +
    {line} @@ -70,7 +74,7 @@ class Line extends Component { return ( - + ) } diff --git a/src/index.css b/src/index.css index 393ce47..9b4aa76 100644 --- a/src/index.css +++ b/src/index.css @@ -13,13 +13,17 @@ code { monospace; } -.masthead { - margin-bottom: 50px; +.masthead + .container,.timelinebox { + padding-top: 30px!important; } .navbar { padding-top: 0 !important; padding-bottom: 0 !important; + box-shadow:rgb(221, 221, 221) 0px 0px 10px 2px; + border-bottom-color:rgb(204, 204, 204); + border-bottom-style: solid; + border-bottom-width: 1px; } h5.padded-first { @@ -67,4 +71,17 @@ h5.padded { .bugscount { padding-left: 2em; +} + +.smallsuper { + vertical-align: super; + font-size: 0.5em; +} + +.timelinebox { + background-color: #f8f9fa!important; + padding-bottom: 30px; + border-bottom-color: rgb(222, 226, 230); + border-bottom-style: solid; + border-bottom-width: 1px; } \ No newline at end of file