Merge branch 'master' of github.com:torkelo/grafana-private into pro

Conflicts: src/app/app.js src/app/controllers/all.js src/app/routes/all.js src/app/services/datasourceSrv.js src/test/test-main.js
2014-12-31 12:07:22 +01:00
parent 11b44f2b01 d1e33ec071
commit 75c77a44c9
98 changed files with 226 additions and 162 deletions
@@ -62,6 +62,7 @@
  left: 0;
  padding: 0px 17px 6px 5px;
  top: 0;
+  z-index: 10;
  i {
    position: relative;
    top: -2px;