From be2e2577b82d7570abb6d6330eb7516d2c856763 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Mon, 25 Jan 2016 22:59:48 +0100 Subject: [PATCH 1/5] fixes #3839 Uses width set to 800px for invite div instead of position fixed. It looks the same for desktop and makes the button clickable on smaller resolutions and mobile. Although it is not really responsive so the text will be small on mobiles. Better that though than a non-clickable button. --- public/less/login.less | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/public/less/login.less b/public/less/login.less index 924659d9e16..e599bca1927 100644 --- a/public/less/login.less +++ b/public/less/login.less @@ -110,13 +110,9 @@ text-align: center; border: 1px solid @grafanaTargetFuncBackground; background-color: @grafanaPanelBackground; - position: fixed; - max-width: 800px; - left: 0; - right: 0; + width: 800px; margin-left: auto; margin-right: auto; - top: 20%; .tight-form { text-align: left; From ab4d02021214c11d078879244a360c71f710f8a7 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 26 Jan 2016 20:33:00 +0100 Subject: [PATCH 2/5] fix(circleci): updates npm before npm install npm for node 4 on circleci is really old. This updates npm and will hopefully make the build green again. --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index bb22fcb0a6e..71fa0013122 100644 --- a/circle.yml +++ b/circle.yml @@ -12,6 +12,7 @@ dependencies: - mkdir -p ${GOPATH}/src/${ORG_PATH} - ln -s ~/grafana ${GOPATH}/src/${ORG_PATH} - go get github.com/tools/godep + - npm install -g npm - npm install test: From 979807feeecdf3de1d521791b1f5b8f819723dd7 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 26 Jan 2016 20:44:24 +0100 Subject: [PATCH 3/5] fix(circleci): deletes node_modules before npm install --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 71fa0013122..a3280ae18e5 100644 --- a/circle.yml +++ b/circle.yml @@ -12,6 +12,7 @@ dependencies: - mkdir -p ${GOPATH}/src/${ORG_PATH} - ln -s ~/grafana ${GOPATH}/src/${ORG_PATH} - go get github.com/tools/godep + - rm -rf node_modules - npm install -g npm - npm install From 98982b7a746d541b7168237c6bd08fa560bb857f Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Tue, 26 Jan 2016 18:49:21 +0100 Subject: [PATCH 4/5] docs(singlestat) updates threshold explanation The implementation of thresholds changed after fixing #3248. Docs updated to reflect and explain the change. --- docs/sources/reference/singlestat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md index 91724e89882..954bfeed8b7 100644 --- a/docs/sources/reference/singlestat.md +++ b/docs/sources/reference/singlestat.md @@ -31,7 +31,7 @@ The coloring options of the Singlestat Panel config allow you to dynamically cha 1. `Background`: This checkbox applies the configured thresholds and colors to the entirety of the Singlestat Panel background. 2. `Value`: This checkbox applies the configured thresholds and colors to the summary stat. -3. `Thresholds`: Change the background and value colors dynamically within the panel, depending on the Singlestat value. The threshold field accepts **3 comma-separated** values, corresponding to the three colors directly to the right. +3. `Thresholds`: Change the background and value colors dynamically within the panel, depending on the Singlestat value. The threshold field accepts **2 comma-separated** values which represent 3 ranges that correspond to the three colors directly to the right. For example: if the thresholds are 70, 90 then the first color represents < 70, the second color represents between 70 and 90 and the third color represents > 90. 4. `Colors`: Select a color and opacity 5. `Invert order`: This link toggles the threshold color order.
For example: Green, Orange, Red () will become Red, Orange, Green (). From 4b59cee17a55e2ac18ce639a01803ecd8c2de5e6 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 26 Jan 2016 21:11:36 +0100 Subject: [PATCH 5/5] fix(search): add missing ctrl property in view --- public/app/core/components/search/search.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index 1f51c8e0650..bbd4c66b170 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -5,11 +5,11 @@
- + starred | - + tags @@ -30,7 +30,7 @@
+ ng-click="ctrl.filterByTag(tag.term, $event)"> {{tag.term}}  ({{tag.count}})