IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restore Page Footer after migration to new scrollbar #9652

Browse Source
This commit is contained in:
Marcus Efraimsson 2017-11-28 14:16:29 +01:00
parent a335150ad1
commit 6c5748203d
7 changed files with 362 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/admin/partials/configuration_home.html
View File

@ -1,12 +1,11 @@
<div class="scroll-canvas" grafana-scrollbar> <navbar model="ctrl.navModel"></navbar>
<navbar model="ctrl.navModel"></navbar> <div class="page-container">
<div class="page-container">
<div class="page-header"> <div class="page-header">
<page-h1 model="ctrl.navModel"></page-h1> <page-h1 model="ctrl.navModel"></page-h1>
</div> </div>
<section class="card-section card-list-layout-grid"> <section class="card-section card-list-layout-grid">
<ol class="card-list" > <ol class="card-list">
<li class="card-item-wrapper" ng-repeat="navItem in ctrl.navModel.node.children"> <li class="card-item-wrapper" ng-repeat="navItem in ctrl.navModel.node.children">
<a class="card-item" ng-href="{{::navItem.url}}"> <a class="card-item" ng-href="{{::navItem.url}}">
<div class="card-item-header"> <div class="card-item-header">
@ -30,4 +29,4 @@
</li> </li>
</ol> </ol>
</section> </section>
</div> </div>

38
public/app/features/dashboard/partials/dashboardList.html
View File

@ -1,6 +1,5 @@
<div class="scroll-canvas" grafana-scrollbar> <navbar model="ctrl.navModel"></navbar>
<navbar model="ctrl.navModel"></navbar> <div class="page-container" style="height: 95%">
<div class="page-container" style="height: 95%">
<div class="page-header"> <div class="page-header">
<h1>Dashboards</h1> <h1>Dashboards</h1>
@ -127,37 +126,10 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div bindonce class="search-section" ng-repeat="dashboard in ctrl.dashboards">
<gf-form-switch
switch-class="gf-form-switch--table-cell"
on-change="ctrl.selectionChanged()"
checked="dashboard.checked">
</gf-form-switch>
<a class="search-item pointer "
bo-href-i="{{dashboard.url}}">
<span class="search-item__icon">
<i class="fa fa-th-large"></i>
</span>
<span class="search-result-tags">
<span ng-click="ctrl.filterByTag(tag, $event)" bindonce ng-repeat="tag in dashboard.tags" tag-color-from-name="tag" class="label label-tag">
{{tag}}
</span>
<i class="fa" bo-class="{'fa-star': dashboard.isStarred, 'fa-star-o': !dashboard.isStarred}"></i>
</span>
<span class="search-result-link">
<i class="fa search-result-icon"></i>
<span bo-text="dashboard.title" />
</span>
</a>
</div> -->
</div> </div>
</div> </div>
</div>
<em class="muted" ng-hide="ctrl.sections.length > 0">
No Dashboards or Folders found.
</em>
</div>
</div> </div>
<em class="muted" ng-hide="ctrl.sections.length > 0">
No Dashboards or Folders found.
</em>

6
public/app/features/plugins/partials/ds_edit.html
View File

@ -1,6 +1,5 @@
<div class="scroll-canvas" grafana-scrollbar> <navbar model="ctrl.navModel"></navbar>
<navbar model="ctrl.navModel"></navbar> <div class="page-container">
<div class="page-container">
<div class="page-header"> <div class="page-header">
<page-h1 model="ctrl.navModel"></page-h1> <page-h1 model="ctrl.navModel"></page-h1>
@ -87,5 +86,4 @@
<div ng-if="ctrl.tabIndex === 1" class="tab-content"> <div ng-if="ctrl.tabIndex === 1" class="tab-content">
<dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list> <dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
</div> </div>
</div>
</div> </div>

8
public/app/features/plugins/partials/ds_list.html
View File

