Skip to content

Commit 5e1e0d3

Browse files
committed
Fixed buttons layout
1 parent 53a125d commit 5e1e0d3

2 files changed

Lines changed: 24 additions & 28 deletions

File tree

src/component/modals/FileEdit.jsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ const FileEditModal = ({ superState, dispatcher }) => {
9797
closeModal={close}
9898
title={fileName}
9999
>
100-
<div className="File Edit Container">
101-
<div className="footer">
100+
<div>
101+
<div className="save-bar">
102102
{fileName
103103
&& (
104104
<button type="submit" className="btn btn-primary" onClick={submit}>Save</button>
@@ -110,11 +110,7 @@ const FileEditModal = ({ superState, dispatcher }) => {
110110
<button type="submit" className="btn btn-primary" onClick={saveSubmit}>Save As</button>
111111
)}
112112
</div>
113-
<div
114-
style={{
115-
minHeight: '400px',
116-
}}
117-
>
113+
<div className="setting-container">
118114
<Editor
119115
value={codeStuff}
120116
onValueChange={(e) => setCodeStuff(e)}
@@ -124,11 +120,23 @@ const FileEditModal = ({ superState, dispatcher }) => {
124120
fontFamily: '"Arial"',
125121
fontSize: 16,
126122
minHeight: '100vh',
127-
minWidth: '80vw',
123+
minWidth: '90vw',
128124
border: '1px solid black',
129125
}}
130126
/>
131127
</div>
128+
<div className="save-bar">
129+
{fileName
130+
&& (
131+
<button type="submit" className="btn btn-primary" onClick={submit}>Save</button>
132+
)}
133+
{dirButton && (
134+
<button type="submit" className="btn btn-primary" onClick={saveAsSubmit}>Save As</button>
135+
)}
136+
{!dirButton && (
137+
<button type="submit" className="btn btn-primary" onClick={saveSubmit}>Save As</button>
138+
)}
139+
</div>
132140
</div>
133141
</Modal>
134142
);

src/component/modals/file-edit.css

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
11
.setting-container{
22
display: grid;
33
grid-template-columns: auto auto;
4-
grid-gap: 20px;
5-
margin: 20px;
4+
grid-gap: 0px;
5+
margin: 0px;
66
width: 90vw;
7+
min-height: '400px',
78
}
89

9-
.setting-container .footer{
10+
.save-bar{
1011
display: flex;
1112
flex-wrap: wrap;
12-
align-items: center;
1313
justify-content: flex-end;
14-
padding: .75rem;
15-
border-top: 1px solid #dee2e6;
16-
border-bottom-right-radius: calc(.3rem - 1px);
17-
border-bottom-left-radius: calc(.3rem - 1px);
18-
grid-column: 1/3;
14+
margin-bottom: 5px;
15+
margin-top: 5px;
1916
}
2017

21-
.setting-container .footer>* {
22-
margin: .25rem;
23-
}
24-
25-
.setting-container .error{
26-
color: #ff0000;
27-
text-align: center;
28-
grid-column: 1/3;
18+
.save-bar .btn {
19+
margin-right: 5px;
2920
}
3021

3122
@media screen and (max-width: 890px) {
3223
.setting-container{
3324
grid-template-columns: auto;
3425
}
35-
.setting-container .footer{
36-
grid-column: 1/2;
37-
}
3826
}

0 commit comments

Comments
 (0)