Skip to content

N
nexpie-grafana-theme
Commit fa06040e by Torkel Ödegaard
Options

ux(): updated playlist, other other minor fixes

parent eae4bb74
Showing with 12 additions and 35 deletions
public/app/features/playlist/partials/playlist.html
...@@ -2,51 +2,28 @@ ...@@ -2,51 +2,28 @@
</navbar> </navbar>
<div class="page-container" ng-form="playlistEditForm"> <div class="page-container" ng-form="playlistEditForm">
<div class="page">
<h1 ng-show="ctrl.isNew()">New Playlist</h1> <h1 ng-show="ctrl.isNew()">New Playlist</h1>
<h1 ng-show="!ctrl.isNew()">Edit Playlist</h1> <h1 ng-show="!ctrl.isNew()">Edit Playlist</h1>
<h3>Name and interval</h3> <h3>Name and interval</h3>
<div style="margin-bottom: 10px;"> <div class="gf-form-group">
<div> <div class="gf-form">
<div class="norm-form"> <span class="gf-form-label gf-size-s">Name</span>
<ul class="norm-form-list"> <input type="text" required ng-model="ctrl.playlist.name" class="gf-form-input gf-form-size-xl">
<li class="norm-form-item" style="width: 100px">
Name
</li>
<li>
<input type="text" required ng-model="ctrl.playlist.name" class="input-xlarge norm-form-input">
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
<div class="norm-form last"> <div class="gf-form">
<ul class="norm-form-list"> <span class="gf-form-label gf-size-s">Interval</span>
<li class="norm-form-item" style="width: 100px"> <input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="gf-form-input gf-form-s">
Interval
</li>
<li>
<input type="text" required ng-model="ctrl.playlist.interval" placeholder="5m" class="input-xlarge norm-form-input">
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
</div> </div>
<br> <div class="row" style="max-width: 400px">
</div>
</div>
<div class="row">
<div class="span5 pull-left">
<h5>Add dashboards</h5> <h5>Add dashboards</h5>
<div style=""> <div style="">
<playlist-search class="playlist-search-container" search-started="ctrl.searchStarted(promise)"></playlist-search> <playlist-search class="playlist-search-container" search-started="ctrl.searchStarted(promise)"></playlist-search>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="span5 pull-left" ng-if="ctrl.filteredDashboards.length > 0"> <div class="span5 pull-left" ng-if="ctrl.filteredDashboards.length > 0">
......
public/less/overrides.less
...@@ -182,7 +182,7 @@ form input.ng-invalid { ...@@ -182,7 +182,7 @@ form input.ng-invalid {
.row-open { .row-open {
margin-top: 5px; margin-top: 5px;
left:-34px; left:-28px;
position: absolute; position: absolute;
z-index: 100; z-index: 100;
transition: .10s left; transition: .10s left;
......
public/less/playlist.less
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
} }
.playlist-search-switches { .playlist-search-switches {
position: relative; position: absolute;
top: -39px; top: 8px;
left: 260px; right: 11px;
} }
.playlist-search-field-wrapper { .playlist-search-field-wrapper {
......
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