Skip to content

Commit 8bbbfa3

Browse files
authored
Fix the Flag bug (#20)
- Override react-flag css for positioning - Change font-family to karla - Add index.css to style react 'root' element - Change SubmitBar save icon
1 parent d04e9d9 commit 8bbbfa3

File tree

13 files changed

+24
-21
lines changed

13 files changed

+24
-21
lines changed

src/app/components/Authentication/Register.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
335335
</div>
336336
<div
337337
className={classnames('form-row', authStyles['avatar-select-form-row'])}
338-
style={{ padding: '10px 0px', fontFamily: 'Poppins' }}
338+
style={{ padding: '10px 0px', fontFamily: 'Karla' }}
339339
>
340340
<div className={classnames(authStyles['login-label'])}>
341341
Choose your spirit animal

src/app/components/ErrorBoundary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class ErrorBoundary extends React.Component<
2424
<div style={{ width: '100%', minWidth: '280px' }}>
2525
<Row>
2626
<Col sm={12} className="text-center">
27-
<h2 style={{ fontFamily: 'Courier New', color: '#f9ee80', margin: 50 }}>
27+
<h2 style={{ fontFamily: 'Karla', color: '#f9ee80', margin: 50 }}>
2828
{'Uh Oh... Something went wrong!'}
2929
</h2>
3030
</Col>

src/app/components/Renderer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default class Renderer extends React.Component<RendererInterfaces.Props,
6262
</Row>
6363
<Row>
6464
<Col sm={12} className="text-center">
65-
<h2 style={{ fontFamily: 'Courier New', color: '#f9ee80', margin: 30 }}>
65+
<h2 style={{ fontFamily: 'Karla', color: '#f9ee80', margin: 30 }}>
6666
Waiting to run your code...
6767
</h2>
6868
</Col>

src/app/components/SubmitBar/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {
22
faChevronLeft,
33
faChevronRight,
4-
faCloud,
54
faCodeBranch,
65
faCog,
76
faLock,
87
faPlay,
8+
faSave,
99
faTrash,
1010
} from '@fortawesome/free-solid-svg-icons';
1111
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -154,7 +154,7 @@ export class SubmitBar extends React.Component<
154154
) : null}
155155
<button className={classnames(styles.customBtn)} onClick={saveCode} id="save_button">
156156
<span className={classnames(styles.icon)}>
157-
<FontAwesomeIcon icon={faCloud} />
157+
<FontAwesomeIcon icon={faSave} />
158158
</span>
159159
<span>SAVE</span>
160160
</button>

src/app/styles/Authentication.module.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
background-color: #fee5d4;
160160
padding: 9px;
161161
margin-top: 0;
162+
text-align: left;
162163
}
163164
.register-error {
164165
background-color: #fee5d4;
@@ -184,7 +185,7 @@
184185
text-align: left;
185186
margin-bottom: 3px;
186187
font-weight: bold;
187-
font-family: 'Poppins';
188+
font-family: 'Karla', sans-serif;
188189
}
189190

190191
.root {
@@ -195,10 +196,10 @@
195196
.welcomeBack {
196197
margin-top: 57px;
197198
margin-bottom: 10px;
198-
font-family: 'Poppins', sans-serif;
199+
font-family: 'Karla', sans-serif;
199200
}
200201
.pragyan-login {
201-
font-family: 'Poppins';
202+
font-family: 'Karla', sans-serif;
202203
font-size: 12px;
203204
margin-top: 0;
204205
}
@@ -281,7 +282,7 @@
281282

282283
.loginButton {
283284
background-color: #4630eb !important ;
284-
margin-top: 10px;
285+
margin-top: 30px;
285286
width: 100%;
286287
}
287288

@@ -303,7 +304,7 @@
303304
box-shadow: none;
304305
}
305306
.registerMessage {
306-
font-family: 'Poppins';
307+
font-family: 'Karla', sans-serif;
307308
}
308309

309310
.stage-div {
@@ -318,8 +319,7 @@
318319
.button-tab {
319320
position: relative;
320321
height: 50px;
321-
322-
font-family: 'Poppins';
322+
font-family: 'Karla', sans-serif;
323323
}
324324

325325
.button-tab-next {
@@ -393,7 +393,7 @@
393393
width: 34%;
394394
margin: auto;
395395
cursor: pointer;
396-
font-family: 'Poppins';
396+
font-family: 'Karla', sans-serif;
397397
padding: 0;
398398
}
399399
.multi-steps > li {

src/app/styles/Flags.css

100644100755
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
.flag-select {
2-
display: flex !important;
32
align-items: center !important;
43
width: 100% !important;
54
border: 1px solid black !important;
65
text-align: left !important;
76
}
87

9-
.flag-options {
10-
margin-top: 100px !important;
8+
.selected--flag--option {
9+
margin-top: 2px;
1110
}
1211

1312
.flag-select img {

src/app/styles/Pagination.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
padding: 0px 8px;
3737
color: white;
3838
font-size: 13px;
39-
font-family: sans-serif;
39+
font-family: 'Karla', sans-serif;
4040
text-decoration: none;
4141
font-weight: 400;
4242
user-select: none;

src/app/styles/Register.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ input:checked + .flaglabel:after {
7070
.labeltext {
7171
color: rgba(0, 0, 32, 0.8);
7272
font-size: 14px;
73-
font-family: 'Montserrat', sans-serif;
73+
font-family: 'Karla', sans-serif;
7474
font-weight: 600;
7575
}

src/app/styles/SubmitBar.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.SubmitBar {
2+
user-select: none;
23
width: 100%;
34
padding: 8px;
45
background: #292929;

src/app/styles/UserProfileModal.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
.formHeading {
132132
padding: 0px 10px;
133133
font-size: 30px;
134-
font-family: 'Poppins', sans-serif;
134+
font-family: 'Karla', sans-serif;
135135
text-align: center;
136136
margin-bottom: 5%;
137137
margin-left: -1px;

0 commit comments

Comments
 (0)