From b9d134b7cf8dce3a70bfc85acdd12afb1472e098 Mon Sep 17 00:00:00 2001 From: Alexander Platov Date: Thu, 8 Jun 2023 14:51:38 +0300 Subject: [PATCH] UBER-441,-443: Disable fade in Scroller, change color for link and bg for Diff (#3405) --- .../src/components/message/Nodes.svelte | 2 +- packages/theme/styles/_colors.scss | 4 +-- packages/theme/styles/_layouts.scss | 29 ++++++++++++------- packages/theme/styles/common.scss | 3 -- packages/theme/styles/prose.scss | 2 +- packages/ui/src/components/Scroller.svelte | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/packages/presentation/src/components/message/Nodes.svelte b/packages/presentation/src/components/message/Nodes.svelte index da2bc652bb..b83990cc0b 100644 --- a/packages/presentation/src/components/message/Nodes.svelte +++ b/packages/presentation/src/components/message/Nodes.svelte @@ -172,7 +172,7 @@ code { padding: 0 0.25rem; font-family: var(--mono-font); - color: var(--theme-code-color); + color: var(--theme-link-color); background-color: var(--theme-button-enabled); border: 1px solid var(--theme-button-border); border-radius: 0.25rem; diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss index bb0429152c..d10cb644c7 100644 --- a/packages/theme/styles/_colors.scss +++ b/packages/theme/styles/_colors.scss @@ -108,7 +108,7 @@ --theme-dark-color: rgba(255, 255, 255, .6); --theme-content-color: rgba(255, 255, 255, .8); --theme-caption-color: #FFF; - --theme-code-color: #EB7861; + --theme-link-color: #EB7861; --theme-list-border-color: rgba(255, 255, 255, .05); --theme-list-header-color: #C88C65; @@ -300,7 +300,7 @@ --theme-dark-color: rgba(0, 0, 0, .6); --theme-content-color: rgba(0, 0, 0, .8); --theme-caption-color: #000; - --theme-code-color: #377AE6; + --theme-link-color: #377AE6; --theme-list-border-color: rgba(0, 0, 0, .09); --theme-list-header-color: red; //#ECD4CA; diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index 66556b7601..e51042fe70 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -19,17 +19,17 @@ a { font: inherit; font-weight: 500; text-decoration: none; - color: var(--accent-color); + color: var(--theme-content-color); outline: none; &:hover { - color: var(--caption-color); + color: var(--theme-caption-color); text-decoration: underline; } &:active { - color: var(--accent-color); + color: var(--theme-content-color); text-decoration: underline; } - &:visited { color: var(--accent-color); } + &:visited { color: var(--theme-content-color); } &.stealth, &.no-underline { @@ -107,7 +107,20 @@ li { --modal-padding: 1rem; } -p { user-select: text; } +p { + user-select: text; + + a { + word-break: break-all; + word-break: break-word; + hyphens: auto; + color: var(--theme-link-color); + + &:hover, + &:active, + &:visited { color: var(--theme-link-color); } + } +} p:first-child { margin-block-start: 0; } // First and last padding p:last-child { margin-block-end: 0; } @@ -119,12 +132,6 @@ p:last-child { margin-block-end: 0; } &.contrast { color: var(--theme-caption-color); } &:not(.contrast) { color: var(--theme-content-color); } - - a { - word-break: break-all; - word-break: break-word; - hyphens: auto; - } } a.noUnderline { diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss index 067d284813..7e76514756 100644 --- a/packages/theme/styles/common.scss +++ b/packages/theme/styles/common.scss @@ -478,9 +478,6 @@ } } -// Replacing the background of a text editor in Activity -.activity-content .ref-container .textInput { background-color: var(--body-color) !important; } - // Indented .antiIndented { margin: .75rem; diff --git a/packages/theme/styles/prose.scss b/packages/theme/styles/prose.scss index f334cf4eee..87339e358e 100644 --- a/packages/theme/styles/prose.scss +++ b/packages/theme/styles/prose.scss @@ -49,7 +49,7 @@ table.proseTable { .proseCode { padding: 0 .25rem; font-family: var(--mono-font); - color: var(--theme-code-color); + color: var(--theme-link-color); background-color: var(--theme-button-enabled); border: 1px solid var(--theme-button-border); border-radius: .25rem; diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte index 128885d7f4..f1bb2efad1 100644 --- a/packages/ui/src/components/Scroller.svelte +++ b/packages/ui/src/components/Scroller.svelte @@ -27,7 +27,7 @@ export let autoscroll: boolean = false export let bottomStart: boolean = false export let fade: FadeOptions = defaultSP - export let noFade: boolean = false + export let noFade: boolean = true export let invertScroll: boolean = false export let horizontal: boolean = false export let contentDirection: 'vertical' | 'vertical-reverse' | 'horizontal' = 'vertical'