IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar

Browse Source
This commit is contained in:
Daniel Lee 2018-04-11 18:33:00 +02:00
commit e74be16900
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/components/scroll/page_scroll.ts
View File

@ -29,7 +29,11 @@ export function pageScrollbar() {
scope.$on('$routeChangeSuccess', () => { scope.$on('$routeChangeSuccess', () => {
lastPos = 0; lastPos = 0;
elem[0].scrollTop = 0; elem[0].scrollTop = 0;
elem[0].focus();
}); });
elem[0].tabIndex = -1;
elem[0].focus();
}, },
}; };
} }

3
public/app/features/panel/panel_directive.ts
View File

@ -113,7 +113,8 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
`; `;
let scrollRoot = panelContent; let scrollRoot = panelContent;
let scroller = panelContent.find(':first-child').find(':first-child'); let scroller = panelContent.find(':first').find(':first');
scrollRoot.addClass(scrollRootClass); scrollRoot.addClass(scrollRootClass);
$(scrollBarHTML).appendTo(scrollRoot); $(scrollBarHTML).appendTo(scrollRoot);
scroller.addClass(scrollerClass); scroller.addClass(scrollerClass);

4
public/app/plugins/panel/dashlist/module.html
View File

@ -1,4 +1,5 @@
<div class="dashlist" ng-repeat="group in ctrl.groups"> <div>
<div class="dashlist" ng-repeat="group in ctrl.groups">
<div class="dashlist-section" ng-if="group.show"> <div class="dashlist-section" ng-if="group.show">
<h6 class="dashlist-section-header" ng-show="ctrl.panel.headings"> <h6 class="dashlist-section-header" ng-show="ctrl.panel.headings">
{{group.header}} {{group.header}}
@ -14,4 +15,5 @@
</a> </a>
</div> </div>
</div> </div>
</div>
</div> </div>

6
public/sass/components/_scrollbar.scss
View File

@ -268,10 +268,14 @@
} }
} }
.baron._scrolling > .baron__track .baron__bar { .panel-hover-highlight .baron__track .baron__bar {
opacity: 0.6; opacity: 0.6;
} }
.baron._scrolling > .baron__track .baron__bar {
opacity: 0.9;
}
.baron__control { .baron__control {
display: none; display: none;
} }

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

@ -40,7 +40,7 @@
</div> </div>
<div class="main-view"> <div class="main-view">
<div class="scroll-canvas"> <div class="scroll-canvas" page-scrollbar>
<div ng-view></div> <div ng-view></div>
<footer class="footer"> <footer class="footer">