Skip to content

[#36]Implement adaptive version for the app #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Steisha4444 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[#36]Implement adaptive version for the app #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34b8f6c
[#36]Implement adaptive version for the app
Steisha4444 May 26, 2022
b3525c4
Hide scrollbars
Steisha4444 May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions src/assets/scss/AddEventForm.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,44 @@
@import './variables.scss';

.background {
background: rgba(145, 145, 192, 0.678);
width: 100%;
height: 100%;
z-index: 1;
position: absolute;
top: 0;
left: 0;
overflow: scroll;
}

.plate {
opacity: 100%;
position: relative;
width: 400px;
height: 500px;
margin: 0 auto;
margin-top: 80px;
position: absolute;
width: 25%;
background-color: white;
border-radius: 15px;
display: flex;
margin-bottom: 25px;
padding: 5px 20px;
box-shadow: 0 4px 25px 0 rgba(0, 0, 0, 0.3), 0 6px 25px 0 rgba(0, 0, 0, 0.3);
left: 50%;
margin-top: 20px;
margin-bottom: 20px;
z-index: 2;
transform: translateX(-50%);

@media (max-width: 1400px) {
width: 40%;
}

@media (max-width: 1024px) {
width: 50%;
}

@media (max-width: 700px) {
width: 70%;
}
@media (max-width: 500px) {
width: 90%;
}
}

.borders {
Expand All @@ -25,6 +52,7 @@
}

.title {
padding-top: 20px;
font-family: 'Nunito', sans-serif;
font-weight: 300;
margin-bottom: 30px;
Expand All @@ -37,4 +65,5 @@

.element:last-child {
margin-top: 10px;
margin-bottom: 20px;
}
49 changes: 42 additions & 7 deletions src/assets/scss/AddMemberForm.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,48 @@
@import './variables.scss';

.plate {
opacity: 100%;
position: relative;
width: 400px;
.background {
background: rgba(145, 145, 192, 0.678);
width: 100%;
height: 100%;
margin: 0 auto;
margin-top: 30px;
z-index: 1;
position: absolute;
top: 0;
left: 0;
overflow: scroll;
}
.plate {
position: absolute;
width: 25%;
background-color: white;
border-radius: 15px;
display: flex;
margin-bottom: 25px;
padding: 5px 20px;
box-shadow: 0 4px 25px 0 rgba(0, 0, 0, 0.3), 0 6px 25px 0 rgba(0, 0, 0, 0.3);
left: 50%;
margin-top: 20px;
margin-bottom: 20px;
z-index: 2;
transform: translateX(-50%);

@media (max-width: 1370px) {
width: 30%;
}
@media (max-width: 1270px) {
width: 35%;
}
@media (max-width: 1170px) {
width: 40%;
}
@media (max-width: 1024px) {
width: 50%;
}

@media (max-width: 700px) {
width: 70%;
}
@media (max-width: 500px) {
width: 90%;
}
}

.borders {
Expand All @@ -22,6 +53,10 @@
flex-direction: column;
justify-content: center;
margin: 25px auto;

@media (max-width: 500px) {
font-size: 10px;
}
}

.title {
Expand Down
27 changes: 16 additions & 11 deletions src/assets/scss/event.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,55 +26,60 @@
.event__box__list {
display: flex;
margin-left: 50px;


.comment__btn {
height: 25px;
}

@media (max-width: 834px) {
margin-left: 0px;
}

p {
font-size: 10px;
margin-right: 50px;
line-height: 15px;
margin-top: 3px;

padding-top: 3px;

@media (max-width: 834px) {
margin-right: 30px;
}

@media (max-width: 648px) {
margin-right: 20px;
font-size: 8px;
}

@media (max-width: 543px) {
margin-right: 10px;
font-size: 6px;
}

@media (max-width: 348px) {
margin-right: 5px;
font-size: 5px;
}
}

.event__box__img {
margin: 0px 20px;
padding-top: 3px;

@media (max-width: 501px) {
margin: 0px 10px;
}

@media (max-width: 349px) {
margin: 0px 5px;
}
}
}

.event__box__btn {
display: flex;
flex-direction: row;

div {
@media (max-width: 1100px) {
margin-right: 5px;
Expand Down
12 changes: 8 additions & 4 deletions src/assets/scss/eventList.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
.container {
width: 900px;
width: 90%;
margin: 0 auto;
padding: 40px;

@media only screen and (max-width: 992px) {
max-width: 90%;
padding: 20px;
.textResponsive {
font-size: 17.5px;
padding-left: 42px;

@media (max-width: 500px) {
font-size: 14px;
}
}
}
25 changes: 24 additions & 1 deletion src/assets/scss/eventManagement.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,35 @@
.container {
width: 900px;
width: 90%;
margin: 0 auto;
padding: 40px;

@media only screen and (max-width: 992px) {
max-width: 90%;
padding: 20px;
}
.flexBlock {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0;

.textResponsive {
font-size: 17.5px;
padding-left: 42px;

@media (max-width: 500px) {
font-size: 14px;
}
}
.managementBtn {
font-size: 17.5px;
margin-right: 42px;

@media (max-width: 500px) {
font-size: 14px;
}
}
}
}

.button__wrapper {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ body {
-moz-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
font-family:'Nunito', sans-serif;
overflow: scroll;
overflow: auto;
}
input,
button,
Expand Down
6 changes: 4 additions & 2 deletions src/assets/scss/login.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import '../../assets/Scss/variables.scss';
body {
background: linear-gradient(180deg, #4e73df 10%, #224abe 100%);
// background: linear-gradient(180deg, #4e73df 10%, #224abe 100%);
background: $light;
overflow: hidden;
}

Expand Down Expand Up @@ -41,7 +43,7 @@ body {
justify-content: center;
margin-top: auto;
margin-bottom: auto;

@media (max-width: 990px) {
width: 100%;
}
Expand Down
39 changes: 39 additions & 0 deletions src/assets/scss/managermanagement.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.tableContainerManagers {
max-width: 90%;
margin: 0 auto;
padding: 40px;

.flexBlock {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0;
.textResponsive {
font-size: 17.5px;
padding-left: 42px;

@media (max-width: 500px) {
font-size: 14px;
}
}
.managementBtn {
font-size: 17.5px;
margin-right: 42px;

@media (max-width: 500px) {
font-size: 14px;
}
}
}

.btnBlock {
padding-left: 20px;
padding-right: 20px;
display: flex;
justify-content: space-around;
}

.tableRow {
vertical-align: middle;
}
}
30 changes: 12 additions & 18 deletions src/assets/scss/memberlist.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,19 @@
margin: 0 auto;
padding: 40px;

@media only screen and (max-width: 1024px) {
max-width: 100%;
.flexBlock {
padding-left: 42px;
overflow: hidden;
}
}

.flexBlock {
display: flex;
justify-content: space-between;
align-items: center;
padding: 30px 50px 30px 50px;
}

.btnBlock {
padding-left: 20px;
padding-right: 20px;
display: flex;
justify-content: space-around;
}
.btnBlock {
padding-left: 20px;
padding-right: 20px;
display: flex;
justify-content: space-around;
}

.tableRow {
vertical-align: middle;
.tableRow {
vertical-align: middle;
}
}
Loading