Skip to content

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

more markup fixes

parent 8a5c9102
Showing with 46 additions and 41 deletions
src/app/features/account/partials/datasources.html
......@@ -109,12 +109,11 @@
</div>
</div>
<div class="dashboard-editor-footer" style="margin-top: 20px">
<button type="submit" class="btn btn-success" ng-show="editor.index === 1" ng-click="add()">Add</button>
<button type="submit" class="btn btn-success" ng-show="editor.index === 2 && !currentIsNew" ng-click="update()">Update</button>
<button type="submit" class="btn btn-info" ng-show="editor.index === 2 && !currentIsNew" ng-click="cancel()">Cancel</button>
</div>
<br>
<button type="submit" class="btn btn-success" ng-show="editor.index === 1" ng-click="add()">Add</button>
<button type="submit" class="btn btn-success" ng-show="editor.index === 2 && !currentIsNew" ng-click="update()">Update</button>
<button type="submit" class="btn btn-inverse" ng-show="editor.index === 2 && !currentIsNew" ng-click="cancel()">Cancel</button>
<br>
</form>
</div>
</div>
src/app/features/account/partials/import.html
<div ng-include="'app/partials/navbar.html'" ng-init="pageTitle='Import'"></div>
<topnav toggle="toggleSideMenu()"
title="Import"
icon="fa fa-download"
show-menu-btn="!grafana.sidemenu">
</topnav>
<div class="dashboard-edit-view" style="min-height: 500px">
<div class="gf-box" style="min-height: 500px">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<div class="gf-box-header">
<div class="gf-box-title">
<i class="fa fa-th-large"></i>
Import Dashboards
</div>
</div>
<div class="dashboard-editor-body">
<div class="gf-box-body">
<div class="editor-row">
<div class="section">
......
src/app/features/annotations/partials/editor.html
......@@ -73,10 +73,12 @@
<div ng-include src="currentDatasource.editorSrc">
</div>
<div class="dashboard-editor-footer">
<button ng-show="editor.index === 1" type="button" class="btn btn-success" ng-click="add()">Add</button>
<button ng-show="editor.index === 2" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
</div>
<br>
<button ng-show="editor.index === 1" type="button" class="btn btn-success" ng-click="add()">Add</button>
<button ng-show="editor.index === 2" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
<br>
<br>
</div>
</div>
</div>
src/app/panels/timepicker/custom.html
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<div class="gf-box-header">
<div class="gf-box-title">
<i class="fa fa-clock-o"></i>
Custom time range
</div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</button>
</div>
<div class="dashboard-editor-body">
<div class="gf-box-body">
<style>
.timepicker-to-column {
margin-top: 10px;
......@@ -73,12 +76,9 @@
</form>
<div class="clearfix"></div>
</div>
</div>
<div class="dashboard-editor-footer">
<form name="input" style="margin-bottom:0">
<span class="" ng-hide="input.$valid">Invalid date or range</span>
<button ng-click="setAbsoluteTimeFilter(validate(temptime));dismiss();" ng-disabled="!input.$valid" class="btn btn-success">Apply</button>
<button ng-click="dismiss();" class="btn btn-success pull-right">Cancel</button>
</form>
</div>
src/app/partials/login.html
......@@ -23,7 +23,7 @@
<strong>User</strong>
</li>
<li>
<input type="text" name="username" class="tight-form-input last" ng-model='formModel.user' placeholder="email or username" style="width: 246px">
<input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 246px">
</li>
</ul>
<div class="clearfix"></div>
......
src/app/partials/navbar.html
......@@ -7,11 +7,6 @@
section="{{pageSection}}"
show-menu-btn="!grafana.sidemenu">
</topnav>
<ul class="nav">
<li>
<a href="asd">Data Sources</a>
</li>
</ul>
</div>
</div>
</div>
......
src/app/partials/paneleditor.html
<div bindonce class="dashboard-editor-header">
<div class="dashboard-editor-title">
<div bindonce class="gf-box-header">
<div class="gf-box-title">
<i class="fa fa-text-width"></i>
<span bo-text="panel.type+' settings'"></span>
</div>
......@@ -9,14 +9,14 @@
</div>
</div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</button>
</div>
<div class="dashboard-editor-body">
<div class="gf-box-body">
<div ng-repeat="tab in panelMeta.editorTabs" ng-show="editor.index == $index">
<div ng-include src="tab.src"></div>
</div>
</div>
<div class="dashboard-editor-footer">
<button type="button" class="btn btn-success pull-right" ng-click="editor.index=0;dismiss()">Close</button>
</div>
src/app/partials/playlist.html
<div ng-controller="PlaylistCtrl" ng-init="init()">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<div class="gf-box-header">
<div class="gf-box-title">
<i class="fa fa-play"></i>
Start dashboard playlist
</div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</button>
</div>
<div class="dashboard-editor-body">
<div class="gf-box-body">
<div class="editor-row">
<div class="section">
......@@ -52,11 +57,11 @@
<input type="text" class="input-small" ng-model="timespan" />
</div>
</div>
</div>
</div>
<div class="dashboard-editor-footer">
<button class="btn btn-success" ng-click="start();dismiss();"><i class="fa fa-play"></i> Start</button>
<button type="button" class="btn btn-success pull-right" ng-click="dismiss();">Close</button>
<br>
<button class="btn btn-success pull-right" ng-click="start();dismiss();"><i class="fa fa-play"></i> Start</button>
<br>
</div>
</div>
src/css/less/bootswatch.dark.less
......@@ -361,7 +361,7 @@ div.subnav {
.btn {
padding: 5px 12px;
background-image: none;
.box-shadow(none);
.box-shadow(0px 0px 8px @bodyBackground);
border: none;
.border-radius(3px);
text-shadow: none;
......
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