Skip to content

Commit

Permalink
Merge branch 'master' into minimist
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Sep 17, 2020
2 parents 1d86c9c + 94a4fc9 commit 3aeeddb
Show file tree
Hide file tree
Showing 49 changed files with 837 additions and 963 deletions.
51 changes: 48 additions & 3 deletions src/plugins/discover/public/application/_discover.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
overflow: hidden;
}

.dscAppContainer {
> * {
position: relative;
}
}
discover-app {
flex-grow: 1;
}
Expand All @@ -17,9 +22,12 @@ discover-app {

// SASSTODO: replace the z-index value with a variable
.dscWrapper {
padding-left: $euiSizeXL;
padding-right: $euiSizeS;
padding-left: 21px;
z-index: 1;
@include euiBreakpoint('xs', 's', 'm') {
padding-left: $euiSizeS;
}
}

@include euiPanel('.dscWrapper__content');
Expand Down Expand Up @@ -104,14 +112,51 @@ discover-app {
top: $euiSizeXS;
}

[fixed-scroll] {
.dscTableFixedScroll {
overflow-x: auto;
padding-bottom: 0;

+ .fixed-scroll-scroller {
+ .dscTableFixedScroll__scroller {
position: fixed;
bottom: 0;
overflow-x: auto;
overflow-y: hidden;
}
}

.dscCollapsibleSidebar {
position: relative;
z-index: $euiZLevel1;

.dscCollapsibleSidebar__collapseButton {
position: absolute;
top: 0;
right: -$euiSizeXL + 4;
cursor: pointer;
z-index: -1;
min-height: $euiSizeM;
min-width: $euiSizeM;
padding: $euiSizeXS * .5;
}

&.closed {
width: 0 !important;
border-right-width: 0;
border-left-width: 0;
.dscCollapsibleSidebar__collapseButton {
right: -$euiSizeL + 4;
}
}
}

@include euiBreakpoint('xs', 's', 'm') {
.dscCollapsibleSidebar {
&.closed {
display: none;
}

.dscCollapsibleSidebar__collapseButton {
display: none;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@import 'no_results';
@import 'histogram';
@import './collapsible_sidebar/index';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import _ from 'lodash';
// Debounce service, angularized version of lodash debounce
// borrowed heavily from https://github.com/shahata/angular-debounce

export function DebounceProviderTimeout($timeout) {
export function createDebounceProviderTimeout($timeout) {
return function (func, wait, options) {
let timeout;
let args;
Expand Down Expand Up @@ -66,7 +66,3 @@ export function DebounceProviderTimeout($timeout) {
return debounce;
};
}

export function DebounceProvider(debounce) {
return debounce;
}
Loading

0 comments on commit 3aeeddb

Please sign in to comment.