mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Removing usage of custom-scrollbar mixin
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
parent
80c0aa0d6f
commit
12507515f1
@ -32,7 +32,6 @@
|
|||||||
border: 1px solid var(--drawerSubtitleBackground);
|
border: 1px solid var(--drawerSubtitleBackground);
|
||||||
border-radius: $radius;
|
border-radius: $radius;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
@include custom-scrollbar();
|
|
||||||
|
|
||||||
.TableHead {
|
.TableHead {
|
||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
.Badge {
|
.Badge {
|
||||||
display: flex;
|
display: flex;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-bottom: 1px;
|
margin-bottom: 1px!important;
|
||||||
padding: $padding $spacing;
|
padding: $padding $spacing;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
> .content {
|
> .content {
|
||||||
@include custom-scrollbar;
|
overflow: auto;
|
||||||
margin-top: $spacing;
|
margin-top: $spacing;
|
||||||
padding: $spacing * 2;
|
padding: $spacing * 2;
|
||||||
|
|
||||||
|
|||||||
@ -7,10 +7,6 @@
|
|||||||
|
|
||||||
.theme-light & {
|
.theme-light & {
|
||||||
border: 1px solid gainsboro;
|
border: 1px solid gainsboro;
|
||||||
|
|
||||||
.ace_scrollbar {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
> .editor {
|
> .editor {
|
||||||
@ -51,8 +47,4 @@
|
|||||||
.ace_comment {
|
.ace_comment {
|
||||||
color: #808080;
|
color: #808080;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ace_scrollbar {
|
|
||||||
@include custom-scrollbar;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -1,7 +1,5 @@
|
|||||||
|
|
||||||
.Dialog {
|
.Dialog {
|
||||||
@include custom-scrollbar;
|
|
||||||
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
left: 0;
|
left: 0;
|
||||||
@ -11,6 +9,7 @@
|
|||||||
padding: $unit * 5;
|
padding: $unit * 5;
|
||||||
z-index: $zIndex-dialog;
|
z-index: $zIndex-dialog;
|
||||||
overscroll-behavior: none; // prevent swiping with touch-pad on MacOSX
|
overscroll-behavior: none; // prevent swiping with touch-pad on MacOSX
|
||||||
|
overflow: auto;
|
||||||
|
|
||||||
&.modal {
|
&.modal {
|
||||||
background: transparentize(#222, .5);
|
background: transparentize(#222, .5);
|
||||||
|
|||||||
@ -3,12 +3,7 @@
|
|||||||
--overlay-active-bg: orange;
|
--overlay-active-bg: orange;
|
||||||
|
|
||||||
.logs {
|
.logs {
|
||||||
@include custom-scrollbar;
|
|
||||||
|
|
||||||
// fix for `this.logsElement.scrollTop = this.logsElement.scrollHeight`
|
|
||||||
// `overflow: overlay` don't allow scroll to the last line
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
color: $textColorAccent;
|
color: $textColorAccent;
|
||||||
background: $logsBackground;
|
background: $logsBackground;
|
||||||
|
|||||||
@ -5,17 +5,7 @@
|
|||||||
margin-left: $padding * 2;
|
margin-left: $padding * 2;
|
||||||
margin-top: $padding * 2;
|
margin-top: $padding * 2;
|
||||||
|
|
||||||
.theme-light & {
|
|
||||||
.xterm-viewport {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
> .xterm {
|
> .xterm {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.xterm-viewport {
|
|
||||||
@include custom-scrollbar;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -10,12 +10,6 @@
|
|||||||
box-shadow: 0 0 $unit * 2 $boxShadow;
|
box-shadow: 0 0 $unit * 2 $boxShadow;
|
||||||
z-index: $zIndex-drawer;
|
z-index: $zIndex-drawer;
|
||||||
|
|
||||||
.theme-light & {
|
|
||||||
.drawer-content {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.left {
|
&.left {
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
@ -71,7 +65,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.drawer-content {
|
.drawer-content {
|
||||||
@include custom-scrollbar;
|
overflow: auto;
|
||||||
|
|
||||||
> *:not(.Spinner) {
|
> *:not(.Spinner) {
|
||||||
padding: var(--spacing);
|
padding: var(--spacing);
|
||||||
|
|||||||
@ -33,7 +33,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
> .content-wrapper {
|
> .content-wrapper {
|
||||||
@include custom-scrollbar-themed;
|
overflow: auto;
|
||||||
padding: $spacing * 2;
|
padding: $spacing * 2;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
@ -19,11 +19,7 @@
|
|||||||
|
|
||||||
&.pinned {
|
&.pinned {
|
||||||
.sidebar-nav {
|
.sidebar-nav {
|
||||||
@include custom-scrollbar;
|
overflow: auto;
|
||||||
|
|
||||||
.theme-light & {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,8 +59,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-nav {
|
.sidebar-nav {
|
||||||
@include hidden-scrollbar;
|
|
||||||
|
|
||||||
padding: $padding / 1.5 0;
|
padding: $padding / 1.5 0;
|
||||||
|
|
||||||
.Icon {
|
.Icon {
|
||||||
|
|||||||
@ -9,13 +9,8 @@
|
|||||||
|
|
||||||
|
|
||||||
main {
|
main {
|
||||||
@include custom-scrollbar;
|
|
||||||
$spacing: $margin * 2;
|
$spacing: $margin * 2;
|
||||||
|
|
||||||
.theme-light & {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
grid-area: main;
|
grid-area: main;
|
||||||
overflow-y: scroll; // always reserve space for scrollbar (17px)
|
overflow-y: scroll; // always reserve space for scrollbar (17px)
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
|
|||||||
@ -9,8 +9,8 @@
|
|||||||
grid-template-columns: 1fr 40%;
|
grid-template-columns: 1fr 40%;
|
||||||
|
|
||||||
> * {
|
> * {
|
||||||
@include custom-scrollbar-themed;
|
|
||||||
--flex-gap: #{$spacing};
|
--flex-gap: #{$spacing};
|
||||||
|
overflow: auto;
|
||||||
padding: $spacing;
|
padding: $spacing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,10 +4,8 @@
|
|||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
|
|
||||||
&.light {
|
pre, table {
|
||||||
pre, table {
|
overflow: auto;
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.pl-c {
|
.pl-c {
|
||||||
@ -513,7 +511,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
table {
|
table {
|
||||||
@include custom-scrollbar;
|
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
display: table;
|
display: table;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -581,13 +578,12 @@
|
|||||||
|
|
||||||
.highlight pre,
|
.highlight pre,
|
||||||
pre {
|
pre {
|
||||||
@include custom-scrollbar;
|
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
font-size: 85%;
|
font-size: 85%;
|
||||||
line-height: 1.45;
|
line-height: 1.45;
|
||||||
background-color: $helmDescriptionPreBackground;
|
background-color: $helmDescriptionPreBackground;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
overflow: auto !important;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
pre code {
|
pre code {
|
||||||
|
|||||||
@ -6,7 +6,6 @@ import React, { Component } from "react";
|
|||||||
import marked from "marked";
|
import marked from "marked";
|
||||||
import DOMPurify from "dompurify";
|
import DOMPurify from "dompurify";
|
||||||
import { cssNames } from "../../utils";
|
import { cssNames } from "../../utils";
|
||||||
import { themeStore } from "../../theme.store";
|
|
||||||
|
|
||||||
DOMPurify.addHook('afterSanitizeAttributes', function (node) {
|
DOMPurify.addHook('afterSanitizeAttributes', function (node) {
|
||||||
// Set all elements owning target to target=_blank
|
// Set all elements owning target to target=_blank
|
||||||
@ -29,7 +28,7 @@ export class MarkdownViewer extends Component<Props> {
|
|||||||
const html = DOMPurify.sanitize(marked(markdown));
|
const html = DOMPurify.sanitize(marked(markdown));
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cssNames("MarkDownViewer", className, themeStore.activeTheme.type)}
|
className={cssNames("MarkDownViewer", className)}
|
||||||
dangerouslySetInnerHTML={{ __html: html }}
|
dangerouslySetInnerHTML={{ __html: html }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -75,7 +75,6 @@ html {
|
|||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
|
|
||||||
&-list {
|
&-list {
|
||||||
@include custom-scrollbar;
|
|
||||||
padding-right: 1px;
|
padding-right: 1px;
|
||||||
padding-left: 1px;
|
padding-left: 1px;
|
||||||
width: max-content;
|
width: max-content;
|
||||||
@ -152,10 +151,6 @@ html {
|
|||||||
--select-option-selected-bgc: $textColorSecondary;
|
--select-option-selected-bgc: $textColorSecondary;
|
||||||
|
|
||||||
.Select {
|
.Select {
|
||||||
&__menu-list {
|
|
||||||
@include custom-scrollbar($theme: dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
&__multi-value {
|
&__multi-value {
|
||||||
background: none;
|
background: none;
|
||||||
box-shadow: 0 0 0 1px $textColorSecondary;
|
box-shadow: 0 0 0 1px $textColorSecondary;
|
||||||
|
|||||||
@ -1,13 +1,4 @@
|
|||||||
.Table {
|
.Table {
|
||||||
&.scrollable {
|
|
||||||
.theme-light & {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
@include custom-scrollbar();
|
|
||||||
flex: 1 0 0; // hackfix: flex-basis must be "0" for proper work in firefox
|
|
||||||
}
|
|
||||||
|
|
||||||
&.autoSize {
|
&.autoSize {
|
||||||
.TableCell {
|
.TableCell {
|
||||||
flex: 1 0;
|
flex: 1 0;
|
||||||
|
|||||||
@ -2,12 +2,6 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
> .list {
|
> .list {
|
||||||
@include custom-scrollbar;
|
overflow-y: overlay!important;
|
||||||
|
|
||||||
.theme-light & {
|
|
||||||
@include custom-scrollbar(dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
overflow-y: overlay !important;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -15,10 +15,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@mixin scrollableContent() {
|
@mixin scrollableContent() {
|
||||||
@include custom-scrollbar($theme: dark);
|
overflow: auto;
|
||||||
padding: var(--wizard-spacing);
|
padding: var(--wizard-spacing);
|
||||||
height: var(--wizard-content-height);
|
height: var(--wizard-content-height);
|
||||||
max-height: var(--wizard-content-max-height);
|
max-height: var(--wizard-content-max-height);
|
||||||
|
|
||||||
|
&::-webkit-scrollbar-thumb {
|
||||||
|
background-color: #bbbbbb; // Always light scrollbar in dialogs
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
> .header {
|
> .header {
|
||||||
|
|||||||
@ -107,6 +107,7 @@
|
|||||||
"selectOptionHoveredColor": "#87909c",
|
"selectOptionHoveredColor": "#87909c",
|
||||||
"lineProgressBackground": "#414448",
|
"lineProgressBackground": "#414448",
|
||||||
"radioActiveBackground": "#36393e",
|
"radioActiveBackground": "#36393e",
|
||||||
"menuActiveBackground": "#36393e"
|
"menuActiveBackground": "#36393e",
|
||||||
|
"scrollBarColor": "#5f6064"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,13 +39,13 @@
|
|||||||
"helmImgBackground": "#e8e8e8",
|
"helmImgBackground": "#e8e8e8",
|
||||||
"helmStableRepo": "#3d90ce",
|
"helmStableRepo": "#3d90ce",
|
||||||
"helmIncubatorRepo": "#ff7043",
|
"helmIncubatorRepo": "#ff7043",
|
||||||
"helmDescriptionHr": "#41474a",
|
"helmDescriptionHr": "#dddddd",
|
||||||
"helmDescriptionBlockqouteColor": "#555555",
|
"helmDescriptionBlockqouteColor": "#555555",
|
||||||
"helmDescriptionBlockqouteBorder": "#8a8f93",
|
"helmDescriptionBlockqouteBorder": "#8a8f93",
|
||||||
"helmDescriptionBlockquoteBackground": "#eeeeee",
|
"helmDescriptionBlockquoteBackground": "#eeeeee",
|
||||||
"helmDescriptionHeaders": "#3e4147",
|
"helmDescriptionHeaders": "#3e4147",
|
||||||
"helmDescriptionH6": "#6a737d",
|
"helmDescriptionH6": "#6a737d",
|
||||||
"helmDescriptionTdBorder": "#47494a",
|
"helmDescriptionTdBorder": "#c6c6c6",
|
||||||
"helmDescriptionTrBackground": "#1c2125",
|
"helmDescriptionTrBackground": "#1c2125",
|
||||||
"helmDescriptionCodeBackground": "#ffffff1a",
|
"helmDescriptionCodeBackground": "#ffffff1a",
|
||||||
"helmDescriptionPreBackground": "#eeeeee",
|
"helmDescriptionPreBackground": "#eeeeee",
|
||||||
@ -108,6 +108,7 @@
|
|||||||
"selectOptionHoveredColor": "#ffffff",
|
"selectOptionHoveredColor": "#ffffff",
|
||||||
"lineProgressBackground": "#e8e8e8",
|
"lineProgressBackground": "#e8e8e8",
|
||||||
"radioActiveBackground": "#f1f1f1",
|
"radioActiveBackground": "#f1f1f1",
|
||||||
"menuActiveBackground": "#e8e8e8"
|
"menuActiveBackground": "#e8e8e8",
|
||||||
|
"scrollBarColor": "#bbbbbb"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user