From b5c75465795c2d0892d9924a21f4c30e9d4671fb Mon Sep 17 00:00:00 2001 From: mgerb42 Date: Sun, 18 Sep 2016 18:15:30 +0000 Subject: [PATCH] fixed css --- client/js/components/sensors/SensorInfo.js | 5 +++++ client/js/components/sensors/SensorInfo.scss | 3 +++ client/js/components/sensors/SensorList.js | 4 ++-- client/js/components/sensors/SensorList.scss | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/client/js/components/sensors/SensorInfo.js b/client/js/components/sensors/SensorInfo.js index 14b94c8..f1e35f7 100644 --- a/client/js/components/sensors/SensorInfo.js +++ b/client/js/components/sensors/SensorInfo.js @@ -1,4 +1,6 @@ import React from 'react'; +import {Link} from 'react-router'; + import Loading from '../utils/Loading'; import _chartjs from 'chart.js'; import Chart from 'react-chartjs'; @@ -97,6 +99,9 @@ export default class SensorInfo extends React.Component { {sensor.fetchedUniqueDates && sensor.fetchedInfo ? : null} + {sensor.fetchedUniqueDates && sensor.fetchedInfo + ?
Home
+ : null} ); } diff --git a/client/js/components/sensors/SensorInfo.scss b/client/js/components/sensors/SensorInfo.scss index 8257112..9045ded 100644 --- a/client/js/components/sensors/SensorInfo.scss +++ b/client/js/components/sensors/SensorInfo.scss @@ -14,4 +14,7 @@ margin-left: 5px; } } + .home{ + margin-top: 1em; + } } \ No newline at end of file diff --git a/client/js/components/sensors/SensorList.js b/client/js/components/sensors/SensorList.js index e55db14..b83029c 100644 --- a/client/js/components/sensors/SensorList.js +++ b/client/js/components/sensors/SensorList.js @@ -30,10 +30,10 @@ export default class SensorList extends React.Component { return (
{this.openLink(sensor.location)}}> -
+

{sensor.temperature}°f

-
+

{sensor.location}

Updated: {date.toLocaleString('en-us', options)} {Date.now() - date < 420000 diff --git a/client/js/components/sensors/SensorList.scss b/client/js/components/sensors/SensorList.scss index 0f95e13..ba5f99d 100644 --- a/client/js/components/sensors/SensorList.scss +++ b/client/js/components/sensors/SensorList.scss @@ -12,8 +12,13 @@ background-color: #D1D1D1; } - .item + .item{ + .temperature{ + flex: .5; + } + + .info{ margin-left: 1em; + flex: 1; } h2{