Skip to content

Commit 89e2b82

Browse files
Saifullah-devSaifullah-dev
authored
Merge pull request #202 from Saifullah-dev/fix/font-size-inheritance
fix: correct font-size inheritance from parent containers
2 parents ac6f065 + 490c428 commit 89e2b82

File tree

16 files changed

+54
-35
lines changed

16 files changed

+54
-35
lines changed

‎frontend/src/FileManager/Actions/CreateFolder/CreateFolder.action.jsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ const CreateFolderAction = ({ filesViewRef, file, onCreateFolder, triggerAction
135135
return (
136136
<>
137137
<NameInput
138+
id="newFolder"
138139
nameInputRef={outsideClick.ref}
139140
maxLength={maxNameLength}
140141
value={folderName}

‎frontend/src/FileManager/Actions/Delete/Delete.action.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../../../styles/variables";
2+
13
.file-delete-confirm {
24
.file-delete-confirm-text {
35
border-bottom: 1px solid #dddddd;
@@ -6,6 +8,7 @@
68
margin-bottom: .7rem;
79
word-wrap: break-word;
810
font-weight: 500;
11+
font-size: $fm-font-size;
912
}
1013

1114
.file-delete-confirm-actions {

‎frontend/src/FileManager/Actions/PreviewFile/PreviewFile.action.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
@import "../../../styles/variables";
2+
13
.file-previewer {
24
padding: .8em;
35
height: 40dvh;
46
display: flex;
57
justify-content: center;
8+
font-size: $fm-font-size;
69

710
.photo-popup-image {
811
object-fit: contain;

‎frontend/src/FileManager/Actions/Rename/Rename.action.jsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ const RenameAction = ({ filesViewRef, file, onRename, triggerAction }) => {
156156
return (
157157
<>
158158
<NameInput
159+
id={file.name}
159160
nameInputRef={outsideClick.ref}
160161
maxLength={maxNameLength}
161162
value={renameFile}

‎frontend/src/FileManager/Actions/UploadFile/UploadFile.action.scss‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
padding: 18px 15px;
55
display: flex;
66
gap: 18px;
7+
font-size: $fm-font-size;
78

89
.select-files {
910
width: 100%;
@@ -55,7 +56,7 @@
5556
}
5657

5758
.files-progress {
58-
width: 60%;
59+
width: calc(60% - 18px);
5960

6061
.heading {
6162
display: flex;
@@ -80,7 +81,7 @@
8081
list-style: none;
8182
border-bottom: 1px solid #c6c6c6;
8283
display: flex;
83-
gap: 5px;
84+
gap: 10px;
8485
margin-bottom: 18px;
8586
padding-bottom: 12px;
8687

@@ -89,7 +90,7 @@
8990
}
9091

9192
.file {
92-
width: 90%;
93+
width: 86%;
9394

9495
.file-details {
9596
display: flex;
@@ -104,7 +105,7 @@
104105

105106
.file-name {
106107
display: inline-block;
107-
max-width: 72%;
108+
max-width: 66%;
108109
margin-right: 8px;
109110
}
110111
}

‎frontend/src/FileManager/BreadCrumb/BreadCrumb.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
.bread-crumb-container {
44
position: relative;
5+
font-size: $fm-font-size;
56

67
.breadcrumb {
78
height: 22px;

‎frontend/src/FileManager/FileList/FileList.scss‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@include overflow-y-scroll;
1212
padding: 8px;
1313
padding-right: 4px;
14+
font-size: $fm-font-size;
1415

1516
.drag-move-tooltip {
1617
background-color: white;
@@ -158,11 +159,11 @@
158159
padding-left: 35px;
159160
cursor: pointer;
160161
user-select: none;
161-
162+
162163
&:hover {
163164
background-color: rgba(0, 0, 0, 0.1);
164165
}
165-
166+
166167
&.active {
167168
background-color: rgba(0, 123, 255, 0.1);
168169
color: #007bff;
@@ -174,11 +175,11 @@
174175
width: 20%;
175176
cursor: pointer;
176177
user-select: none;
177-
178+
178179
&:hover {
179180
background-color: rgba(0, 0, 0, 0.1);
180181
}
181-
182+
182183
&.active {
183184
background-color: rgba(0, 123, 255, 0.1);
184185
color: #007bff;
@@ -190,17 +191,17 @@
190191
width: 10%;
191192
cursor: pointer;
192193
user-select: none;
193-
194+
194195
&:hover {
195196
background-color: rgba(0, 0, 0, 0.1);
196197
}
197-
198+
198199
&.active {
199200
background-color: rgba(0, 123, 255, 0.1);
200201
color: #007bff;
201202
}
202203
}
203-
204+
204205
.sort-indicator {
205206
font-size: 0.8em;
206207
margin-left: 4px;

‎frontend/src/FileManager/FileList/FilesHeader.jsx‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,44 +36,44 @@ const FilesHeader = ({ unselectFiles, onSort, sortConfig }) => {
3636
>
3737
<div className="file-select-all">
3838
{(showSelectAll || allFilesSelected) && (
39-
<Checkbox checked={allFilesSelected} onChange={handleSelectAll} title="Select all" disabled={currentPathFiles.length === 0} />
39+
<Checkbox
40+
id="selectAll"
41+
checked={allFilesSelected}
42+
onChange={handleSelectAll}
43+
title="Select all"
44+
disabled={currentPathFiles.length === 0}
45+
/>
4046
)}
4147
</div>
42-
<div
43-
className={`file-name ${sortConfig?.key === 'name' ? 'active' : ''}`}
44-
onClick={() => handleSort('name')}
48+
<div
49+
className={`file-name ${sortConfig?.key === "name" ? "active" : ""}`}
50+
onClick={() => handleSort("name")}
4551
>
4652
Name
47-
{sortConfig?.key === 'name' && (
48-
<span className="sort-indicator">
49-
{sortConfig.direction === 'asc' ? ' ▲' : ' ▼'}
50-
</span>
53+
{sortConfig?.key === "name" && (
54+
<span className="sort-indicator">{sortConfig.direction === "asc" ? " ▲" : " ▼"}</span>
5155
)}
5256
</div>
53-
<div
54-
className={`file-date ${sortConfig?.key === 'modified' ? 'active' : ''}`}
55-
onClick={() => handleSort('modified')}
57+
<div
58+
className={`file-date ${sortConfig?.key === "modified" ? "active" : ""}`}
59+
onClick={() => handleSort("modified")}
5660
>
5761
Modified
58-
{sortConfig?.key === 'modified' && (
59-
<span className="sort-indicator">
60-
{sortConfig.direction === 'asc' ? ' ▲' : ' ▼'}
61-
</span>
62+
{sortConfig?.key === "modified" && (
63+
<span className="sort-indicator">{sortConfig.direction === "asc" ? " ▲" : " ▼"}</span>
6264
)}
6365
</div>
64-
<div
65-
className={`file-size ${sortConfig?.key === 'size' ? 'active' : ''}`}
66-
onClick={() => handleSort('size')}
66+
<div
67+
className={`file-size ${sortConfig?.key === "size" ? "active" : ""}`}
68+
onClick={() => handleSort("size")}
6769
>
6870
Size
69-
{sortConfig?.key === 'size' && (
70-
<span className="sort-indicator">
71-
{sortConfig.direction === 'asc' ? ' ▲' : ' ▼'}
72-
</span>
71+
{sortConfig?.key === "size" && (
72+
<span className="sort-indicator">{sortConfig.direction === "asc" ? " ▲" : " ▼"}</span>
7373
)}
7474
</div>
7575
</div>
7676
);
7777
};
7878

79-
export default FilesHeader;
79+
export default FilesHeader;

‎frontend/src/FileManager/FileManager.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ svg {
109109

110110
.fm-rename-folder-container {
111111
padding: 8px 0;
112+
text-align: left;
112113

113114
.fm-rename-folder-input {
114115
border-bottom: 1px solid #c6c6c6;

‎frontend/src/FileManager/NavigationPane/NavigationPane.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
list-style: none;
55
margin: 0px 4px;
66
height: 100%;
7+
font-size: $fm-font-size;
78
@include overflow-y-scroll;
89

910
.folder-collapsible {

0 commit comments

Comments
 (0)