From a3d58ae7d6e2669178cb5fad0eb39a833bbac518 Mon Sep 17 00:00:00 2001 From: Junxiang Lin Date: Thu, 10 Oct 2024 19:50:58 -0400 Subject: [PATCH 1/3] disabled text highlighting in angular-client --- .../components/argos-button/argos-button.component.css | 6 ++++++ .../src/components/motor-info/motor-info.component.css | 6 ++++++ .../raspberry-pi-desktop.component.css | 6 ++++++ .../src/components/typography/typography.component.css | 8 ++++++++ .../src/components/typography/typography.component.html | 2 +- .../src/components/typography/typography.component.ts | 3 ++- 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 angular-client/src/components/typography/typography.component.css diff --git a/angular-client/src/components/argos-button/argos-button.component.css b/angular-client/src/components/argos-button/argos-button.component.css index 98febc89..5259da98 100644 --- a/angular-client/src/components/argos-button/argos-button.component.css +++ b/angular-client/src/components/argos-button/argos-button.component.css @@ -10,4 +10,10 @@ cursor: pointer; display: inline-block; font-weight: bold; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } diff --git a/angular-client/src/components/motor-info/motor-info.component.css b/angular-client/src/components/motor-info/motor-info.component.css index 41d6d579..68985ec1 100644 --- a/angular-client/src/components/motor-info/motor-info.component.css +++ b/angular-client/src/components/motor-info/motor-info.component.css @@ -17,6 +17,12 @@ font-family: 'Roboto'; font-size: 12px; color: #cacaca; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .divider-line { diff --git a/angular-client/src/components/raspberry-pi/raspberry-pi-desktop-content/raspberry-pi-desktop.component.css b/angular-client/src/components/raspberry-pi/raspberry-pi-desktop-content/raspberry-pi-desktop.component.css index 921b4f9d..39d810ce 100644 --- a/angular-client/src/components/raspberry-pi/raspberry-pi-desktop-content/raspberry-pi-desktop.component.css +++ b/angular-client/src/components/raspberry-pi/raspberry-pi-desktop-content/raspberry-pi-desktop.component.css @@ -10,6 +10,12 @@ font-size: 18px; color: gray; padding-top: 22px; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .mat-icon { diff --git a/angular-client/src/components/typography/typography.component.css b/angular-client/src/components/typography/typography.component.css new file mode 100644 index 00000000..33e33988 --- /dev/null +++ b/angular-client/src/components/typography/typography.component.css @@ -0,0 +1,8 @@ +.disable-text-selection { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} \ No newline at end of file diff --git a/angular-client/src/components/typography/typography.component.html b/angular-client/src/components/typography/typography.component.html index 9e2d6cbf..62a2dbc7 100644 --- a/angular-client/src/components/typography/typography.component.html +++ b/angular-client/src/components/typography/typography.component.html @@ -1 +1 @@ -

{{ content }}

+

{{ content }}

diff --git a/angular-client/src/components/typography/typography.component.ts b/angular-client/src/components/typography/typography.component.ts index 53c5e03d..c3f47a7b 100644 --- a/angular-client/src/components/typography/typography.component.ts +++ b/angular-client/src/components/typography/typography.component.ts @@ -13,7 +13,8 @@ import { StyleVariant } from 'src/utils/enumerations/style-variant'; */ @Component({ selector: 'typography', - templateUrl: './typography.component.html' + templateUrl: './typography.component.html', + styleUrls: ['./typography.component.css'] }) export default class Typography implements OnInit { @Input() variant!: StyleVariant; From 033793e84628751c4da1d377a2b833c90e1f9d53 Mon Sep 17 00:00:00 2001 From: Junxiang Lin Date: Sun, 13 Oct 2024 16:07:33 -0400 Subject: [PATCH 2/3] ran prettier on typography code --- .../components/typography/typography.component.css | 14 +++++++------- .../typography/typography.component.html | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/angular-client/src/components/typography/typography.component.css b/angular-client/src/components/typography/typography.component.css index 33e33988..1d3a805f 100644 --- a/angular-client/src/components/typography/typography.component.css +++ b/angular-client/src/components/typography/typography.component.css @@ -1,8 +1,8 @@ .disable-text-selection { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} \ No newline at end of file + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} diff --git a/angular-client/src/components/typography/typography.component.html b/angular-client/src/components/typography/typography.component.html index 62a2dbc7..00ba9a89 100644 --- a/angular-client/src/components/typography/typography.component.html +++ b/angular-client/src/components/typography/typography.component.html @@ -1 +1 @@ -

{{ content }}

+

{{ content }}

From 1d834f3e252f9e0f88649a7c9c852ab1ef388f54 Mon Sep 17 00:00:00 2001 From: Junxiang Lin Date: Sun, 13 Oct 2024 18:22:04 -0400 Subject: [PATCH 3/3] prettified typography css --- .../typography/typography.component.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/angular-client/src/components/typography/typography.component.css b/angular-client/src/components/typography/typography.component.css index 1d3a805f..2c8bc096 100644 --- a/angular-client/src/components/typography/typography.component.css +++ b/angular-client/src/components/typography/typography.component.css @@ -1,8 +1,8 @@ -.disable-text-selection { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} +.disable-text-selection { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +}