Skip to content

Commit 03f4c98

Browse files
fix pages responsiveness
1 parent fe37572 commit 03f4c98

32 files changed

+395
-213
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ package-lock.json
2828
pnpm-lock.yaml
2929

3030
/.vscode
31-
/.netlify
31+
/.netlify
32+
# Local Netlify folder
33+
.netlify

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"react-redux": "^7.2.0",
3333
"react-redux-firebase": "^3.6.0",
3434
"react-router-dom": "^5.2.0",
35-
"react-scripts": "3.4.1",
35+
"react-scripts": "^3.4.3",
3636
"react-select": "^3.1.0",
3737
"react-toastify": "^6.0.8",
3838
"redux": "^4.0.5",

src/assets/styles/card.scss

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
margin-left: -12px !important;
1616
margin-right: -10px !important;
1717
margin-top: -18px !important;
18-
1918
}
19+
2020
.card-font{
2121
font-style: normal;
2222
font-weight: normal;
@@ -178,12 +178,19 @@
178178
.large-card {
179179
position: fixed;
180180
height: 550px;
181-
width: 358px;
181+
width: 318px;
182182
overflow-y: auto;
183183
}
184184
.large-card-content {
185185
width: 350px;
186186
}
187+
.course-title-small {
188+
display: none !important;
189+
}
190+
191+
.hide-in-full {
192+
display: none;
193+
}
187194

188195
@media screen and (max-width: 1001px) {
189196
.submenu-small {
@@ -194,4 +201,61 @@
194201
.submenu-small {
195202
width: 130px;
196203
}
204+
}
205+
@media screen and (max-width: 991px) {
206+
.submenu-col {
207+
display: none;
208+
}
209+
210+
.carded-table-scroll {
211+
width: 83%;
212+
}
213+
.course-title-small {
214+
background-color: $color-primary;
215+
width: 90%;
216+
text-align: center;
217+
outline: none;
218+
button {
219+
outline: none;
220+
background-color: $color-primary;
221+
border: none;
222+
}
223+
}
224+
.reserved-side {
225+
display: none;
226+
}
227+
h3 {
228+
width: 90%;
229+
}
230+
231+
.course-title-small {
232+
display: block !important;
233+
}
234+
235+
.course-title {
236+
margin-top: 10px;
237+
}
238+
239+
.card-block {
240+
margin-left: -5px !important;
241+
margin-right: -5px !important;
242+
}
243+
.large-table {
244+
width: 90% !important;
245+
left: 20px;
246+
margin-top: 50px;
247+
}
248+
249+
.large-card {
250+
width: 90%;
251+
}
252+
253+
.hide-in-small {
254+
display: none;
255+
}
256+
257+
.hide-in-full {
258+
display: block;
259+
width: 90%;
260+
}
197261
}

src/assets/styles/components/chat.scss

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,24 @@
123123

124124
@media screen and (max-width: 768px) {
125125
.chat {
126-
margin-left: 20px;
127-
width: 378px;
126+
width: 320px !important;
127+
margin-left: 0px;
128128
}
129129
.chat-card {
130-
width: 370px;
130+
width: 314px !important;
131131
}
132132
.online-users {
133133
width: 170px;
134134
}
135135
.chat_footer {
136-
width: 370px;
136+
width: 270px;
137137
top: 28rem;
138-
margin-left: 20px;
138+
margin-left: 0px;
139+
}
140+
.time-right {
141+
padding-top: 20px;
142+
}
143+
.time-left {
144+
padding-top: 20px;
139145
}
140146
}

src/assets/styles/components/table.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
.tbl {
32
background-color: white;
43
th {
@@ -8,4 +7,9 @@
87
tr{
98
border: 8px solid #F5F8FF;
109
}
10+
}
11+
@media screen and (max-width: 991px) {
12+
.tbl {
13+
width: 100%;
14+
}
1115
}

src/assets/styles/containers/login.scss

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,49 @@
1515
position: relative;
1616
left: 1.7rem;
1717
}
18-
19-
20-
@media (max-width: 768px) {
18+
.in-small {
19+
display: none;
20+
}
21+
@media (max-width: 1024px) {
22+
.in-small {
23+
display: block;
24+
color: white;
25+
font-weight: bold;
26+
text-align: center;
27+
}
28+
.signup--section {
29+
display: none;
30+
}
2131
.login--form{
2232
position: relative;
23-
top: -17rem;
24-
left: -.0003rem;
33+
top: -8rem;
34+
left: 0;
35+
}
36+
.signup--form--title {
37+
.txt--fontSize__large {
38+
display: none;
39+
}
40+
}
41+
}
42+
@media (min-width: 1025px) and (max-width: 1220px) {
43+
.in-small {
44+
display: block;
45+
color: white;
46+
font-weight: bold;
47+
text-align: center;
2548
}
26-
}
49+
.signup--section {
50+
position: relative;
51+
top: 0;
52+
}
53+
.login--form{
54+
position: relative;
55+
top: 0rem;
56+
left: 0;
57+
}
58+
.signup--form--title {
59+
.txt--fontSize__large {
60+
display: none;
61+
}
62+
}
63+
}

src/assets/styles/containers/signup.scss

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@import "../base.scss";
22
.signup--container {
33
font-size: $font-size-large;
4+
position: absolute;
5+
overflow: hidden;
46
height: 100vh;
57
width: 100vw;
68
background: $color-primary;
@@ -15,8 +17,6 @@
1517
right: 9rem;
1618
}
1719

18-
.signup--light {}
19-
2020
.signup--logo {
2121
position: relative;
2222
left: 10.375rem;
@@ -191,7 +191,6 @@
191191

192192
@media (min-device-width : 769px)
193193
and(max-width: 1024px) {
194-
195194
.signup__img--bulb,
196195
.signup__img--line__top,
197196
.signup__img--line__bottom {
@@ -202,4 +201,23 @@ and(max-width: 1024px) {
202201
top: 6rem;
203202
left: 33rem;
204203
}
205-
}
204+
.in-small {
205+
display: block !important;
206+
color: white !important;
207+
font-weight: bold !important;
208+
text-align: center !important;
209+
}
210+
.login--form{
211+
position: relative !important;
212+
top: 0rem !important;
213+
left: 0;
214+
}
215+
.signup--section {
216+
display: none !important;
217+
}
218+
.signup--form--title {
219+
.txt--fontSize__large {
220+
display: none !important;
221+
}
222+
}
223+
}

0 commit comments

Comments
 (0)