mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 02:12:53 +00:00
Code Issues Releases Wiki Activity

fixed css

Browse Source
This commit is contained in:
mgerb42
2016-09-18 18:15:30 +00:00
parent 87d941804a
commit b5c7546579
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/js/components/sensors/SensorInfo.js
View File

@@ -1,4 +1,6 @@
import React from 'react'; import React from 'react';
import {Link} from 'react-router';
import Loading from '../utils/Loading'; import Loading from '../utils/Loading';
import _chartjs from 'chart.js'; import _chartjs from 'chart.js';
import Chart from 'react-chartjs'; import Chart from 'react-chartjs';
@@ -97,6 +99,9 @@ export default class SensorInfo extends React.Component {
{sensor.fetchedUniqueDates && sensor.fetchedInfo {sensor.fetchedUniqueDates && sensor.fetchedInfo
? <LineChart data={data} options={ChartOptions} redraw/> ? <LineChart data={data} options={ChartOptions} redraw/>
: null} : null}
{sensor.fetchedUniqueDates && sensor.fetchedInfo
? <div class="home"><Link to="/" class="link"><i class="fa fa-caret-left" aria-hidden="true"></i> Home</Link></div>
: null}
</div> </div>
); );
} }

3
client/js/components/sensors/SensorInfo.scss
View File

@@ -14,4 +14,7 @@
margin-left: 5px; margin-left: 5px;
} }
} }
.home{
margin-top: 1em;
}
} }

4
client/js/components/sensors/SensorList.js
View File

@@ -30,10 +30,10 @@ export default class SensorList extends React.Component {
return ( return (
<div key={index} class="row" onClick={() => {this.openLink(sensor.location)}}> <div key={index} class="row" onClick={() => {this.openLink(sensor.location)}}>
<div class="item"> <div class="temperature">
<h1>{sensor.temperature}°f</h1> <h1>{sensor.temperature}°f</h1>
</div> </div>
<div class="item"> <div class="info">
<h3>{sensor.location}</h3> <h3>{sensor.location}</h3>
<span class="date">Updated: {date.toLocaleString('en-us', options)} <span class="date">Updated: {date.toLocaleString('en-us', options)}
{Date.now() - date < 420000 {Date.now() - date < 420000

7
client/js/components/sensors/SensorList.scss
View File

@@ -12,8 +12,13 @@
background-color: #D1D1D1; background-color: #D1D1D1;
} }
.item + .item{ .temperature{
flex: .5;
}
.info{
margin-left: 1em; margin-left: 1em;
flex: 1;
} }
h2{ h2{