diff --git a/package.json b/package.json index 02576cdcbef..e96f9bd78a5 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,6 @@ "d3-scale-chromatic": "^1.1.1", "eventemitter3": "^2.0.2", "file-saver": "^1.3.3", - "gemini-scrollbar": "https://github.com/grafana/gemini-scrollbar#grafana", "jquery": "^3.2.1", "lodash": "^4.17.4", "moment": "^2.18.1", diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts index 9ccab431256..a43ef59ec84 100644 --- a/public/app/core/components/scroll/scroll.ts +++ b/public/app/core/components/scroll/scroll.ts @@ -1,20 +1,20 @@ -import GeminiScrollbar from 'gemini-scrollbar'; +import PerfectScrollbar from 'perfect-scrollbar'; import coreModule from 'app/core/core_module'; export function geminiScrollbar() { return { restrict: 'A', link: function(scope, elem, attrs) { - var myScrollbar = new GeminiScrollbar({ - autoshow: false, - element: elem[0] - }).create(); + + let scrollbar = new PerfectScrollbar(elem[0]); + console.log('scrllbar!'); scope.$on('$destroy', () => { - myScrollbar.destroy(); + scrollbar.destroy(); }); + } }; } -coreModule.directive('geminiScrollbar', geminiScrollbar); +coreModule.directive('grafanaScrollbar', geminiScrollbar); diff --git a/public/app/core/components/search/search.html b/public/app/core/components/search/search.html index 7cd7628282f..cbdd3a94b1b 100644 --- a/public/app/core/components/search/search.html +++ b/public/app/core/components/search/search.html @@ -40,51 +40,49 @@
-
-
-
- - - {{tag.term}}  ({{tag.count}}) - -
+
+
+ + + {{tag.term}}  ({{tag.count}}) +
+
-
-
No dashboards matching your query were found.
+
+
No dashboards matching your query were found.
-
- - - {{::section.title}} - - +
+ + + {{::section.title}} + + + + +
@@ -95,4 +93,5 @@
+
diff --git a/public/app/features/admin/partials/configuration_home.html b/public/app/features/admin/partials/configuration_home.html index 0d56497cdde..19f6cae770f 100644 --- a/public/app/features/admin/partials/configuration_home.html +++ b/public/app/features/admin/partials/configuration_home.html @@ -1,35 +1,33 @@ -
-
- -
-
- -
+
+ +
+
+ +
-
-
    -
  1. - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - {{navItem.text}} -
    -
    - {{navItem.description}} -
    -
    -
    -     -
    2. -
-
-
-
+
+
    +
  1. + +
    +
    +
    +
    +
    +
    + +
    +
    +
    + {{navItem.text}} +
    +
    + {{navItem.description}} +
    +
    +
    +     +
    2. +
+
+
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts index ba70990126c..2e183e70b4a 100644 --- a/public/app/features/panel/panel_directive.ts +++ b/public/app/features/panel/panel_directive.ts @@ -102,9 +102,7 @@ module.directive('grafanaPanel', function($rootScope, $document) { // update scrollbar after mounting ctrl.events.on('component-did-mount', () => { if (ctrl.__proto__.constructor.scrollable) { - panelScrollbar = new PerfectScrollbar(panelContent[0], { - minScrollbarLength: 20 - }); + panelScrollbar = new PerfectScrollbar(panelContent[0]); } }); @@ -191,6 +189,10 @@ module.directive('grafanaPanel', function($rootScope, $document) { if (infoDrop) { infoDrop.destroy(); } + + if (panelScrollbar) { + panelScrollbar.update(); + } }); } }; diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html index e039fbd83ae..58396e816b3 100644 --- a/public/app/features/plugins/partials/ds_edit.html +++ b/public/app/features/plugins/partials/ds_edit.html @@ -1,90 +1,88 @@ -
-
- -
-
- +
+ +
+
+ -
Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
+
Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
-
- +
+ +
+
+ +
+ +
+
+
+
+ Name + + + The name is used when you select the data source in panels. + The Default data source is preselected in new + panels. + +
+ +
+ +
+ Type +
+ +
+
-
-
+
+ This plugin is marked as being in alpha state, which means it is in early development phase and + updates will include breaking changes. +
- -
-
-
- Name - - - The name is used when you select the data source in panels. - The Default data source is preselected in new - panels. - -
- + + + + + +
+
Testing....
+
+
+ +
- -
- Type -
- -
+
+
{{ctrl.testing.message}}
+
-
- This plugin is marked as being in alpha state, which means it is in early development phase and - updates will include breaking changes. -
+
+ + + Cancel +
- - - - +
+
+
-
-
Testing....
-
-
- - -
-
-
{{ctrl.testing.message}}
-
-
-
- -
- - - Cancel -
- -
-
-
- - -
+
diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html index b5e01e101b4..aaa2c536d88 100644 --- a/public/app/features/plugins/partials/ds_list.html +++ b/public/app/features/plugins/partials/ds_list.html @@ -1,51 +1,49 @@ -
- diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html index a81c9931228..6d75fe9cc30 100644 --- a/public/app/features/plugins/partials/plugin_list.html +++ b/public/app/features/plugins/partials/plugin_list.html @@ -1,68 +1,65 @@ -
- diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index 58fea114aeb..855237cb557 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -1,18 +1,16 @@
-
-
-
-
+
+
+
- - + + - - + + -
diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss index 70aca85681e..03b5fb5eed9 100644 --- a/public/sass/components/_scrollbar.scss +++ b/public/sass/components/_scrollbar.scss @@ -1,5 +1,23 @@ @import "~perfect-scrollbar/css/perfect-scrollbar.css"; +.ps__rail-x:hover, +.ps__rail-y:hover, +.ps__rail-x:focus, +.ps__rail-y:focus { + background-color: transparent; + opacity: 0.9; +} + +.ps__thumb-y { + @include gradient-vertical($blue, lighten($blue, 20%)); +} + +.ps__rail-y:hover > .ps__thumb-y, +.ps__rail-y:focus > .ps__thumb-y { + background-color: #999; + width: 6px; +} + /** * gemini-scrollbar * @version 1.5.2 diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index 9fad62ef60c..cd7ac6d24b9 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -79,6 +79,7 @@ height: 100%; display: block; padding: $spacer; + position: relative; flex-grow: 10; .selected {