mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
feat(mixed datasource): minor progress
This commit is contained in:
parent
a16c63a43e
commit
56d5b0b12a
@ -14,7 +14,7 @@
|
||||
<span class="dropdown" ng-if="datasource.meta.type === 'mixed'">
|
||||
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="fa fa-plus"></i>
|
||||
Query
|
||||
Query <span class="caret"></span>
|
||||
</button>
|
||||
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
@ -34,12 +34,12 @@
|
||||
<div class="pull-right dropdown" style="margin-right: 10px;">
|
||||
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" bs-tooltip="'Datasource'">
|
||||
<i class="fa fa-database"></i>
|
||||
{{datasource.name}} <span class="caret"></span>
|
||||
{{datasource.name}} <span class="caret"></span>
|
||||
</button>
|
||||
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li ng-repeat="datasource in datasources" role="menuitem">
|
||||
<a ng-click="setDatasource(datasource.value);">{{datasource.name}}</a>
|
||||
<a ng-click="setDatasource(datasource);">{{datasource.name}}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
@ -358,7 +358,6 @@ div.subnav {
|
||||
|
||||
// BUTTONS
|
||||
// -----------------------------------------------------
|
||||
|
||||
.btn {
|
||||
padding: 5px 12px;
|
||||
background-image: none;
|
||||
@ -389,13 +388,6 @@ div.subnav {
|
||||
}
|
||||
|
||||
.btn-group {
|
||||
|
||||
& > .btn:first-child,
|
||||
& > .btn:last-child,
|
||||
& > .dropdown-toggle {
|
||||
.border-radius(0);
|
||||
}
|
||||
|
||||
& > .btn + .dropdown-toggle {
|
||||
.box-shadow(none);
|
||||
}
|
||||
|
1
public/vendor/bootstrap/less/bootstrap.less
vendored
1
public/vendor/bootstrap/less/bootstrap.less
vendored
@ -32,6 +32,7 @@
|
||||
|
||||
// Components: Buttons & Alerts
|
||||
@import "buttons.less";
|
||||
// @import "button-groups.less";
|
||||
@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
|
||||
|
||||
// Components: Nav
|
||||
|
Loading…
Reference in New Issue
Block a user