@ -1,6 +1,5 @@
<div class="scroll-canvas" grafana-scrollbar> <navbar model="ctrl.navModel"></navbar>
<navbar model="ctrl.navModel"></navbar> <div class="page-container">
<div class="page-container">
<div class="page-header"> <div class="page-header">
<page-h1 model="ctrl.navModel"></page-h1> <page-h1 model="ctrl.navModel"></page-h1>
@ -12,7 +11,7 @@
<section class="card-section" layout-mode> <section class="card-section" layout-mode>
<layout-selector></layout-selector> <layout-selector></layout-selector>
<ol class="card-list" > <ol class="card-list">
<li class="card-item-wrapper" ng-repeat="ds in ctrl.datasources"> <li class="card-item-wrapper" ng-repeat="ds in ctrl.datasources">
<a class="card-item" href="datasources/edit/{{ds.id}}/"> <a class="card-item" href="datasources/edit/{{ds.id}}/">
<div class="card-item-header"> <div class="card-item-header">
@ -44,5 +43,4 @@
<div ng-if="ctrl.datasources.length === 0"> <div ng-if="ctrl.datasources.length === 0">
<em>No data sources defined</em> <em>No data sources defined</em>
</div> </div>
</div>
</div> </div>

6
public/app/features/plugins/partials/plugin_list.html
View File

@ -1,7 +1,6 @@
<div class="scroll-canvas" grafana-scrollbar> <navbar model="ctrl.navModel"></navbar>
<navbar model="ctrl.navModel"></navbar>
<div class="page-container"> <div class="page-container">
<div class="page-header"> <div class="page-header">
<h1> <h1>
<i class="icon-gf icon-gf-apps"></i> <i class="icon-gf icon-gf-apps"></i>
@ -61,5 +60,4 @@
</li> </li>
</ol> </ol>
</section> </section>
</div>
</div> </div>

2
public/sass/_variables.dark.scss
View File

@ -299,7 +299,7 @@ $checkboxImageUrl: '../img/checkbox.png';
$info-box-background: linear-gradient(100deg, #1a4552, #00374a); $info-box-background: linear-gradient(100deg, #1a4552, #00374a);
// footer // footer
$footer-link-color: $gray-1; $footer-link-color: $gray-2;
$footer-link-hover: $gray-4; $footer-link-hover: $gray-4;
// collapse box // collapse box

72
public/views/index.template.html
View File

@ -36,43 +36,45 @@
</div> </div>
<div class="main-view"> <div class="main-view">
<div class="scroll-canvas" grafana-scrollbar>
<div ng-view></div> <div ng-view></div>
<!-- <footer class="footer"> --> <footer class="footer">
<!-- <div class="row text&#45;center"> --> <div class="row text&#45;center">
<!-- <ul> --> <ul>
<!-- <li> --> <li>
<!-- <a href="http://docs.grafana.org" target="_blank"> --> <a href="http://docs.grafana.org" target="_blank">
<!-- <i class="fa fa&#45;file&#45;code&#45;o"></i> --> <i class="fa fa&#45;file&#45;code&#45;o"></i>
<!-- Docs --> Docs
<!-- </a> --> </a>
<!-- </li> --> </li>
<!-- <li> --> <li>
<!-- <a href="https://grafana.com/services/support" target="_blank"> --> <a href="https://grafana.com/services/support" target="_blank">
<!-- <i class="fa fa&#45;support"></i> --> <i class="fa fa&#45;support"></i>
<!-- Support Plans --> Support Plans
<!-- </a> --> </a>
<!-- </li> --> </li>
<!-- <li> --> <li>
<!-- <a href="https://community.grafana.com/" target="_blank"> --> <a href="https://community.grafana.com/" target="_blank">
<!-- <i class="fa fa&#45;comments&#45;o"></i> --> <i class="fa fa&#45;comments&#45;o"></i>
<!-- Community --> Community
<!-- </a> --> </a>
<!-- </li> --> </li>
<!-- <li> --> <li>
<!-- <a href="https://grafana.com" target="_blank">Grafana</a> --> <a href="https://grafana.com" target="_blank">Grafana</a>
<!-- <span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span> --> <span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
<!-- </li> --> </li>
<!-- [[if .NewGrafanaVersionExists]] --> [[if .NewGrafanaVersionExists]]
<!-- <li> --> <li>
<!-- <a href="https://grafana.com/get" target="_blank" bs&#45;tooltip="'[[.NewGrafanaVersion]]'"> --> <a href="https://grafana.com/get" target="_blank" bs&#45;tooltip="'[[.NewGrafanaVersion]]'">
<!-- New version available! --> New version available!
<!-- </a> --> </a>
<!-- </li> --> </li>
<!-- [[end]] --> [[end]]
<!-- </ul> --> </ul>
<!-- </div> --> </div>
<!-- </footer> --> </footer>
</div>
</div> </div>
</grafana-app> </grafana-app>