Merge branch 'develop' of github.com:grafana/grafana into develop

public/app/features/dashboard/repeat_option/repeat_option.ts

 import {coreModule} from 'app/core/core';
 import {coreModule} from 'app/core/core';
 
 
 var template = `
 var template = `
-<div class="gf-form-select-wrapper max-width-13">
+<div class="gf-form-select-wrapper max-width-18">
   <select class="gf-form-input" ng-model="panel.repeat" ng-options="f.value as f.text for f in variables" ng-change="optionChanged()">
   <select class="gf-form-input" ng-model="panel.repeat" ng-options="f.value as f.text for f in variables" ng-change="optionChanged()">
   <option value=""></option>
   <option value=""></option>
 </div>
 </div>

public/app/features/templating/partials/editor.html

@@ -167,14 +167,14 @@
 						</select>
 						</select>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="gf-form max-width-21">
+				<div class="gf-form max-width-22">
 					<span class="gf-form-label width-7">
 					<span class="gf-form-label width-7">
 						Refresh
 						Refresh
 						<info-popover mode="right-normal">
 						<info-popover mode="right-normal">
 							When to update the values of this variable.
 							When to update the values of this variable.
 						</info-popover>
 						</info-popover>
 					</span>
 					</span>
-					<div class="gf-form-select-wrapper max-width-14">
+					<div class="gf-form-select-wrapper width-15">
 						<select class="gf-form-input" ng-model="current.refresh" ng-options="f.value as f.text for f in refreshOptions"></select>
 						<select class="gf-form-input" ng-model="current.refresh" ng-options="f.value as f.text for f in refreshOptions"></select>
 					</div>
 					</div>
 				</div>
 				</div>

public/app/plugins/datasource/grafana/partials/annotations.editor.html

@@ -11,7 +11,7 @@
 					</ul>
 					</ul>
 				</info-popover>
 				</info-popover>
 			</span>
 			</span>
-			<div class="gf-form-select-wrapper width-8">
+			<div class="gf-form-select-wrapper width-9">
 				<select class="gf-form-input" ng-model="ctrl.annotation.type" ng-options="f.value as f.text for f in ctrl.types">
 				<select class="gf-form-input" ng-model="ctrl.annotation.type" ng-options="f.value as f.text for f in ctrl.types">
 				</select>
 				</select>
 			</div>
 			</div>

public/app/plugins/panel/graph/tab_display.html

@@ -78,7 +78,7 @@
 			<div class="gf-form">
 			<div class="gf-form">
 				<label class="gf-form-label width-7">Null value</label>
 				<label class="gf-form-label width-7">Null value</label>
 				<div class="gf-form-select-wrapper">
 				<div class="gf-form-select-wrapper">
-					<select class="gf-form-input max-width-8" ng-model="ctrl.panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="ctrl.render()"></select>
+					<select class="gf-form-input max-width-9" ng-model="ctrl.panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="ctrl.render()"></select>
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>