Skip to content
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

fix: Extra space between parentDiv and childDiv #2145

Closed
wants to merge 30 commits into from
Closed

fix: Extra space between parentDiv and childDiv #2145

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
65a766e
Updated branching strategy
DangaRanga May 23, 2021
0a6d4d6
Removed duplicate entry
DangaRanga May 23, 2021
e16a3ad
Updated contributing.md
DangaRanga May 23, 2021
653345e
Added extra markdown styling to contribute.md
DangaRanga May 23, 2021
13180c2
Merge pull request #54 from DangaRanga/master
DangaRanga May 23, 2021
07f4465
Bump dns-packet from 1.3.1 to 1.3.4
dependabot[bot] May 30, 2021
f9d7eae
Merge pull request #60 from PalisadoesFoundation/dependabot/npm_and_y…
palisadoes May 30, 2021
1a57176
Update pull_request_template.md
palisadoes May 30, 2021
c4580fa
disabled CodeQL cron jobs and push actions (#72)
akshatgarg12 Jun 6, 2021
f71bc11
Merge Develop into Main (#1099)
noman2002 Nov 30, 2023
1fd4105
[#1123] Changes position and text of "All Organizations" button (#1124)
adi790uu Dec 10, 2023
9ff2924
Revert "[#1123] Changes position and text of "All Organizations" butt…
noman2002 Dec 12, 2023
a320d35
Added Base branch check to main (#1515)
palisadoes Jan 29, 2024
42633e2
Pre-GSoC 2024 - Stable (#1934)
palisadoes Apr 27, 2024
f6c6f03
Update README.md
palisadoes Apr 27, 2024
423b990
Merge develop - 20240504 (#1956)
palisadoes May 4, 2024
7befb35
Merge develop - 20240504 (#1957)
palisadoes May 4, 2024
a4d2a07
Bump follow-redirects from 1.15.5 to 1.15.6 (#1960)
dependabot[bot] May 5, 2024
9b5d158
Bump tar from 6.1.15 to 6.2.1 (#1959)
dependabot[bot] May 5, 2024
389ac01
Bump tj-actions/changed-files from 40 to 41 in /.github/workflows (#1…
dependabot[bot] May 5, 2024
d3d681f
Bump express from 4.18.2 to 4.19.2 (#1962)
dependabot[bot] May 5, 2024
7091c76
Bump ejs from 3.1.9 to 3.1.10 (#1963)
dependabot[bot] May 5, 2024
bf9852d
coderabbit yaml file (#1991)
pranshugupta54 May 19, 2024
f661cc9
Updating the main branch to the latest develop code (#2020)
palisadoes Jun 2, 2024
5010350
Latest Develop 20240724 (#2127)
palisadoes Jul 27, 2024
43425e2
changes
anuragnegi000 Jul 31, 2024
a1b40bb
changes in parentDiv in userScreen
anuragnegi000 Aug 1, 2024
4b4e038
changes from px to vh and vw
anuragnegi000 Aug 1, 2024
9e0d9a7
fixing previous errors
anuragnegi000 Aug 2, 2024
4d9c977
Merge branch 'develop' into parentDiv
anuragnegi000 Aug 2, 2024
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
15 changes: 14 additions & 1 deletion src/components/ProfileDropdown/ProfileDropdown.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
border: none;
padding: 2.1rem 0.5rem;
height: 52px;
width: 15vw;
border-radius: 8px 0px 0px 8px;
display: flex;
position: absolute;
align-items: center;
top: 5vh;
right: 5vw;
background-color: white !important;
box-shadow:
0 4px 4px 0 rgba(177, 177, 177, 0.2),
0 6px 44px 0 rgba(246, 246, 246, 0.19);
z-index: 1000;
}
.profileContainer:focus {
outline: none;
Expand Down Expand Up @@ -60,10 +65,18 @@
background-color: transparent !important;
}
.dropdownToggle {
height: 7.7vh;
position: absolute;
top: 5vh;
right: 2.7vw;
box-shadow:
0 4px 4px 0 rgba(177, 177, 177, 0.2),
0 6px 44px 0 rgba(246, 246, 246, 0.19);
background-image: url(/public/images/svg/angleDown.svg);
background-repeat: no-repeat;
background-position: center;
background-color: azure;
background-color: white !important;
z-index: 1000;
}

.dropdownToggle::after {
Expand Down
4 changes: 2 additions & 2 deletions src/components/UserPortal/ChatRoom/ChatRoom.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ describe('Testing Chatroom Component [User Portal]', () => {
await wait();
});

test('Test send message direct chat', async () => {
test('send message direct chat', async () => {
setItem('userId', '2');
const mocks = [
SEND_MESSAGE_TO_DIRECT_CHAT_MOCK,
Expand Down Expand Up @@ -864,7 +864,7 @@ describe('Testing Chatroom Component [User Portal]', () => {
await wait();
});

test('Test send message group chat', async () => {
test('send message group chat', async () => {
const mocks = [
SEND_MESSAGE_TO_GROUP_CHAT_MOCK,
...DIRECT_CHAT_BY_ID_QUERY_MOCK,
Expand Down
4 changes: 2 additions & 2 deletions src/components/UserPortal/CreateDirectChat/CreateDirectChat.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@ describe('Testing Create Direct Chat Modal [User Portal]', () => {
})),
});

test('Test open and close create new direct chat modal', async () => {
test('open and close create new direct chat modal', async () => {
const mock = [
...GROUP_CHAT_BY_ID_QUERY_MOCK,
...DIRECT_CHAT_BY_ID_QUERY_MOCK,
Expand Down Expand Up @@ -2157,7 +2157,7 @@ describe('Testing Create Direct Chat Modal [User Portal]', () => {
fireEvent.click(closeButton);
});

test('Test create new direct chat', async () => {
test('create new direct chat', async () => {
setItem('userId', '1');
const mock = [
CREATE_DIRECT_CHAT_MOCK,
Expand Down
6 changes: 3 additions & 3 deletions src/components/UserPortal/CreateGroupChat/CreateGroupChat.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2543,7 +2543,7 @@ describe('Testing Create Direct Chat Modal [User Portal]', () => {
})),
});

test('Test open and close create new direct chat modal', async () => {
test('open and close create new direct chat modal', async () => {
const mock = [
...USER_JOINED_ORG_MOCK,
...GROUP_CHAT_BY_ID_QUERY_MOCK,
Expand Down Expand Up @@ -2580,7 +2580,7 @@ describe('Testing Create Direct Chat Modal [User Portal]', () => {
fireEvent.click(closeButton);
});

test('Test create new group chat', async () => {
test('create new group chat', async () => {
const mock = [
...CREATE_GROUP_CHAT_MOCK,
...USER_JOINED_ORG_MOCK,
Expand Down Expand Up @@ -2657,7 +2657,7 @@ describe('Testing Create Direct Chat Modal [User Portal]', () => {
});
}, 3000);

test('Test add and remove user ', async () => {
test('add and remove user', async () => {
setItem('userId', '1');
const mock = [
...USER_JOINED_ORG_MOCK,
Expand Down
4 changes: 2 additions & 2 deletions src/screens/UserPortal/Chat/Chat.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2159,7 +2159,7 @@ describe('Testing Chat Screen [User Portal]', () => {
});
});

test('Test create new direct chat', async () => {
test('create new direct chat', async () => {
const mock = [
...USER_JOINED_ORG_MOCK,
...GROUP_CHAT_BY_ID_QUERY_MOCK,
Expand Down Expand Up @@ -2199,7 +2199,7 @@ describe('Testing Chat Screen [User Portal]', () => {
fireEvent.click(closeButton);
});

test('Test create new group chat', async () => {
test('create new group chat', async () => {
const mock = [
...USER_JOINED_ORG_MOCK,
...GROUP_CHAT_BY_ID_QUERY_MOCK,
Expand Down
5 changes: 0 additions & 5 deletions src/screens/UserPortal/Events/Events.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@
max-width: 800px;
}

.colorLight {
background-color: #f1f3f6;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you removing light color from all screens?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because it is making all the screens look odd

.mainContainer {
width: 50%;
flex-grow: 3;
padding: 20px;
max-height: 100%;
overflow: auto;
}
Expand Down
4 changes: 3 additions & 1 deletion src/screens/UserPortal/Events/Events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ export default function events(): JSX.Element {
<>
<div className={`d-flex flex-row ${styles.containerHeight}`}>
<div className={`${styles.colorLight} ${styles.mainContainer}`}>
<h1>Events</h1>
<div className="mb-3">
<h1>Events</h1>
</div>
<EventHeader
viewType={viewType}
showInviteModal={showInviteModal}
Expand Down
5 changes: 0 additions & 5 deletions src/screens/UserPortal/People/People.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,9 @@
max-width: 600px;
}

.colorLight {
background-color: #f5f5f5;
}

.mainContainer {
width: 50%;
flex-grow: 3;
padding: 40px;
max-height: 100%;
overflow: auto;
}
Expand Down
3 changes: 2 additions & 1 deletion src/screens/UserPortal/Posts/Posts.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
.mainContainer {
width: 50%;
flex-grow: 3;
padding: 1rem;
/* padding: 1rem; */
position: relative;
max-height: 100%;
overflow-y: auto;
overflow-x: hidden;
Expand Down
3 changes: 2 additions & 1 deletion src/screens/UserPortal/UserScreen/UserScreen.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.pageContainer {
display: flex;
flex-direction: column;
position: relative;
min-height: 100vh;
padding: 1rem 1.5rem 0 calc(300px + 2rem + 1.5rem);
padding: 0rem 1.5rem 0rem calc(300px + 2rem + 1.5rem);
}

.expand {
Expand Down
Loading