public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-04-15 19:57:12 -04:00
parent e307ada374 4f2628c221
commit 6b2fedb1c2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/timepicker/timepicker.html
+1 -1
View File
@@ -3,7 +3,7 @@
<li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time backward <br> (left arrow key)'" data-placement="bottom"> <li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time backward <br> (left arrow key)'" data-placement="bottom">
<a ng-click='ctrl.move(-1)'><i class="fa fa-chevron-left"></i></a> <a ng-click='ctrl.move(-1)'><i class="fa fa-chevron-left"></i></a>
</li> </li>
<li class="dashnav-zoom-out gf-timepicker-time-control" bs-tooltip="'Time range zoom in <br> CTRL+Z'" data-placement="bottom"> <li class="dashnav-zoom-out gf-timepicker-time-control" bs-tooltip="'Time range zoom out <br> CTRL+Z'" data-placement="bottom">
<a ng-click='ctrl.zoom(2)'>Zoom Out</a></li> <a ng-click='ctrl.zoom(2)'>Zoom Out</a></li>
</li> </li>
<li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time forward <br> (right arrow key)'" data-placement="bottom"> <li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time forward <br> (right arrow key)'" data-placement="bottom">
public/app/features/dashboard/timepicker/timepicker.ts
+1 -1
View File
@@ -92,7 +92,7 @@ export class TimePickerCtrl {
move(direction) { move(direction) {
var range = this.timeSrv.timeRange(); var range = this.timeSrv.timeRange();
var timespan = (range.to.valueOf() - range.from.valueOf()); var timespan = (range.to.valueOf() - range.from.valueOf()) / 2;
var to, from; var to, from;
if (direction === -1) { if (direction === -1) {
to = range.to.valueOf() - timespan; to = range.to.valueOf() - timespan;
public/app/features/templating/partials/editor.html
+4 -4
View File
@@ -217,10 +217,10 @@
<div class="gf-form-group"> <div class="gf-form-group">
<h5>Preview of values (shows max 20)</h5> <h5>Preview of values (shows max 20)</h5>
<div class="gf-form"> <div class="gf-form-inline">
<span class="gf-form-label" ng-repeat="option in current.options | limitTo: 20"> <div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
{{option.text}} <span class="gf-form-label">{{option.text}}</span>
</span> </div>
</div> </div>
</div> </div>
</div> </div>