fix html

lacymorrow · Mar 5, 2024 · cc34a48 · cc34a48
1 parent d97ab13
commit cc34a48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/main/iohook.js b/src/main/iohook.js
@@ -169,7 +169,12 @@ const hideOnKey = async () => {
 	log.info( 'Setting: Keyboard Hold/Toggle' )
 	await iohook.importIoHook()
 
+<<<<<<< Updated upstream
 	if ( Object.prototype.hasOwnProperty.call( keycode, isEnabled ) ) {
+=======
+	const hideOnKey = preferences.value( 'actions.hideOnKey' )
+	log.info( `Key: ${hideOnKey}` )
+>>>>>>> Stashed changes
 
 		const key = keycode[isEnabled]
 

diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -34,9 +34,15 @@
 
 			<div id="titlebar"></div>
 
+<<<<<<< Updated upstream
 			<button class="close-button button" aria-label="Close Application"><i data-feather="x-circle"></i></button>
 			<button class="settings-button button" aria-label="Application Settings"><i data-feather="settings"></i></button>
 			<button class="center-button button" aria-label="Choose Crosshair"><i data-feather="target"></i></button>
+=======
+			<button class="close-button button" aria-label=""><i data-feather="x-circle"></i></button>
+			<button class="settings-button button"><i data-feather="settings"></i></button>
+			<button class="center-button button"><i data-feather="target"></i></button>
+>>>>>>> Stashed changes
 			<div class="info-button button move">
 				<i class="move-icon" data-feather="move"></i>
 				<i class="info-icon d-none" data-feather="alert-circle"></i>