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

scrollbar: styles cleanup

Browse Source
This commit is contained in:
Alexander Zobnin 2018-04-06 20:00:03 +03:00
parent 9f07ae72ee
commit d3d64337b4
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/components/scroll/scroll.ts
View File

@ -77,7 +77,6 @@ export function geminiScrollbar() {
}); });
scope.$on('$destroy', () => { scope.$on('$destroy', () => {
// scrollbar.destroy();
scrollbar.dispose(); scrollbar.dispose();
}); });
}, },

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

@ -125,6 +125,8 @@ module.directive('grafanaPanel', function($rootScope, $document, $timeout) {
barOnCls: '_scrollbar', barOnCls: '_scrollbar',
scrollingCls: '_scrolling', scrollingCls: '_scrolling',
}); });
panelScrollbar.scroll();
} }
}); });

5
public/app/plugins/panel/graph/legend.ts
View File

@ -18,9 +18,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
const legendRightDefaultWidth = 10; const legendRightDefaultWidth = 10;
scope.$on('$destroy', function() { scope.$on('$destroy', function() {
if (legendScrollbar) { destroyScrollbar();
legendScrollbar.dispose();
}
}); });
ctrl.events.on('render-legend', () => { ctrl.events.on('render-legend', () => {
@ -288,6 +286,7 @@ module.directive('graphLegend', function(popoverSrv, $timeout) {
destroyScrollbar(); destroyScrollbar();
legendScrollbar = baron(scrollbarParams); legendScrollbar = baron(scrollbarParams);
} }
legendScrollbar.scroll();
} }
function destroyScrollbar() { function destroyScrollbar() {

5
public/sass/components/_panel_graph.scss
View File

@ -58,7 +58,7 @@
position: relative; position: relative;
// fix for Firefox (white stripe on the right of scrollbar) // fix for Firefox (white stripe on the right of scrollbar)
width: 99%; width: calc(100% - 1px);
.popover-content { .popover-content {
padding: 0; padding: 0;
@ -67,6 +67,9 @@
.graph-legend-content { .graph-legend-content {
position: relative; position: relative;
// fix for Firefox (white stripe on the right of scrollbar)
width: calc(100% - 1px);
} }
.graph-legend-scroll { .graph-legend-scroll {

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

@ -189,10 +189,6 @@
.baron { .baron {
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
// Width needs to be set to prevent content width issues
// Set to 99% instead of 100% for fixing Firefox issue (white stripe on the right of scrollbar)
width: 99%;
} }
// Fix for side menu on mobile devices // Fix for side menu on mobile devices
@ -203,7 +199,6 @@
.baron__clipper { .baron__clipper {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
height: 100%;
} }
.baron__scroller { .baron__scroller {
@ -289,8 +284,8 @@
.baron.panel-content--scrollable { .baron.panel-content--scrollable {
// Width needs to be set to prevent content width issues // Width needs to be set to prevent content width issues
// Set to 99% instead of 100% for fixing Firefox issue (white stripe on the right of scrollbar) // Set to less than 100% for fixing Firefox issue (white stripe on the right of scrollbar)
width: 99%; width: calc(100% - 2px);
.baron__scroller { .baron__scroller {
padding-top: 1px; padding-top: 1px;