fix css issues

edrlab · Dec 2, 2024 · 9ba26f4 · 9ba26f4
1 parent 20d6406
commit 9ba26f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/src/renderer/assets/styles/components/annotations.scss b/src/renderer/assets/styles/components/annotations.scss
@@ -111,7 +111,7 @@
     }
 
     .button_primary_blue:hover {
-      color: var(--color-secondary);
+      // color: var(--color-secondary);
       background-color: var(--color-blue);
     }
 

diff --git a/src/renderer/assets/styles/components/modals.scss.d.ts b/src/renderer/assets/styles/components/modals.scss.d.ts
@@ -1,4 +1,5 @@
 export declare const add_dialog: string;
+export declare const button_secondary_blue: string;
 export declare const c_dialog__box: string;
 export declare const close_button: string;
 export declare const CSS_END_components_modals: string;

diff --git a/src/renderer/assets/styles/reader-app.scss b/src/renderer/assets/styles/reader-app.scss
@@ -259,6 +259,10 @@ button {
 }
 
 .isOnSearch {
+  top: 75px!important;
+}
+
+.isOnSearchScroll {
   top: 50px!important;
 }
 

diff --git a/src/renderer/assets/styles/reader-app.scss.d.ts b/src/renderer/assets/styles/reader-app.scss.d.ts
@@ -44,6 +44,7 @@ export declare const HIDE_CURSOR_CLASS_head: string;
 export declare const inert: string;
 export declare const isOnSearch: string;
 export declare const isOnSearchPdf: string;
+export declare const isOnSearchScroll: string;
 export declare const landmarks_tabs: string;
 export declare const landmarks_tabs_button: string;
 export declare const left_button: string;

diff --git a/src/renderer/reader/components/Reader.tsx b/src/renderer/reader/components/Reader.tsx
@@ -847,8 +847,9 @@ class Reader extends React.Component<IProps, IState> {
                                             : this.props.readerConfig.readerDockingMode === "right" ? !this.props.readerConfig.paged ? stylesReader.docked_right_scrollable : stylesReader.docked_right_pdf
                                             : ""
                                         ) : undefined,
-                                        (this.props.searchEnable && !this.props.isPdf) ? stylesReader.isOnSearch
-                                        : (this.props.searchEnable && this.props.isPdf) ? stylesReader.isOnSearchPdf
+                                        (this.props.searchEnable && !this.props.isPdf && this.props.readerConfig.paged) ? stylesReader.isOnSearch
+                                        : (this.props.searchEnable && this.props.isPdf) ? stylesReader.isOnSearchPdf :
+                                        (this.props.searchEnable && !this.props.readerConfig.paged) ? stylesReader.isOnSearchScroll
                                         : "")}
                                     ref={this.mainElRef}
                                     style={{ inset: isAudioBook || !this.props.readerConfig.paged || this.props.isPdf || this.props.isDivina ? "0" : "75px 50px" }}>

diff --git a/src/renderer/reader/components/ReaderSettings.tsx b/src/renderer/reader/components/ReaderSettings.tsx
@@ -1074,7 +1074,7 @@ const SaveResetApplyPreset = () => {
 
         <div className={stylesSettings.preset_settings_container}>
             <div>
-                <button className={stylesButtons.button_secondary_blue} style={{maxWidth: dockedMode ? "284px" : ""}} onClick={() => {
+                <button className={stylesButtons.button_secondary_blue} style={{maxWidth: dockedMode ? "284px" : "", height: dockedMode ? "fit-content" : "30px"}} onClick={() => {
                     dispatch(readerActions.configSetDefault.build(readerConfig));
                 }}>
                     <SVG ariaHidden={true} svg={SaveIcon} />
@@ -1083,15 +1083,15 @@ const SaveResetApplyPreset = () => {
             </div>
 
             <div>
-                <button className={stylesButtons.button_secondary_blue} style={{maxWidth: dockedMode ? "284px" : ""}} onClick={applyPreferredConfig}>
+                <button className={stylesButtons.button_secondary_blue} style={{maxWidth: dockedMode ? "284px" : "", height: dockedMode ? "fit-content" : "30px"}} onClick={applyPreferredConfig}>
                     <SVG ariaHidden={true} svg={DoubleCheckIcon} />
                     {__("reader.settings.preset.apply")}
                 </button>
                 <p>{__("reader.settings.preset.applyDetails")}</p>
             </div>
 
             <div>
-                <button className={stylesButtons.button_secondary_blue} style={{maxWidth: dockedMode ? "284px" : ""}} onClick={() => {
+                <button className={stylesButtons.button_secondary_blue} style={{maxWidth: dockedMode ? "284px" : "", height: dockedMode ? "fit-content" : "30px"}} onClick={() => {
                     dispatch(readerActions.configSetDefault.build(readerConfigInitialState));
                     applyPreferredConfig();
                 }}>