From 490c428560981fa8f46d02b82ceb37027a61f16f Mon Sep 17 00:00:00 2001 From: Saifullah-dev Date: Thu, 21 Aug 2025 05:00:27 +0500 Subject: [PATCH] fix(font-size): prevent components from inheriting unintended font-size from parent --- .../CreateFolder/CreateFolder.action.jsx | 1 + .../Actions/Delete/Delete.action.scss | 3 ++ .../PreviewFile/PreviewFile.action.scss | 3 ++ .../Actions/Rename/Rename.action.jsx | 1 + .../Actions/UploadFile/UploadFile.action.scss | 9 ++-- .../FileManager/BreadCrumb/BreadCrumb.scss | 1 + .../src/FileManager/FileList/FileList.scss | 15 +++--- .../src/FileManager/FileList/FilesHeader.jsx | 46 +++++++++---------- frontend/src/FileManager/FileManager.scss | 1 + .../NavigationPane/NavigationPane.scss | 1 + frontend/src/FileManager/Toolbar/Toolbar.scss | 1 + .../components/ContextMenu/ContextMenu.scss | 1 + frontend/src/components/Modal/Modal.scss | 1 + .../src/components/NameInput/NameInput.jsx | 3 +- .../src/components/NameInput/NameInput.scss | 1 + frontend/src/styles/_variables.scss | 1 + 16 files changed, 54 insertions(+), 35 deletions(-) diff --git a/frontend/src/FileManager/Actions/CreateFolder/CreateFolder.action.jsx b/frontend/src/FileManager/Actions/CreateFolder/CreateFolder.action.jsx index add6483..873b000 100644 --- a/frontend/src/FileManager/Actions/CreateFolder/CreateFolder.action.jsx +++ b/frontend/src/FileManager/Actions/CreateFolder/CreateFolder.action.jsx @@ -135,6 +135,7 @@ const CreateFolderAction = ({ filesViewRef, file, onCreateFolder, triggerAction return ( <> { return ( <> { >
{(showSelectAll || allFilesSelected) && ( - + )}
-
handleSort('name')} +
handleSort("name")} > Name - {sortConfig?.key === 'name' && ( - - {sortConfig.direction === 'asc' ? ' ▲' : ' ▼'} - + {sortConfig?.key === "name" && ( + {sortConfig.direction === "asc" ? " ▲" : " ▼"} )}
-
handleSort('modified')} +
handleSort("modified")} > Modified - {sortConfig?.key === 'modified' && ( - - {sortConfig.direction === 'asc' ? ' ▲' : ' ▼'} - + {sortConfig?.key === "modified" && ( + {sortConfig.direction === "asc" ? " ▲" : " ▼"} )}
-
handleSort('size')} +
handleSort("size")} > Size - {sortConfig?.key === 'size' && ( - - {sortConfig.direction === 'asc' ? ' ▲' : ' ▼'} - + {sortConfig?.key === "size" && ( + {sortConfig.direction === "asc" ? " ▲" : " ▼"} )}
); }; -export default FilesHeader; \ No newline at end of file +export default FilesHeader; diff --git a/frontend/src/FileManager/FileManager.scss b/frontend/src/FileManager/FileManager.scss index 10edcc3..94ea54d 100644 --- a/frontend/src/FileManager/FileManager.scss +++ b/frontend/src/FileManager/FileManager.scss @@ -109,6 +109,7 @@ svg { .fm-rename-folder-container { padding: 8px 0; + text-align: left; .fm-rename-folder-input { border-bottom: 1px solid #c6c6c6; diff --git a/frontend/src/FileManager/NavigationPane/NavigationPane.scss b/frontend/src/FileManager/NavigationPane/NavigationPane.scss index 495cd19..c764a1d 100644 --- a/frontend/src/FileManager/NavigationPane/NavigationPane.scss +++ b/frontend/src/FileManager/NavigationPane/NavigationPane.scss @@ -4,6 +4,7 @@ list-style: none; margin: 0px 4px; height: 100%; + font-size: $fm-font-size; @include overflow-y-scroll; .folder-collapsible { diff --git a/frontend/src/FileManager/Toolbar/Toolbar.scss b/frontend/src/FileManager/Toolbar/Toolbar.scss index 72c24c1..a3d92d5 100644 --- a/frontend/src/FileManager/Toolbar/Toolbar.scss +++ b/frontend/src/FileManager/Toolbar/Toolbar.scss @@ -58,6 +58,7 @@ margin: 0; border: 1px solid #c4c4c4; border-radius: 5px; + font-size: $fm-font-size; ul { list-style: none; diff --git a/frontend/src/components/ContextMenu/ContextMenu.scss b/frontend/src/components/ContextMenu/ContextMenu.scss index ab33754..a08fca8 100644 --- a/frontend/src/components/ContextMenu/ContextMenu.scss +++ b/frontend/src/components/ContextMenu/ContextMenu.scss @@ -8,6 +8,7 @@ padding: 4px; z-index: 1; transition: opacity 0.1s linear; + font-size: $fm-font-size; .file-context-menu-list { font-size: 1.1em; diff --git a/frontend/src/components/Modal/Modal.scss b/frontend/src/components/Modal/Modal.scss index 053ccd4..7a36214 100644 --- a/frontend/src/components/Modal/Modal.scss +++ b/frontend/src/components/Modal/Modal.scss @@ -6,6 +6,7 @@ align-items: center; border-bottom: 1px solid $border-color; padding: 0.3rem 1rem; + font-size: $fm-font-size; .fm-modal-heading { margin: 0; diff --git a/frontend/src/components/NameInput/NameInput.jsx b/frontend/src/components/NameInput/NameInput.jsx index 0d8130a..c529359 100644 --- a/frontend/src/components/NameInput/NameInput.jsx +++ b/frontend/src/components/NameInput/NameInput.jsx @@ -1,9 +1,10 @@ import "./NameInput.scss"; -const NameInput = ({ nameInputRef, maxLength, value, onChange, onKeyDown, onClick, rows }) => { +const NameInput = ({ nameInputRef, id, maxLength, value, onChange, onKeyDown, onClick, rows }) => { return (