public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more markup fixes

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-02-02 08:59:38 +01:00
parent 8a5c91021d
commit f424abf87c
9 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/features/account/partials/datasources.html
+5 -6
View File
@@ -109,12 +109,11 @@
</div> </div>
</div> </div>
<div class="dashboard-editor-footer" style="margin-top: 20px"> <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 === 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-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> <button type="submit" class="btn btn-inverse" ng-show="editor.index === 2 && !currentIsNew" ng-click="cancel()">Cancel</button>
</div> <br>
</form> </form>
</div> </div>
</div> </div>
src/app/features/account/partials/import.html
+9 -5
View File
@@ -1,15 +1,19 @@
<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="gf-box-header">
<div class="dashboard-editor-title"> <div class="gf-box-title">
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
Import Dashboards Import Dashboards
</div> </div>
</div> </div>
<div class="dashboard-editor-body"> <div class="gf-box-body">
<div class="editor-row"> <div class="editor-row">
<div class="section"> <div class="section">
src/app/features/annotations/partials/editor.html
+6 -4
View File
@@ -73,10 +73,12 @@
<div ng-include src="currentDatasource.editorSrc"> <div ng-include src="currentDatasource.editorSrc">
</div> </div>
<div class="dashboard-editor-footer"> <br>
<button ng-show="editor.index === 1" type="button" class="btn btn-success" ng-click="add()">Add</button> <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> <button ng-show="editor.index === 2" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
</div> <br>
<br>
</div> </div>
</div> </div>
</div> </div>
src/app/panels/timepicker/custom.html
+6 -6
View File
@@ -1,11 +1,14 @@
<div class="dashboard-editor-header"> <div class="gf-box-header">
<div class="dashboard-editor-title"> <div class="gf-box-title">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
Custom time range Custom time range
</div> </div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</button>
</div> </div>
<div class="dashboard-editor-body"> <div class="gf-box-body">
<style> <style>
.timepicker-to-column { .timepicker-to-column {
margin-top: 10px; margin-top: 10px;
@@ -73,12 +76,9 @@
</form> </form>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
</div>
<div class="dashboard-editor-footer">
<form name="input" style="margin-bottom:0"> <form name="input" style="margin-bottom:0">
<span class="" ng-hide="input.$valid">Invalid date or range</span> <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="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> </form>
</div> </div>
src/app/partials/login.html
+1 -1
View File
@@ -23,7 +23,7 @@
<strong>User</strong> <strong>User</strong>
</li> </li>
<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> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
src/app/partials/navbar.html
-5
View File
@@ -7,11 +7,6 @@
section="{{pageSection}}" section="{{pageSection}}"
show-menu-btn="!grafana.sidemenu"> show-menu-btn="!grafana.sidemenu">
</topnav> </topnav>
<ul class="nav">
<li>
<a href="asd">Data Sources</a>
</li>
</ul>
</div> </div>
</div> </div>
</div> </div>
src/app/partials/paneleditor.html
+6 -6
View File
@@ -1,5 +1,5 @@
<div bindonce class="dashboard-editor-header"> <div bindonce class="gf-box-header">
<div class="dashboard-editor-title"> <div class="gf-box-title">
<i class="fa fa-text-width"></i> <i class="fa fa-text-width"></i>
<span bo-text="panel.type+' settings'"></span> <span bo-text="panel.type+' settings'"></span>
</div> </div>
@@ -9,14 +9,14 @@
</div> </div>
</div> </div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</button>
</div> </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-repeat="tab in panelMeta.editorTabs" ng-show="editor.index == $index">
<div ng-include src="tab.src"></div> <div ng-include src="tab.src"></div>
</div> </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
+13 -8
View File
@@ -1,12 +1,17 @@
<div ng-controller="PlaylistCtrl" ng-init="init()"> <div ng-controller="PlaylistCtrl" ng-init="init()">
<div class="dashboard-editor-header"> <div class="gf-box-header">
<div class="dashboard-editor-title"> <div class="gf-box-title">
<i class="fa fa-play"></i> <i class="fa fa-play"></i>
Start dashboard playlist Start dashboard playlist
</div> </div>
<button class="gf-box-header-close-btn" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</button>
</div> </div>
<div class="dashboard-editor-body"> <div class="gf-box-body">
<div class="editor-row"> <div class="editor-row">
<div class="section"> <div class="section">
@@ -52,11 +57,11 @@
<input type="text" class="input-small" ng-model="timespan" /> <input type="text" class="input-small" ng-model="timespan" />
</div> </div>
</div> </div>
</div>
</div>
<div class="dashboard-editor-footer"> </div>
<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>
</div> </div>
src/css/less/bootswatch.dark.less
+1 -1
View File
@@ -361,7 +361,7 @@ div.subnav {
.btn { .btn {
padding: 5px 12px; padding: 5px 12px;
background-image: none; background-image: none;
.box-shadow(none); .box-shadow(0px 0px 8px @bodyBackground);
border: none; border: none;
.border-radius(3px); .border-radius(3px);
text-shadow: none; text-shadow: none;