From 1e2437cea1dffd7f5d009eaf40b815a9e6a10fc7 Mon Sep 17 00:00:00 2001 From: Jason Henriquez Date: Thu, 24 Aug 2023 21:00:10 -0500 Subject: [PATCH 1/5] Make settings heading text unselectable I often encounter the issue of accidentally selecting/highlighting the settings heading text, which ends up highlighting all of the text inside of that settings tab. This is an unpleasant appearance that I have to click to remove. This change removes this issue altogether. --- .../ft-settings-section/ft-settings-section.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.scss b/src/renderer/components/ft-settings-section/ft-settings-section.scss index 72be54b115451..959bd38b022d8 100644 --- a/src/renderer/components/ft-settings-section/ft-settings-section.scss +++ b/src/renderer/components/ft-settings-section/ft-settings-section.scss @@ -39,6 +39,17 @@ } .sectionTitle { + /* iOS Safari */ + -webkit-touch-callout: none; + /* Safari */ + -webkit-user-select: none; + /* Konqueror HTML */ + /* Firefox */ + -moz-user-select: none; + /* Internet Explorer/Edge */ + -ms-user-select: none; + /* Non-prefixed version, currently supported by Chrome and Opera */ + user-select: none; margin-left: 2%; } From 6e27a142d3ca62b6cfe7dfb74ac5d8fff140b848 Mon Sep 17 00:00:00 2001 From: Jason Henriquez Date: Fri, 25 Aug 2023 23:05:59 -0500 Subject: [PATCH 2/5] Switch all instances of user-select to be only user-select and -webkit-user-select --- .../components/ft-icon-button/ft-icon-button.scss | 3 +++ .../components/ft-radio-button/ft-radio-button.css | 1 + .../ft-settings-section/ft-settings-section.scss | 9 --------- src/renderer/components/top-nav/top-nav.scss | 1 + src/renderer/videoJS.css | 11 ++--------- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.scss b/src/renderer/components/ft-icon-button/ft-icon-button.scss index b06ecefa885cd..8a8bdc6723752 100644 --- a/src/renderer/components/ft-icon-button/ft-icon-button.scss +++ b/src/renderer/components/ft-icon-button/ft-icon-button.scss @@ -3,6 +3,8 @@ flex-flow: row wrap; justify-content: space-evenly; position: relative; + + -webkit-user-select: none; user-select: none; } @@ -84,6 +86,7 @@ list-style-type: none; position: absolute; text-align: center; + -webkit-user-select: none; user-select: none; z-index: 3; diff --git a/src/renderer/components/ft-radio-button/ft-radio-button.css b/src/renderer/components/ft-radio-button/ft-radio-button.css index 1270415e1eb8e..7c5aa29e1254f 100644 --- a/src/renderer/components/ft-radio-button/ft-radio-button.css +++ b/src/renderer/components/ft-radio-button/ft-radio-button.css @@ -19,6 +19,7 @@ pure-checkbox input[type="checkbox"], .pure-radiobutton input[type="checkbox"], position: relative; padding-left: 2em; vertical-align: middle; + -webkit-user-select: none; user-select: none; cursor: pointer; display: block; diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.scss b/src/renderer/components/ft-settings-section/ft-settings-section.scss index 959bd38b022d8..f22fce69983d7 100644 --- a/src/renderer/components/ft-settings-section/ft-settings-section.scss +++ b/src/renderer/components/ft-settings-section/ft-settings-section.scss @@ -39,16 +39,7 @@ } .sectionTitle { - /* iOS Safari */ - -webkit-touch-callout: none; - /* Safari */ -webkit-user-select: none; - /* Konqueror HTML */ - /* Firefox */ - -moz-user-select: none; - /* Internet Explorer/Edge */ - -ms-user-select: none; - /* Non-prefixed version, currently supported by Chrome and Opera */ user-select: none; margin-left: 2%; } diff --git a/src/renderer/components/top-nav/top-nav.scss b/src/renderer/components/top-nav/top-nav.scss index 1c8d0000d8fb2..6647409ff283f 100644 --- a/src/renderer/components/top-nav/top-nav.scss +++ b/src/renderer/components/top-nav/top-nav.scss @@ -61,6 +61,7 @@ color: gray; opacity: 0.5; pointer-events: none; + -webkit-user-select: none; user-select: none; } diff --git a/src/renderer/videoJS.css b/src/renderer/videoJS.css index 8d1e4fe4d37fd..209214eb64d43 100644 --- a/src/renderer/videoJS.css +++ b/src/renderer/videoJS.css @@ -1091,17 +1091,10 @@ body.vjs-full-window { cursor: pointer; padding: 0; margin: 0 0.45em 0 0.45em; - /* iOS Safari */ - -webkit-touch-callout: none; - /* Safari */ + -webkit-user-select: none; - /* Konqueror HTML */ - /* Firefox */ - -moz-user-select: none; - /* Internet Explorer/Edge */ - -ms-user-select: none; - /* Non-prefixed version, currently supported by Chrome and Opera */ user-select: none; + background-color: #73859f; background-color: rgba(115, 133, 159, 0.5); } From fd650d53b74b3e414efb327e0389f45752972e97 Mon Sep 17 00:00:00 2001 From: Jason Henriquez Date: Fri, 25 Aug 2023 23:52:48 -0500 Subject: [PATCH 3/5] Make side-nav labels unselectable --- src/renderer/components/side-nav/side-nav.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/components/side-nav/side-nav.css b/src/renderer/components/side-nav/side-nav.css index 825f2116409ed..2110e3eeb47fa 100644 --- a/src/renderer/components/side-nav/side-nav.css +++ b/src/renderer/components/side-nav/side-nav.css @@ -12,6 +12,8 @@ transition-property: width; transition-duration: 150ms; transition-timing-function: ease-in-out; + user-select: none; + -webkit-user-select: none; } .inner { From 316c87c81f35602eac33e1315e84c168b54948e7 Mon Sep 17 00:00:00 2001 From: Jason Henriquez Date: Fri, 25 Aug 2023 23:57:20 -0500 Subject: [PATCH 4/5] Make side-nav and channels un-draggable --- src/renderer/components/side-nav/side-nav.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/components/side-nav/side-nav.css b/src/renderer/components/side-nav/side-nav.css index 2110e3eeb47fa..a81c78bce68c2 100644 --- a/src/renderer/components/side-nav/side-nav.css +++ b/src/renderer/components/side-nav/side-nav.css @@ -43,6 +43,7 @@ position: relative; padding: 5px; min-height: 35px; + -webkit-user-drag: none; } .moreOption { From 4df56fe4a083936c68288358b2e3a41a16d3a3ca Mon Sep 17 00:00:00 2001 From: Jason Henriquez Date: Sat, 26 Aug 2023 00:34:10 -0500 Subject: [PATCH 5/5] Remove selection from ft-flex-box, ft-input placeholders, and profile icons --- src/renderer/App.css | 2 ++ src/renderer/components/ft-flex-box/ft-flex-box.css | 2 ++ src/renderer/components/ft-input/ft-input.css | 2 ++ src/renderer/components/ft-profile-bubble/ft-profile-bubble.css | 2 ++ src/renderer/components/ft-profile-edit/ft-profile-edit.css | 2 ++ .../components/ft-profile-selector/ft-profile-selector.css | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/renderer/App.css b/src/renderer/App.css index d5e9fdfd805e5..76363e2111be3 100644 --- a/src/renderer/App.css +++ b/src/renderer/App.css @@ -26,6 +26,8 @@ .flexBox { display: block; + user-select: all; + -webkit-user-select: all; } #changeLogText { diff --git a/src/renderer/components/ft-flex-box/ft-flex-box.css b/src/renderer/components/ft-flex-box/ft-flex-box.css index ec6c76adcd176..facb39fff6e40 100644 --- a/src/renderer/components/ft-flex-box/ft-flex-box.css +++ b/src/renderer/components/ft-flex-box/ft-flex-box.css @@ -2,4 +2,6 @@ display: flex; flex-flow: row wrap; justify-content: space-evenly; + user-select: none; + -webkit-user-select: none; } diff --git a/src/renderer/components/ft-input/ft-input.css b/src/renderer/components/ft-input/ft-input.css index c4f151ce6d8e2..26cc385cd95ab 100644 --- a/src/renderer/components/ft-input/ft-input.css +++ b/src/renderer/components/ft-input/ft-input.css @@ -97,6 +97,8 @@ .ft-input-component ::-webkit-input-placeholder { color: var(--tertiary-text-color); + user-select: none; + -webkit-user-select: none; } .forceTextColor .ft-input { diff --git a/src/renderer/components/ft-profile-bubble/ft-profile-bubble.css b/src/renderer/components/ft-profile-bubble/ft-profile-bubble.css index 9f832bd0a0b3b..2d2df9b0c1fb3 100644 --- a/src/renderer/components/ft-profile-bubble/ft-profile-bubble.css +++ b/src/renderer/components/ft-profile-bubble/ft-profile-bubble.css @@ -29,6 +29,8 @@ line-height: 1em; text-align: center; padding: 17.5px 0; + user-select: none; + -webkit-user-select: none; } .profileName { diff --git a/src/renderer/components/ft-profile-edit/ft-profile-edit.css b/src/renderer/components/ft-profile-edit/ft-profile-edit.css index bc8956a191b82..3db26c9236a2e 100644 --- a/src/renderer/components/ft-profile-edit/ft-profile-edit.css +++ b/src/renderer/components/ft-profile-edit/ft-profile-edit.css @@ -36,6 +36,8 @@ line-height: 1em; text-align: center; padding: 25px 0; + user-select: none; + -webkit-user-select: none; } @media only screen and (max-width: 680px) { diff --git a/src/renderer/components/ft-profile-selector/ft-profile-selector.css b/src/renderer/components/ft-profile-selector/ft-profile-selector.css index 580141940474d..b63bbfeba5ba9 100644 --- a/src/renderer/components/ft-profile-selector/ft-profile-selector.css +++ b/src/renderer/components/ft-profile-selector/ft-profile-selector.css @@ -17,6 +17,8 @@ font-size: 20px; line-height: 1em; text-align: center; + user-select: none; + -webkit-user-select: none; } .profileList {