Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
56d5b0b1
Commit
56d5b0b1
authored
Aug 17, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(mixed datasource): minor progress
parent
a16c63a4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
11 deletions
+4
-11
public/app/partials/metrics.html
+3
-3
public/css/less/bootswatch.dark.less
+0
-8
public/vendor/bootstrap/less/bootstrap.less
+1
-0
No files found.
public/app/partials/metrics.html
View file @
56d5b0b1
...
...
@@ -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>
...
...
public/css/less/bootswatch.dark.less
View file @
56d5b0b1
...
...
@@ -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);
}
...
...
public/vendor/bootstrap/less/bootstrap.less
View file @
56d5b0b1
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment