diff --git a/dashboard.html b/dashboard.html index 684ee31..84d2470 100644 --- a/dashboard.html +++ b/dashboard.html @@ -7,8 +7,6 @@ - - @@ -34,29 +32,25 @@ } function getData(value){ } - google.charts.load('current', {'packages':['corechart']}); google.charts.setOnLoadCallback(drawVisualization); - function drawVisualization() { // Some raw data (not necessarily accurate) var data = google.visualization.arrayToDataTable([ - ['Month', 'Bolivia', 'Ecuador', 'Madagascar', 'Papua New Guinea', 'Rwanda', 'Average'], - ['2004/05', 165, 938, 522, 998, 450, 614.6], - ['2005/06', 135, 1120, 599, 1268, 288, 682], - ['2006/07', 157, 1167, 587, 807, 397, 623], - ['2007/08', 139, 1110, 615, 968, 215, 609.4], - ['2008/09', 136, 691, 629, 1026, 366, 569.6] + ['Day', 'Steps', 'Calories', 'Sleep', 'Activity', 'Average'], + ['01/05', 10, 94, 90, 84, 70], + ['01/06', 70, 90, 91, 84, 84], + ['01/07', 96, 98, 70, 93, 90], + ['01/08', 83, 90, 90, 75, 85], + ['01/09', 80, 90, 93, 95, 90] ]); - var options = { - title : 'Monthly Coffee Production by Country', - vAxis: {title: 'Cups'}, - hAxis: {title: 'Month'}, + title : 'Daily Fitness Goals', + vAxis: {title: 'Percent'}, + hAxis: {title: 'Days'}, seriesType: 'bars', series: {5: {type: 'line'}} }; - var chart = new google.visualization.ComboChart(document.getElementById('chart_div')); chart.draw(data, options); } @@ -79,7 +73,7 @@
- +
diff --git a/index.html b/index.html index 7cdf6dd..61c9f23 100644 --- a/index.html +++ b/index.html @@ -1,17 +1,26 @@ - - Reflex - - - - + + + + + + @@ -23,12 +32,11 @@

Welcome to Relfex Fitness!
- +

- diff --git a/main.css b/main.css index 7fc9634..e1ecc78 100644 --- a/main.css +++ b/main.css @@ -74,27 +74,17 @@ p.inputs { margin-right: -50%; transform: translate(-50%, -50%); font-family: 'Open Sans Condensed', sans-serif; - box-shadow: 3px 3px 2px #888888; vertical-align: middle; line-height: 50px; font-size: 40px; } + button { - margin: 0; - font-family: 'Open Sans Condensed', sans-serif; - font-size: 20px; - background-color: darkblue; - color: white; - height: 35px; - width: 150px; - padding: 0 5px 0 5px; - border: none; - box-shadow: 3px 3px 2px #888888; + padding: 0; + border: none; + background-color: none; + } button:hover { - font-size: 19px; - -moz-box-shadow: inset 0 0 10px #000000; - -webkit-box-shadow: inset 0 0 10px #000000; - box-shadow: inset 0 0 10px #000000; - cursor: pointer; + border: none; }