Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 6bfea50

Browse files
committed
Fixed: page extended past the edge of screen.
1 parent 06e071c commit 6bfea50

File tree

10 files changed

+77
-35
lines changed

10 files changed

+77
-35
lines changed

src/components/Content/styles.module.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
padding: 0 10px;
55

66
@include desktop {
7-
flex: 1 1 auto;
7+
flex: 1 1 0;
88
padding: 0 35px;
9+
min-width: 0;
910
}
1011
}

src/components/SelectField/styles.module.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,16 @@
104104

105105
.medium {
106106
:global(.custom__value-container) {
107-
margin-top: 4px;
107+
margin-top: 2px;
108+
margin-bottom: 2px;
108109
padding: 6px 15px;
109110
}
110111
}
111112

112113
.small {
113114
:global(.custom__value-container) {
114-
margin-top: 2px;
115+
margin-top: 1px;
116+
margin-bottom: 1px;
115117
padding: 2px 7px 2px 13px;
116118
}
117119

src/routes/WorkPeriods/components/PaymentErrorDetails/styles.module.scss

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
.container {
44
display: block;
5-
max-width: 480px;
65
text-align: left;
76
}
87

src/routes/WorkPeriods/components/PeriodDetails/index.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ const PeriodDetails = ({ className, details, isDisabled, isFailed }) => {
104104
</div>
105105
</div>
106106
</div>
107-
<div className={styles.billingAccountSection}>
107+
<div className={styles.billingAccountsSection}>
108108
<div className={styles.sectionLabel}>Billing Account</div>
109109
<SelectField
110-
className={
111-
billingAccountsError ? styles.billingAccountsError : ""
112-
}
110+
className={cn(styles.billingAccountsSelect, {
111+
[styles.billingAccountsError]: billingAccountsError,
112+
})}
113113
id={`rb_bil_acc_${periodId}`}
114114
isDisabled={billingAccountsIsDisabled}
115115
size="small"

src/routes/WorkPeriods/components/PeriodDetails/styles.module.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,14 @@
6969
color: #e90c5a;
7070
}
7171

72-
.billingAccountSection {
72+
.billingAccountsSection {
7373
margin-top: 13px;
7474
}
7575

76+
.billingAccountsSelect {
77+
min-width: 368px;
78+
}
79+
7680
.billingAccountsError {
7781
color: #e90c5a;
7882
}

src/routes/WorkPeriods/components/PeriodItem/styles.module.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@import "styles/mixins";
22
@import "styles/variables";
33

4-
tr.container {
4+
.container {
55
> td {
6-
padding-left: 17px;
7-
padding-right: 17px;
6+
padding-left: 15px;
7+
padding-right: 18px;
88
background: #fff;
99
}
1010

@@ -41,7 +41,7 @@ tr.container {
4141
}
4242

4343
td.toggle {
44-
padding: 12px 20px 12px 15px;
44+
padding: 12px 18px 12px 15px;
4545
line-height: 15px;
4646
}
4747

src/routes/WorkPeriods/components/PeriodList/index.jsx

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ const PeriodList = ({ className }) => {
3232

3333
return (
3434
<ProjectNameContextProvider>
35-
<div className={cn(styles.container, className)}>
35+
<div
36+
className={cn(
37+
styles.container,
38+
{ [styles.hasItems]: periods.length },
39+
className
40+
)}
41+
>
3642
<table className={styles.table}>
3743
<thead>
3844
<PeriodListHead />

src/routes/WorkPeriods/components/PeriodList/styles.module.scss

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
.container {
44
position: relative;
55
padding: 0 20px 0 15px;
6+
width: 100%;
7+
overflow-x: auto;
8+
overflow-y: visible;
9+
10+
&.hasItems {
11+
min-height: 348px;
12+
}
613
}
714

815
.table {

src/routes/WorkPeriods/index.jsx

+4-7
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,25 @@ import styles from "./styles.module.scss";
2020
* @returns {JSX.Element}
2121
*/
2222
const WorkPeriods = () => (
23-
<Page className={styles.container}>
23+
<Page>
2424
<Sidebar>
2525
<PeriodFilters />
2626
</Sidebar>
2727
<Content>
2828
<PeriodsContentHeader />
29-
<ContentBlock className={styles.periodsBlock}>
29+
<ContentBlock>
3030
<div className={styles.periodsHeader}>
3131
<PeriodCount className={styles.periodCount} />
3232
<PeriodWeekPicker className={styles.periodWeekPicker} />
3333
<PeriodsPagination
34-
className={styles.periodsPagination}
34+
className={styles.periodsPaginationTop}
3535
id="periods-pagination-top"
3636
/>
3737
</div>
3838
<PeriodsSelectionMessage />
3939
<Periods />
4040
<div className={styles.periodsFooter}>
41-
<PeriodsPagination
42-
className={styles.periodPagination}
43-
id="periods-pagination-bottom"
44-
/>
41+
<PeriodsPagination id="periods-pagination-bottom" />
4542
</div>
4643
</ContentBlock>
4744
</Content>
+40-14
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,57 @@
1-
.container {
2-
}
3-
4-
.periodsBlock {
5-
}
1+
@import "styles/mixins";
62

73
.periodsHeader {
84
display: flex;
5+
flex-wrap: wrap;
96
justify-content: space-between;
107
align-items: center;
118
padding: 13px 13px 13px 32px;
12-
}
139

14-
.periodsFooter {
15-
display: flex;
16-
justify-content: flex-end;
17-
align-items: center;
18-
padding: 13px 13px 13px 32px;
10+
@include desktop {
11+
flex-wrap: nowrap;
12+
}
1913
}
2014

2115
.periodCount {
16+
margin-right: 20px;
17+
margin-bottom: 13px;
2218
white-space: nowrap;
19+
20+
@include tablet {
21+
margin-bottom: 0;
22+
}
23+
24+
@include desktop {
25+
margin-right: 40px;
26+
}
2327
}
2428

2529
.periodWeekPicker {
26-
margin-left: 40px;
30+
margin-bottom: 13px;
31+
32+
@include tablet {
33+
margin-bottom: 0;
34+
}
35+
}
36+
37+
.periodsPaginationTop {
38+
width: 100%;
39+
40+
@include tablet {
41+
margin-left: 20px;
42+
width: auto;
43+
min-width: 382px;
44+
}
45+
46+
@include desktop {
47+
margin-left: 40px;
48+
min-width: 505px;
49+
}
2750
}
2851

29-
.periodsPagination {
30-
margin-left: 40px;
52+
.periodsFooter {
53+
display: flex;
54+
justify-content: flex-end;
55+
align-items: center;
56+
padding: 13px 13px 13px 32px;
3157
}

0 commit comments

Comments
 (0)