Use "cursor: pointer" for buttons for web target

zotero · Aug 15, 2023 · f24d69e · f24d69e
1 parent 433bba3
commit f24d69e
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 10 deletions.
diff --git a/src/common/stylesheets/base/_base.scss b/src/common/stylesheets/base/_base.scss
@@ -58,8 +58,10 @@ textarea {
 	display: none !important;
 }
 
-button:hover {
-	cursor: default;
+@if $platform != "web" {
+	button:hover {
+		cursor: default;
+	}
 }
 
 

diff --git a/src/common/stylesheets/components/_annotations-view.scss b/src/common/stylesheets/components/_annotations-view.scss
@@ -125,7 +125,6 @@
 			}
 
 			.tag {
-				cursor: default;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: pre;
@@ -136,6 +135,10 @@
 				border-radius: 6px;
 				border: 1px solid transparent;
 
+				@if $platform != 'web' {
+					cursor: default;
+				}
+
 				&.color {
 					font-weight: bold;
 				}

diff --git a/src/common/stylesheets/components/_findbar.scss b/src/common/stylesheets/components/_findbar.scss
@@ -88,7 +88,7 @@
 		}
 	}
 
-	@if $platform == "darwin" {
+	@if $platform == "darwin" or $platform == "web" {
 		#findPrevious {
 			padding-left: 4px;
 			padding-right: 5px;

diff --git a/src/common/stylesheets/components/_toolbar-buttons.scss b/src/common/stylesheets/components/_toolbar-buttons.scss
@@ -204,7 +204,7 @@
 				}
 			}
 
-			@if $platform == "darwin" {
+			@if $platform == "darwin" or $platform =="web" {
 				@include split-button(
 						$height: 24px,
 						$button: "menubutton",

diff --git a/src/common/stylesheets/components/_toolbar-sidebar.scss b/src/common/stylesheets/components/_toolbar-sidebar.scss
@@ -29,7 +29,7 @@
 		flex: 1 0 auto;
 		margin: $toolbar-sidebar-btn-margin;
 
-		@if $platform == "darwin" {
+		@if $platform == "darwin" or $platform =="web" {
 			@include split-button(
 					$height: $split-toolbar-btn-height,
 					$button: "sidebarbutton",

diff --git a/src/common/stylesheets/components/_toolbar.scss b/src/common/stylesheets/components/_toolbar.scss
@@ -99,7 +99,7 @@
 		}
 	}
 
-	@if $platform == "darwin" {
+	@if $platform == "darwin" or $platform =="web" {
 		#zoomOut,
 		#previous {
 			margin-inline-end: 1px;

diff --git a/src/common/stylesheets/components/_viewer-override.scss b/src/common/stylesheets/components/_viewer-override.scss
@@ -30,10 +30,14 @@ button {
 	border: none;
 	padding: 0;
 	font: inherit;
-	cursor: pointer;
 	outline: inherit;
 	display: block;
 
+	@if $platform == "web" {
+		&:not([disabled]) {
+			cursor: pointer;
+		}
+	}
 
 	&:focus-visible {
 		//border: $search-focus-border;

diff --git a/src/common/stylesheets/darwin.scss b/src/common/stylesheets/darwin.scss
@@ -1,4 +1,4 @@
-$platform: "darwin";
+$platform: "darwin" !default;
 $theme: "light";
 $mode: "production" !default;
 

diff --git a/src/common/stylesheets/web.scss b/src/common/stylesheets/web.scss
@@ -0,0 +1,4 @@
+$mode: "production";
+$platform: "web";
+
+@import "darwin";
diff --git a/webpack.config.js b/webpack.config.js
@@ -11,7 +11,10 @@ function generateReaderConfig(build) {
 		mode: build === 'dev' ? 'development' : 'production',
 		devtool: build === 'zotero' ? false : 'source-map',
 		entry: {
-			reader: ['./src/index.' + build + '.js', './src/common/stylesheets/main.scss']
+			reader: [
+				'./src/index.' + build + '.js',
+				(build === 'web' ? './src/common/stylesheets/web.scss' : './src/common/stylesheets/main.scss')
+			]
 		},
 		output: {
 			path: path.resolve(__dirname, './build/' + build),