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.

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

feat(dev): add mobile ui for manage groups flow and update group prop… #1131

Merged
merged 1 commit into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,29 @@
flex-flow: row nowrap;
justify-content: flex-start;
width: 100%;

@include mobile-only {
flex-flow: column nowrap;
}
}

.list {
width: 25%;

@include mobile-only {
margin-bottom: 16px;
width: 100%;
}
}

.listTitle {
@extend %heading4;
line-height: 36px;
margin: 0 0 11px 16px;

@include mobile-only {
margin-left: 0;
}
}

.group {
Expand Down Expand Up @@ -54,6 +67,16 @@
min-height: 270px;
padding: 0 32px;
width: calc(75% - 36px);

@include desktop-max {
flex-flow: column nowrap;
justify-content: flex-start;
}

@include mobile-only {
margin-left: 0;
width: 100%;
}
}

.column {
Expand All @@ -66,8 +89,16 @@
overflow-y: auto;
width: 220px;

@include mobile-only {
width: 100%;
}

&:nth-child(2) {
margin-left: 48px;

@include desktop-max {
margin-left: 0;
}
}
}

Expand All @@ -85,12 +116,12 @@
color: #2079c7;
cursor: pointer;
height: 18px;
margin-left: 6px;
width: 18px;
}

.popover {
display: inline;
margin-left: 6px;
}

.popupArrow::after {
Expand All @@ -114,6 +145,11 @@
.contentValue {
@extend %heading3;
margin-top: 14px;

@include desktop-max {
margin-bottom: 0;
margin-top: 2px;
}
}

.contentValueName {
Expand All @@ -123,6 +159,10 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;

@include desktop-max {
margin-bottom: 0;
}
}

.member {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
grid-template-columns: 207px 1fr;
min-height: 400px;
width: 100%;

@include mobile-only {
align-items: flex-start;
display: flex;
flex-flow: column nowrap;
justify-content: flex-start;
}
}

.list {
Expand All @@ -17,6 +24,10 @@
flex-flow: column nowrap;
justify-content: flex-start;
padding: 16px 0;

@include mobile-only {
width: 100%;
}
}

.createGroup {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

@import 'styles/typography';

.content {
@include mobile-only {
width: 100%;
}
}

.header {
border-bottom: 1px solid var(--color-neutral-30);
display: grid;
Expand All @@ -10,13 +16,25 @@
min-height: 73px;
padding: 16px 36px;
width: 100%;

@include tablet-landscape-max {
align-items: flex-start;
display: flex;
flex-flow: row wrap;
justify-content: flex-start;
}
}

.headerContent {
align-items: center;
display: flex;
flex-flow: row nowrap;
justify-content: flex-start;

@include mobile-only {
justify-content: space-between;
width: 100%;
}
}

.headerText {
Expand Down Expand Up @@ -79,6 +97,13 @@
flex-flow: row nowrap;
justify-content: flex-end;
margin-left: auto;

@include tablet-landscape-max {
justify-content: space-between;
margin-left: -12px;
margin-top: 16px;
width: calc(100% + 12px);
}
}

.headerDelete {
Expand Down Expand Up @@ -130,6 +155,24 @@
height: calc(100% - 73px);
padding: 10px 36px;
width: 100%;

@include max-large-x-desktop {
grid-column-gap: 24px;
padding: 10px 24px;
}

@include astro-desktop-max {
align-items: flex-start;
display: flex;
flex-flow: column nowrap;
justify-content: flex-start;
}
}

.members {
@include astro-desktop-max {
width: 100%;
}
}

.memberHead {
Expand All @@ -138,6 +181,10 @@
flex-flow: row nowrap;
justify-content: flex-start;
width: 100%;

@include mobile-only {
flex-flow: row wrap;
}
}

.membersHeadIcon {
Expand All @@ -156,6 +203,10 @@
margin-left: auto;
position: relative;
width: 146px;

@include mobile-only {
width: 100%;
}
}

.memberSearchIcon {
Expand All @@ -164,6 +215,10 @@
position: absolute;
top: 11px;
width: 16px;

@include mobile-only {
left: 0;
}
}

.memberSearchDone {
Expand All @@ -190,6 +245,10 @@
outline: none;
padding-left: 36px;
width: 100%;

@include mobile-only {
padding-left: 26px;
}
}

.memberSearchInputShort {
Expand Down Expand Up @@ -253,6 +312,10 @@
max-width: 432px;
padding-bottom: 12px;
width: 100%;

@include mobile-only {
max-width: unset;
}
}

.memberName {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
flex-flow: column nowrap;
height: 100%;
justify-content: flex-start;

@include astro-desktop-max {
margin-top: 16px;
width: 100%;
}
}

.votingHead {
Expand All @@ -24,7 +29,7 @@
.votingTitle {
@extend %heading3;
line-height: 38px;
margin: 0 8px;
margin: 0 0 0 8px;
}

.votingText {
Expand Down
18 changes: 18 additions & 0 deletions styles/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,36 @@
}
}

@mixin desktop-max {
@media (max-width: #{breakpoints.$screen-md}px) {
@content;
}
}

@mixin astro-desktop {
@media (min-width: #{breakpoints.$screen-mobile + 1}px) {
@content;
}
}

@mixin astro-desktop-max {
@media (max-width: #{breakpoints.$screen-mobile + 1}px) {
@content;
}
}

@mixin tablet-landscape {
@media (min-width: #{breakpoints.$screen-sm}px) {
@content;
}
}

@mixin tablet-landscape-max {
@media (max-width: #{breakpoints.$screen-sm}px) {
@content;
}
}

@mixin tablet-portrait {
@media (min-width: #{breakpoints.$screen-xs}px) {
@content;
Expand Down