Commit 9fb5367e by Torkel Ödegaard

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

parents 2765c2ec c63569b6
<div class="variable-link-wrapper"> <div class="variable-link-wrapper">
<a ng-click="vm.show()" class="gf-form-label variable-value-link"> <a ng-click="vm.show()" class="variable-value-link">
{{vm.linkText}} {{vm.linkText}}
<span ng-repeat="tag in vm.selectedTags" bs-tooltip='tag.valuesText' data-placement="bottom"> <span ng-repeat="tag in vm.selectedTags" bs-tooltip='tag.valuesText' data-placement="bottom">
<span class="label-tag"tag-color-from-name="tag.text"> <span class="label-tag"tag-color-from-name="tag.text">
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{{tag.text}} {{tag.text}}
</span> </span>
</span> </span>
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down" style="font-size:12px"></i>
</a> </a>
<input type="text" class="gf-form-input" style="display: none" ng-keydown="vm.keyDown($event)" ng-model="vm.search.query" ng-change="vm.queryChanged()" ></input> <input type="text" class="gf-form-input" style="display: none" ng-keydown="vm.keyDown($event)" ng-model="vm.search.query" ng-change="vm.queryChanged()" ></input>
......
...@@ -38,7 +38,11 @@ ...@@ -38,7 +38,11 @@
.variable-value-link { .variable-value-link {
padding-right: 10px; padding-right: 10px;
padding: 8px 7px; padding: $input-padding-y $input-padding-x;
background-color: $input-bg;
border: 1px solid $input-border-color;
border-radius: $input-border-radius;
color: $input-color;
box-sizing: content-box; box-sizing: content-box;
display: inline-block; display: inline-block;
color: $text-color; color: $text-color;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment