From d070fe9c20f9b88a17828ee836de6a5309b6e687 Mon Sep 17 00:00:00 2001 From: edfungus Date: Sun, 13 Mar 2016 14:53:05 -0700 Subject: [PATCH 1/3] Updated dev from master... --- clients/esp8266_clients/firmware/esptool.py | 0 clients/esp8266_clients/lua/init.lua | 0 clients/esp8266_clients/lua/luatool.py | 0 clients/esp8266_clients/lua/old-functions.lua | 0 clients/esp8266_clients/venv/bin/easy_install | 0 clients/esp8266_clients/venv/bin/easy_install-2.7 | 0 clients/esp8266_clients/venv/bin/pip | 0 clients/esp8266_clients/venv/bin/pip2 | 0 clients/esp8266_clients/venv/bin/pip2.7 | 0 clients/esp8266_clients/venv/bin/python | Bin clients/esp8266_clients/venv/bin/wheel | 0 .../cf_demo_client/cf_env/bin/easy_install | 0 .../cf_demo_client/cf_env/bin/easy_install-2.7 | 0 .../python_clients/cf_demo_client/cf_env/bin/pip | 0 .../python_clients/cf_demo_client/cf_env/bin/pip2 | 0 .../python_clients/cf_demo_client/cf_env/bin/pip2.7 | 0 .../python_clients/cf_demo_client/cf_env/bin/python | Bin .../cf_demo_client/cf_env/bin/python2 | Bin .../cf_demo_client/cf_env/bin/python2.7 | Bin .../python_clients/cf_demo_client/cf_env/bin/wheel | 0 .../python2.7/site-packages/markupsafe/_speedups.so | Bin clients/python_clients/venv/bin/easy_install | 0 clients/python_clients/venv/bin/easy_install-2.7 | 0 clients/python_clients/venv/bin/pip | 0 clients/python_clients/venv/bin/pip2 | 0 clients/python_clients/venv/bin/pip2.7 | 0 clients/python_clients/venv/bin/python | Bin clients/python_clients/venv/bin/wheel | 0 28 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 clients/esp8266_clients/firmware/esptool.py mode change 100755 => 100644 clients/esp8266_clients/lua/init.lua mode change 100755 => 100644 clients/esp8266_clients/lua/luatool.py mode change 100755 => 100644 clients/esp8266_clients/lua/old-functions.lua mode change 100755 => 100644 clients/esp8266_clients/venv/bin/easy_install mode change 100755 => 100644 clients/esp8266_clients/venv/bin/easy_install-2.7 mode change 100755 => 100644 clients/esp8266_clients/venv/bin/pip mode change 100755 => 100644 clients/esp8266_clients/venv/bin/pip2 mode change 100755 => 100644 clients/esp8266_clients/venv/bin/pip2.7 mode change 100755 => 100644 clients/esp8266_clients/venv/bin/python mode change 100755 => 100644 clients/esp8266_clients/venv/bin/wheel mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/easy_install mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/easy_install-2.7 mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/pip mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/pip2 mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/pip2.7 mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/python mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/python2 mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/python2.7 mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/bin/wheel mode change 100755 => 100644 clients/python_clients/cf_demo_client/cf_env/lib/python2.7/site-packages/markupsafe/_speedups.so mode change 100755 => 100644 clients/python_clients/venv/bin/easy_install mode change 100755 => 100644 clients/python_clients/venv/bin/easy_install-2.7 mode change 100755 => 100644 clients/python_clients/venv/bin/pip mode change 100755 => 100644 clients/python_clients/venv/bin/pip2 mode change 100755 => 100644 clients/python_clients/venv/bin/pip2.7 mode change 100755 => 100644 clients/python_clients/venv/bin/python mode change 100755 => 100644 clients/python_clients/venv/bin/wheel diff --git a/clients/esp8266_clients/firmware/esptool.py b/clients/esp8266_clients/firmware/esptool.py old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/lua/init.lua b/clients/esp8266_clients/lua/init.lua old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/lua/luatool.py b/clients/esp8266_clients/lua/luatool.py old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/lua/old-functions.lua b/clients/esp8266_clients/lua/old-functions.lua old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/easy_install b/clients/esp8266_clients/venv/bin/easy_install old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/easy_install-2.7 b/clients/esp8266_clients/venv/bin/easy_install-2.7 old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/pip b/clients/esp8266_clients/venv/bin/pip old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/pip2 b/clients/esp8266_clients/venv/bin/pip2 old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/pip2.7 b/clients/esp8266_clients/venv/bin/pip2.7 old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/python b/clients/esp8266_clients/venv/bin/python old mode 100755 new mode 100644 diff --git a/clients/esp8266_clients/venv/bin/wheel b/clients/esp8266_clients/venv/bin/wheel old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/easy_install b/clients/python_clients/cf_demo_client/cf_env/bin/easy_install old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/easy_install-2.7 b/clients/python_clients/cf_demo_client/cf_env/bin/easy_install-2.7 old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/pip b/clients/python_clients/cf_demo_client/cf_env/bin/pip old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/pip2 b/clients/python_clients/cf_demo_client/cf_env/bin/pip2 old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/pip2.7 b/clients/python_clients/cf_demo_client/cf_env/bin/pip2.7 old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/python b/clients/python_clients/cf_demo_client/cf_env/bin/python old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/python2 b/clients/python_clients/cf_demo_client/cf_env/bin/python2 old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/python2.7 b/clients/python_clients/cf_demo_client/cf_env/bin/python2.7 old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/bin/wheel b/clients/python_clients/cf_demo_client/cf_env/bin/wheel old mode 100755 new mode 100644 diff --git a/clients/python_clients/cf_demo_client/cf_env/lib/python2.7/site-packages/markupsafe/_speedups.so b/clients/python_clients/cf_demo_client/cf_env/lib/python2.7/site-packages/markupsafe/_speedups.so old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/easy_install b/clients/python_clients/venv/bin/easy_install old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/easy_install-2.7 b/clients/python_clients/venv/bin/easy_install-2.7 old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/pip b/clients/python_clients/venv/bin/pip old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/pip2 b/clients/python_clients/venv/bin/pip2 old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/pip2.7 b/clients/python_clients/venv/bin/pip2.7 old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/python b/clients/python_clients/venv/bin/python old mode 100755 new mode 100644 diff --git a/clients/python_clients/venv/bin/wheel b/clients/python_clients/venv/bin/wheel old mode 100755 new mode 100644 From 8d0a997b79a5876b6c3be3b40eea4fd27550f06c Mon Sep 17 00:00:00 2001 From: edfungus Date: Sun, 13 Mar 2016 15:47:43 -0700 Subject: [PATCH 2/3] Added line chart to documentation --- README.md | 49 ++++++++++++++++++++ bower.json | 2 +- public/app/documentation/documentation.md | 49 ++++++++++++++++++++ public/common/images/crouton-chart-line.png | Bin 0 -> 8992 bytes 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 public/common/images/crouton-chart-line.png diff --git a/README.md b/README.md index b169412..c28e5cd 100644 --- a/README.md +++ b/README.md @@ -383,6 +383,55 @@ Example: } ``` +### Line Chart + +![Crouton-chart-line](https://raw.githubusercontent.com/edfungus/Crouton/master/public/common/images/crouton-chart-line.png) + +
A simple line chart with multiple lines available. The *labels* corresponds to the x axis values and the *series* corresponds to the y axis values. Multiple sets of (x,y) values can be passed at once as long as the array length of labels and series are matched. The reason why series is multidimensional is so that multiple lines can be drawn where each array in series corresponds to a line. *It is suggested that labels and series be prepopulated with one set of (x,y) value for each line* The *update* parameter is expected on update and holds a copy of *values* with the new *labels* and *series* within. *Max* refers to the maximum number of data points based on the x axis is shown. *low* and *high* refers to the maximum y values expected. + +```json +Device -> Crouton +Name: crouton-chart-line + +Example: +"temperature": { + "values": { + "labels": [1], [required] + "series": [[60]], [required] + "update": null [required] + }, + "max": 11, [required] + "low": 58, [required] + "high": 73, [required] + "card-type": "crouton-chart-line", [required] + "title": "Temperature (F)" [optional] +} + +3 lines and 1 value: +"values": { + "labels": [1], + "series": [[60],[2],[543]], + "update": null +} + +3 lines and 2 values: +"values": { + "labels": [1,2], + "series": [[60,62],[2,4],[543,545]], + "update": null +} + +To update temperature: +"values": { + "labels": null, + "series": null, + "update": { + "labels" : [2], + "series": [[62]] + } +} +``` + ## Advanced cards diff --git a/bower.json b/bower.json index 14c2b3e..add8822 100644 --- a/bower.json +++ b/bower.json @@ -23,7 +23,7 @@ "paper-header-panel": "PolymerElements/paper-header-panel#~1.0.5", "paper-input": "PolymerElements/paper-input#~1.0.15", "paper-button": "PolymerElements/paper-button#~1.0.8", - "paper-styles": "PolymerElements/paper-styles#~1.0.11", + "paper-styles": "PolymerElements/paper-styles#~1.1.4", "iron-form": "PolymerElements/iron-form#~1.0.9", "paper-toast": "PolymerElements/paper-toast#~1.0.0", "packery": "~1.4.3", diff --git a/public/app/documentation/documentation.md b/public/app/documentation/documentation.md index 9af6439..da52cec 100644 --- a/public/app/documentation/documentation.md +++ b/public/app/documentation/documentation.md @@ -383,6 +383,55 @@ Example: } ``` +### Line Chart + +![Crouton-chart-line](/static/common/images/crouton-chart-line.png) + +
A simple line chart with multiple lines available. The *labels* corresponds to the x axis values and the *series* corresponds to the y axis values. Multiple sets of (x,y) values can be passed at once as long as the array length of labels and series are matched. The reason why series is multidimensional is so that multiple lines can be drawn where each array in series corresponds to a line. *It is suggested that labels and series be prepopulated with one set of (x,y) value for each line* The *update* parameter is expected on update and holds a copy of *values* with the new *labels* and *series* within. *Max* refers to the maximum number of data points based on the x axis is shown. *low* and *high* refers to the maximum y values expected. + +```json +Device -> Crouton +Name: crouton-chart-line + +Example: +"temperature": { + "values": { + "labels": [1], [required] + "series": [[60]], [required] + "update": null [required] + }, + "max": 11, [required] + "low": 58, [required] + "high": 73, [required] + "card-type": "crouton-chart-line", [required] + "title": "Temperature (F)" [optional] +} + +3 lines and 1 value: +"values": { + "labels": [1], + "series": [[60],[2],[543]], + "update": null +} + +3 lines and 2 values: +"values": { + "labels": [1,2], + "series": [[60,62],[2,4],[543,545]], + "update": null +} + +To update temperature: +"values": { + "labels": null, + "series": null, + "update": { + "labels" : [2], + "series": [[62]] + } +} +``` + ## Advanced cards diff --git a/public/common/images/crouton-chart-line.png b/public/common/images/crouton-chart-line.png new file mode 100644 index 0000000000000000000000000000000000000000..c9588ea1b38cd6bb4a054cba2272e53cb09ea08b GIT binary patch literal 8992 zcmd^lXH=70w{8$6h!X4|RYg%ziqZnoMT$sK1SB*OkrIK>4Iu{~r-^ft!76`Np0s?V?czJ*~L>u-X@Q=&ymVqv)v|E${eA(@)W1<5By^q_s<+KO* zz87I=;|BskT6R8Mt=>iVL7-EWMtVB8A34w_O&&_Rhmw{}!}!TfpO)@rHtFn#M$Mei zhV1 z^u(FrzYn)cU@lH|q{{i7G1>(J9lPy7#FZVNPBhar%5T;=yBIF#&|s*6VT*!57td#d zLyFp>qHQ(hLl}JqKc=H4+LxE#tD{yg4$%Umx8PG?i4Z_&X^#f`o+@Vg9>v3M%HO$u zkB+uYzv%ykI)dW@f%M(!K9Z~D;?TnqNBSymgH9jfM& zRl5IAN)H|_M=43VS@rId8X$jP=#xa!@vJBXfZC(`i*d6?#LW>8pRA zvcncb$9&^rbOISzF#Z|>csBDzw5Z!3->=Xq-vT_of8lrJgMh){ADQ$JS130K6jlhV zACCE^*bM0DhThLPKbI2Pd9hm(3Jkfs8w>&+c(y||{2*WyZTWCuCa?Z~U~v9k2;R#! zotZx95#U}`-!EcHHL9MB55`I{^^GCHc^zD!Fsj9Ka_^ORee9V@#UnL2y~Rc|IjN?` zY5{Mm>-vLQ(1Nmy%&OC4E?l6d%JT+@g`oU5&AD1aX5*UB)BUAG`3m1$7C!6bNzp#U z0Sc$yeoiJcAnCVCC~x=*k@8T>>0Q?@96skjSc+rl1JY70f#s;L3#B2!Xu)HQ+t=(D zGk*bO*Z!Pz3d*RLd6VhbDldu)dfoa4*rV6;MKvHs28+yZ9}@tE68(h*4R(Rd#b
f3kc#*DCy~ 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 Vi`g6aISK^)8C^5gE7iRl{$Dx8mev3O literal 0 HcmV?d00001 From ce4ad65b24990e05309e015d93d273153b23ffce Mon Sep 17 00:00:00 2001 From: edfungus Date: Sun, 13 Mar 2016 16:30:10 -0700 Subject: [PATCH 3/3] Fixed charts and alignment ... the easy way however --- README.md | 4 +++- .../crouton-chart-donut/crouton-chart-donut.jade | 6 +++--- .../crouton-simple-toggle/crouton-simple-toggle.css | 2 +- .../crouton-simple-toggle/crouton-simple-toggle.less | 5 +++-- public/app/documentation/documentation.md | 4 +++- public/app/framework/crouton-card/crouton-card.css | 2 +- public/app/framework/crouton-card/crouton-card.less | 12 ++++++------ 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index c28e5cd..ace99f6 100644 --- a/README.md +++ b/README.md @@ -387,7 +387,9 @@ Example: ![Crouton-chart-line](https://raw.githubusercontent.com/edfungus/Crouton/master/public/common/images/crouton-chart-line.png) -
A simple line chart with multiple lines available. The *labels* corresponds to the x axis values and the *series* corresponds to the y axis values. Multiple sets of (x,y) values can be passed at once as long as the array length of labels and series are matched. The reason why series is multidimensional is so that multiple lines can be drawn where each array in series corresponds to a line. *It is suggested that labels and series be prepopulated with one set of (x,y) value for each line* The *update* parameter is expected on update and holds a copy of *values* with the new *labels* and *series* within. *Max* refers to the maximum number of data points based on the x axis is shown. *low* and *high* refers to the maximum y values expected. +
A simple line chart with multiple lines available. The *labels* corresponds to the x axis values and the *series* corresponds to the y axis values. Multiple sets of (x,y) values can be passed at once as long as the array length of labels and series are matched. The reason why series is multidimensional is so that multiple lines can be drawn where each array in series corresponds to a line. The *update* parameter is expected on update and holds a copy of *values* with the new *labels* and *series* within. *Max* refers to the maximum number of data points based on the x axis is shown. *low* and *high* refers to the maximum y values expected. + +*It is suggested that labels and series be prepopulated with one set of (x,y) value for each line* ```json Device -> Crouton diff --git a/public/app/dashboard-elements/crouton-chart-donut/crouton-chart-donut.jade b/public/app/dashboard-elements/crouton-chart-donut/crouton-chart-donut.jade index c8bf5a4..9cf84e4 100644 --- a/public/app/dashboard-elements/crouton-chart-donut/crouton-chart-donut.jade +++ b/public/app/dashboard-elements/crouton-chart-donut/crouton-chart-donut.jade @@ -62,9 +62,9 @@ dom-module(id="crouton-chart-donut") } }); //Reupdate chart so that it will fit correctly - // this.async(function(){ - // that.chart.update(); - // },100); + this.async(function(){ + that.chart.update(); + },200); }, newValues: function(changeRecord){ if(this.endPointJson.centerSum && Array.isArray(this.endPointJson.values.series)){ diff --git a/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.css b/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.css index f643a36..9af51cc 100644 --- a/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.css +++ b/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.css @@ -1 +1 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,300,700);html,body{font-family:'Lato',sans-serif;font-weight:300;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-touch-callout:none}html ::-webkit-scrollbar,body ::-webkit-scrollbar{-webkit-appearance:none}html ::-webkit-scrollbar:vertical,body ::-webkit-scrollbar:vertical{width:10px}html ::-webkit-scrollbar:horizontal,body ::-webkit-scrollbar:horizontal{height:10px}html ::-webkit-scrollbar-thumb,body ::-webkit-scrollbar-thumb{background-color:#d2d2d2;border:2px solid #d2d2d2}html ::-webkit-scrollbar-track,body ::-webkit-scrollbar-track{background-color:#a5a5a5}@media only screen and (max-width:600px){html,body{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}}html .dragger,body .dragger{height:0;width:100%;position:absolute;left:0;top:0;padding:.5em 1.6875em;background-image:-webkit-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-moz-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-ms-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);-webkit-background-size:3px 3px;-moz-background-size:3px 3px;background-size:3px 3px;cursor:move}html .floatMiddle,body .floatMiddle{position:relative;top:50%;transform:translateY(-50%)}crouton-simple-toggle{width:250px;min-width:250px;height:250px;min-height:250px;display:table-row-group}crouton-simple-toggle crouton-card{text-align:center;color:#646464}crouton-simple-toggle crouton-card .expand{margin:-20px;padding-top:10px}crouton-simple-toggle paper-toggle-button{--paper-toggle-button-checked-bar-color:#4ecdc4;--paper-toggle-button-checked-button-color:#4ecdc4}crouton-simple-toggle paper-toggle-button .toggle-container.paper-toggle-button{margin-left:auto;margin-right:auto}crouton-simple-toggle .textDisplay{font-size:58px;margin-bottom:5px}crouton-simple-toggle .dimText{color:#adadad}crouton-simple-toggle .toggle{font-size:15px;color:#adadad;margin-top:2px}crouton-simple-toggle .toggle .toggleButton{position:absolute;width:100%;left:0}crouton-simple-toggle .toggle .toggleButton paper-toggle-button.paper-toggle-button-0[checked]:not([disabled]) .toggle-bar.paper-toggle-button,crouton-simple-toggle .toggle .toggleButton paper-toggle-button.paper-toggle-button-0[checked]:not([disabled]) .toggle-button.paper-toggle-button{background-color:#4ecdc4}crouton-simple-toggle .toggle .toggleButton .toggle-label{margin:0}crouton-simple-toggle .toggle .toggleTextLeft{float:left;width:80px;text-align:right;line-height:20px}crouton-simple-toggle .toggle .toggleTextRight{float:right;width:83px;text-align:left;line-height:20px}crouton-simple-toggle .titleDisplay{font-size:24px;bottom:25px;left:0;width:100%;position:absolute} \ No newline at end of file +@import url(https://fonts.googleapis.com/css?family=Lato:400,300,700);html,body{font-family:'Lato',sans-serif;font-weight:300;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-touch-callout:none}html ::-webkit-scrollbar,body ::-webkit-scrollbar{-webkit-appearance:none}html ::-webkit-scrollbar:vertical,body ::-webkit-scrollbar:vertical{width:10px}html ::-webkit-scrollbar:horizontal,body ::-webkit-scrollbar:horizontal{height:10px}html ::-webkit-scrollbar-thumb,body ::-webkit-scrollbar-thumb{background-color:#d2d2d2;border:2px solid #d2d2d2}html ::-webkit-scrollbar-track,body ::-webkit-scrollbar-track{background-color:#a5a5a5}@media only screen and (max-width:600px){html,body{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}}html .dragger,body .dragger{height:0;width:100%;position:absolute;left:0;top:0;padding:.5em 1.6875em;background-image:-webkit-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-moz-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-ms-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);-webkit-background-size:3px 3px;-moz-background-size:3px 3px;background-size:3px 3px;cursor:move}html .floatMiddle,body .floatMiddle{position:relative;top:50%;transform:translateY(-50%)}crouton-simple-toggle{width:250px;min-width:250px;height:250px;min-height:250px;display:table-row-group}crouton-simple-toggle crouton-card{text-align:center;color:#646464}crouton-simple-toggle crouton-card .expand{margin:-20px;padding-top:10px}crouton-simple-toggle paper-toggle-button{--paper-toggle-button-checked-bar-color:#4ecdc4;--paper-toggle-button-checked-button-color:#4ecdc4}crouton-simple-toggle paper-toggle-button .toggle-container.paper-toggle-button{margin-left:auto!important;margin-right:auto!important;padding-left:2px}crouton-simple-toggle .textDisplay{font-size:58px;margin-bottom:5px}crouton-simple-toggle .dimText{color:#adadad}crouton-simple-toggle .toggle{font-size:15px;color:#adadad;margin-top:2px}crouton-simple-toggle .toggle .toggleButton{position:absolute;width:100%;left:0}crouton-simple-toggle .toggle .toggleButton paper-toggle-button.paper-toggle-button-0[checked]:not([disabled]) .toggle-bar.paper-toggle-button,crouton-simple-toggle .toggle .toggleButton paper-toggle-button.paper-toggle-button-0[checked]:not([disabled]) .toggle-button.paper-toggle-button{background-color:#4ecdc4}crouton-simple-toggle .toggle .toggleButton .toggle-label{margin:0}crouton-simple-toggle .toggle .toggleTextLeft{float:left;width:80px;text-align:right;line-height:20px}crouton-simple-toggle .toggle .toggleTextRight{float:right;width:83px;text-align:left;line-height:20px}crouton-simple-toggle .titleDisplay{font-size:24px;bottom:25px;left:0;width:100%;position:absolute} diff --git a/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.less b/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.less index 44aee3a..5db6587 100644 --- a/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.less +++ b/public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.less @@ -22,8 +22,9 @@ crouton-simple-toggle{ --paper-toggle-button-checked-button-color: @button-normal; .toggle-container.paper-toggle-button { - margin-left: auto; - margin-right: auto; + margin-left: auto !important; + margin-right: auto !important; + padding-left: 2px; } } diff --git a/public/app/documentation/documentation.md b/public/app/documentation/documentation.md index da52cec..02d3fc9 100644 --- a/public/app/documentation/documentation.md +++ b/public/app/documentation/documentation.md @@ -387,7 +387,9 @@ Example: ![Crouton-chart-line](/static/common/images/crouton-chart-line.png) -
A simple line chart with multiple lines available. The *labels* corresponds to the x axis values and the *series* corresponds to the y axis values. Multiple sets of (x,y) values can be passed at once as long as the array length of labels and series are matched. The reason why series is multidimensional is so that multiple lines can be drawn where each array in series corresponds to a line. *It is suggested that labels and series be prepopulated with one set of (x,y) value for each line* The *update* parameter is expected on update and holds a copy of *values* with the new *labels* and *series* within. *Max* refers to the maximum number of data points based on the x axis is shown. *low* and *high* refers to the maximum y values expected. +
A simple line chart with multiple lines available. The *labels* corresponds to the x axis values and the *series* corresponds to the y axis values. Multiple sets of (x,y) values can be passed at once as long as the array length of labels and series are matched. The reason why series is multidimensional is so that multiple lines can be drawn where each array in series corresponds to a line. The *update* parameter is expected on update and holds a copy of *values* with the new *labels* and *series* within. *Max* refers to the maximum number of data points based on the x axis is shown. *low* and *high* refers to the maximum y values expected. + +*It is suggested that labels and series be prepopulated with one set of (x,y) value for each line* ```json Device -> Crouton diff --git a/public/app/framework/crouton-card/crouton-card.css b/public/app/framework/crouton-card/crouton-card.css index ce49ffe..e8abf90 100644 --- a/public/app/framework/crouton-card/crouton-card.css +++ b/public/app/framework/crouton-card/crouton-card.css @@ -1 +1 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,300,700);html,body{font-family:'Lato',sans-serif;font-weight:300;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-touch-callout:none}html ::-webkit-scrollbar,body ::-webkit-scrollbar{-webkit-appearance:none}html ::-webkit-scrollbar:vertical,body ::-webkit-scrollbar:vertical{width:10px}html ::-webkit-scrollbar:horizontal,body ::-webkit-scrollbar:horizontal{height:10px}html ::-webkit-scrollbar-thumb,body ::-webkit-scrollbar-thumb{background-color:#d2d2d2;border:2px solid #d2d2d2}html ::-webkit-scrollbar-track,body ::-webkit-scrollbar-track{background-color:#a5a5a5}@media only screen and (max-width:600px){html,body{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}}html .dragger,body .dragger{height:0;width:100%;position:absolute;left:0;top:0;padding:.5em 1.6875em;background-image:-webkit-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-moz-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-ms-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);-webkit-background-size:3px 3px;-moz-background-size:3px 3px;background-size:3px 3px;cursor:move}html .floatMiddle,body .floatMiddle{position:relative;top:50%;transform:translateY(-50%)}crouton-card{background-clip:content-box;background-color:#fafafa;margin-bottom:20px;font-size:16px;word-wrap:break-word;display:inline-block;height:100%;width:100%}crouton-card h1,crouton-card h2,crouton-card h3,crouton-card h4,crouton-card h5,crouton-card h6,crouton-card p{margin-top:0;color:rgba(0,0,0,0.7)}crouton-card p{margin-bottom:10px}crouton-card img{margin-left:auto;margin-right:auto;margin-bottom:10px;max-width:100%}crouton-card .closeCard{position:absolute;right:55px;cursor:pointer}@media only screen and (max-width:600px){crouton-card .closeCard{right:35px}}crouton-card .cardBorder{height:10px;background-color:#c7f464;top:-10px;position:relative}crouton-card.noBorder .cardBorder{display:none}crouton-card.lighterBg{background-color:rgba(250,250,250,0.25)}crouton-card .dropShadow{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);height:100%}crouton-card .cardInner{padding:40px;height:100%}crouton-card .cardInner p,crouton-card .cardInner li{color:#646464;font-weight:lighter}crouton-card .cardInner p.header{font-size:24px;border-bottom:#ddd;border-bottom-width:thin;border-bottom-style:solid;font-weight:normal}crouton-card .cardInner p.header .subTitle{color:rgba(0,0,0,0.2);font-weight:lighter;margin-left:6px;float:right}@media only screen and (max-width:600px){crouton-card .cardInner p.header{font-size:24px}}crouton-card .cardInner li{margin-left:20px}@media only screen and (max-width:600px){crouton-card .cardInner{padding:40px}}crouton-card .accent,crouton-card a{color:#4ecdc4;text-decoration:none}crouton-card .center{text-align:center}crouton-card .contentBox{padding:20px;background-color:#556270;margin-bottom:16px;color:white;font-weight:100;overflow-x:scroll;word-wrap:normal}crouton-card .contentBox .pushRight{float:right}crouton-card .contentBox code{font-family:monospace;font-size:14px}crouton-card.danger .cardInner{padding:10px 40px;color:white;background-color:lightcoral;font-weight:500}crouton-card.danger .cardInner .link{text-decoration:underline;cursor:pointer}crouton-card.message .cardInner{padding:10px 40px;color:white;background-color:#4ecdc4;font-weight:100}crouton-card.message .cardInner .link{text-decoration:underline;cursor:pointer}crouton-card .descpCard .text24{font-size:24px;color:#646464}crouton-card .descpCard li{list-style-type:circle}crouton-card.banner .cardInner{padding:20px;color:white;background-color:#556270;font-weight:300}crouton-card.banner .cardInner .titleDiv{padding:40px;padding-top:0}crouton-card.banner .cardInner .mainTitle{font-size:100px;font-weight:500}crouton-card.banner .cardInner .subTitle{font-size:32px}crouton-card.banner .cardInner img{margin-top:35px}crouton-card.banner .cardInner .link{text-decoration:underline;cursor:pointer}crouton-card paper-button{display:table;background-color:#4ecdc4;margin-top:10px;color:white;border-radius:0;font-size:16px}crouton-card paper-button.centerBtn{margin-left:auto;margin-right:auto}crouton-card paper-button.leftBtn{margin-right:auto;margin-left:0}crouton-card paper-button.rightBtn{margin-left:auto;margin-right:0}crouton-card paper-button.clear{background-color:rgba(0,0,0,0);color:#646464}crouton-card paper-button.clear.paper-button-0{box-shadow:none}crouton-card paper-button.dark{background-color:#adadad}crouton-card paper-checkbox.paper-checkbox-0{display:block}crouton-card paper-checkbox.paper-checkbox-0 #checkbox.paper-checkbox{border-color:#4ecdc4}crouton-card paper-checkbox.paper-checkbox-0 #checkbox.paper-checkbox #checkmark{box-sizing:initial}crouton-card paper-checkbox.paper-checkbox-0 #checkbox.paper-checkbox.checked{background-color:#4ecdc4;border-color:#4ecdc4}crouton-card #input{font-family:'Lato',sans-serif}@media only screen and (max-width:600px){crouton-card{max-width:none}crouton-card h2{font-size:32px}crouton-card h4{font-size:28px}} \ No newline at end of file +@import url(https://fonts.googleapis.com/css?family=Lato:400,300,700);html,body{font-family:'Lato',sans-serif;font-weight:300;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-touch-callout:none}html ::-webkit-scrollbar,body ::-webkit-scrollbar{-webkit-appearance:none}html ::-webkit-scrollbar:vertical,body ::-webkit-scrollbar:vertical{width:10px}html ::-webkit-scrollbar:horizontal,body ::-webkit-scrollbar:horizontal{height:10px}html ::-webkit-scrollbar-thumb,body ::-webkit-scrollbar-thumb{background-color:#d2d2d2;border:2px solid #d2d2d2}html ::-webkit-scrollbar-track,body ::-webkit-scrollbar-track{background-color:#a5a5a5}@media only screen and (max-width:600px){html,body{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}}html .dragger,body .dragger{height:0;width:100%;position:absolute;left:0;top:0;padding:.5em 1.6875em;background-image:-webkit-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-moz-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:-ms-repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);background-image:repeating-radial-gradient(center center, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 1px, transparent 1px, transparent 100%);-webkit-background-size:3px 3px;-moz-background-size:3px 3px;background-size:3px 3px;cursor:move}html .floatMiddle,body .floatMiddle{position:relative;top:50%;transform:translateY(-50%)}crouton-card{background-clip:content-box;background-color:#fafafa;margin-bottom:20px;font-size:16px;word-wrap:break-word;display:inline-block;height:100%;width:100%}crouton-card h1,crouton-card h2,crouton-card h3,crouton-card h4,crouton-card h5,crouton-card h6,crouton-card p{margin-top:0;color:rgba(0,0,0,0.7)}crouton-card p{margin-bottom:10px}crouton-card img{margin-left:auto;margin-right:auto;margin-bottom:10px;max-width:100%}crouton-card .closeCard{position:absolute;right:55px;cursor:pointer}@media only screen and (max-width:600px){crouton-card .closeCard{right:35px}}crouton-card .cardBorder{height:10px;background-color:#c7f464;top:-10px;position:relative}crouton-card.noBorder .cardBorder{display:none}crouton-card.lighterBg{background-color:rgba(250,250,250,0.25)}crouton-card .dropShadow{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);height:100%}crouton-card .cardInner{padding:40px;height:100%}crouton-card .cardInner p,crouton-card .cardInner li{color:#646464;font-weight:lighter}crouton-card .cardInner p.header{font-size:24px;border-bottom:#ddd;border-bottom-width:thin;border-bottom-style:solid;font-weight:normal}crouton-card .cardInner p.header .subTitle{color:rgba(0,0,0,0.2);font-weight:lighter;margin-left:6px;float:right}@media only screen and (max-width:600px){crouton-card .cardInner p.header{font-size:24px}}crouton-card .cardInner li{margin-left:20px}@media only screen and (max-width:600px){crouton-card .cardInner{padding:40px}}crouton-card .accent,crouton-card a{color:#4ecdc4;text-decoration:none}crouton-card .center{text-align:center}crouton-card .contentBox{padding:20px;background-color:#556270;margin-bottom:16px;color:white;font-weight:100;overflow-x:scroll;word-wrap:normal}crouton-card .contentBox .pushRight{float:right}crouton-card .contentBox code{font-family:monospace;font-size:14px}crouton-card.danger .cardInner{padding:10px 40px;color:white;background-color:lightcoral;font-weight:500}crouton-card.danger .cardInner .link{text-decoration:underline;cursor:pointer}crouton-card.message .cardInner{padding:10px 40px;color:white;background-color:#4ecdc4;font-weight:100}crouton-card.message .cardInner .link{text-decoration:underline;cursor:pointer}crouton-card .descpCard .text24{font-size:24px;color:#646464}crouton-card .descpCard li{list-style-type:circle}crouton-card.banner .cardInner{padding:20px;color:white;background-color:#556270;font-weight:300}crouton-card.banner .cardInner .titleDiv{padding:40px;padding-top:0}crouton-card.banner .cardInner .mainTitle{font-size:100px;font-weight:500}crouton-card.banner .cardInner .subTitle{font-size:32px}crouton-card.banner .cardInner img{margin-top:35px}crouton-card.banner .cardInner .link{text-decoration:underline;cursor:pointer}crouton-card paper-button{display:table!important;background-color:#4ecdc4!important;margin-top:10px!important;color:white!important;border-radius:0!important;font-size:16px!important}crouton-card paper-button.centerBtn{margin-left:auto;margin-right:auto}crouton-card paper-button.leftBtn{margin-right:auto;margin-left:0}crouton-card paper-button.rightBtn{margin-left:auto;margin-right:0}crouton-card paper-button.clear{background-color:rgba(0,0,0,0);color:#646464}crouton-card paper-button.clear.paper-button-0{box-shadow:none}crouton-card paper-button.dark{background-color:#adadad}crouton-card paper-checkbox.paper-checkbox-0{display:block}crouton-card paper-checkbox.paper-checkbox-0 #checkbox.paper-checkbox{border-color:#4ecdc4}crouton-card paper-checkbox.paper-checkbox-0 #checkbox.paper-checkbox #checkmark{box-sizing:initial}crouton-card paper-checkbox.paper-checkbox-0 #checkbox.paper-checkbox.checked{background-color:#4ecdc4;border-color:#4ecdc4}crouton-card #input{font-family:'Lato',sans-serif}@media only screen and (max-width:600px){crouton-card{max-width:none}crouton-card h2{font-size:32px}crouton-card h4{font-size:28px}} diff --git a/public/app/framework/crouton-card/crouton-card.less b/public/app/framework/crouton-card/crouton-card.less index fcc097b..1ad649d 100644 --- a/public/app/framework/crouton-card/crouton-card.less +++ b/public/app/framework/crouton-card/crouton-card.less @@ -206,12 +206,12 @@ crouton-card { } paper-button { - display: table; - background-color: @button-normal; - margin-top: 10px; - color: @fc-light; - border-radius: 0px; - font-size: 16px; + display: table !important; + background-color: @button-normal !important; + margin-top: 10px !important; + color: @fc-light !important; + border-radius: 0px !important; + font-size: 16px !important; &.centerBtn { margin-left: auto;