Skip to content

Commit 3ff4286

Browse files
KelvinTegelaarKelvinTegelaar
authored
Merge pull request #1728 from johnduprey/dev
Add stretched-link to collapses
2 parents 3b06743 + e6602ed commit 3ff4286

File tree

7 files changed

+85
-29
lines changed

7 files changed

+85
-29
lines changed

‎src/views/cipp/AppApproval.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,20 @@ const GraphExplorer = () => {
112112
<CCardHeader>
113113
<CCardTitle className="d-flex justify-content-between">
114114
Approval Settings
115-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
115+
<CButton
116+
size="sm"
117+
variant="ghost"
118+
className="stretched-link"
119+
onClick={() => setVisibleA(!visibleA)}
120+
>
116121
<FontAwesomeIcon icon={visibleA ? faChevronDown : faChevronRight} />
117122
</CButton>
118123
</CCardTitle>
119124
</CCardHeader>
120-
<CCollapse visible={visibleA}>
125+
</CCard>
126+
<CCollapse visible={visibleA}>
127+
<CCard className="options-card">
128+
<CCardHeader></CCardHeader>
121129
<CCardBody>
122130
<Form
123131
initialValues={{
@@ -166,8 +174,8 @@ const GraphExplorer = () => {
166174
}}
167175
/>
168176
</CCardBody>
169-
</CCollapse>
170-
</CCard>
177+
</CCard>
178+
</CCollapse>
171179
</CCol>
172180
</CRow>
173181
<hr />

‎src/views/cipp/Logs.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,20 @@ const Logs = () => {
126126
<CCardHeader>
127127
<CCardTitle className="d-flex justify-content-between">
128128
Logbook Settings
129-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
129+
<CButton
130+
size="sm"
131+
variant="ghost"
132+
className="stretched-link"
133+
onClick={() => setVisibleA(!visibleA)}
134+
>
130135
<FontAwesomeIcon icon={visibleA ? faChevronDown : faChevronRight} />
131136
</CButton>
132137
</CCardTitle>
133138
</CCardHeader>
134-
<CCollapse visible={visibleA}>
139+
</CCard>
140+
<CCollapse visible={visibleA}>
141+
<CCard className="options-card">
142+
<CCardHeader></CCardHeader>
135143
<CCardBody>
136144
<Form
137145
initialValues={{
@@ -186,8 +194,8 @@ const Logs = () => {
186194
}}
187195
/>
188196
</CCardBody>
189-
</CCollapse>
190-
</CCard>
197+
</CCard>
198+
</CCollapse>
191199
</CCol>
192200
</CRow>
193201
<hr />

‎src/views/email-exchange/reports/MessageTrace.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,20 @@ const MessageTrace = () => {
9595
<CCardHeader>
9696
<CCardTitle className="d-flex justify-content-between">
9797
Message Trace Settings
98-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
98+
<CButton
99+
size="sm"
100+
variant="ghost"
101+
className="stretched-link"
102+
onClick={() => setVisibleA(!visibleA)}
103+
>
99104
<FontAwesomeIcon icon={visibleA ? faChevronDown : faChevronRight} />
100105
</CButton>
101106
</CCardTitle>
102107
</CCardHeader>
103-
<CCollapse visible={visibleA}>
108+
</CCard>
109+
<CCollapse visible={visibleA}>
110+
<CCard className="options-card">
111+
<CCardHeader></CCardHeader>
104112
<CCardBody>
105113
<Form
106114
initialValues={{
@@ -178,8 +186,8 @@ const MessageTrace = () => {
178186
}}
179187
/>
180188
</CCardBody>
181-
</CCollapse>
182-
</CCard>
189+
</CCard>
190+
</CCollapse>
183191
</CCol>
184192
</CRow>
185193
<hr />

‎src/views/identity/reports/SignIns.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,24 @@ const SignInsReport = () => {
125125
<>
126126
<CRow>
127127
<CCol>
128-
<CCard className="me-2 options-card">
128+
<CCard className="options-card">
129129
<CCardHeader>
130130
<CCardTitle className="d-flex justify-content-between">
131131
Sign In log Settings
132-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
132+
<CButton
133+
size="sm"
134+
variant="ghost"
135+
className="stretched-link"
136+
onClick={() => setVisibleA(!visibleA)}
137+
>
133138
<FontAwesomeIcon icon={visibleA ? faChevronDown : faChevronRight} />
134139
</CButton>
135140
</CCardTitle>
136141
</CCardHeader>
137-
<CCollapse visible={visibleA}>
142+
</CCard>
143+
<CCollapse visible={visibleA}>
144+
<CCard className="options-card">
145+
<CCardHeader></CCardHeader>
138146
<CCardBody>
139147
<Form
140148
initialValues={{
@@ -173,8 +181,8 @@ const SignInsReport = () => {
173181
}}
174182
/>
175183
</CCardBody>
176-
</CCollapse>
177-
</CCard>
184+
</CCard>
185+
</CCollapse>
178186
</CCol>
179187
</CRow>
180188
<hr />

‎src/views/tenant/administration/GraphExplorer.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,20 @@ const GraphExplorer = () => {
109109
<CCardHeader>
110110
<CCardTitle className="d-flex justify-content-between">
111111
Report Settings
112-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
112+
<CButton
113+
size="sm"
114+
variant="ghost"
115+
className="stretched-link"
116+
onClick={() => setVisibleA(!visibleA)}
117+
>
113118
<FontAwesomeIcon icon={visibleA ? faChevronDown : faChevronRight} />
114119
</CButton>
115120
</CCardTitle>
116121
</CCardHeader>
117-
<CCollapse visible={visibleA}>
122+
</CCard>
123+
<CCollapse visible={visibleA}>
124+
<CCard className="options-card">
125+
<CCardHeader></CCardHeader>
118126
<CCardBody>
119127
<Form
120128
initialValues={{
@@ -210,8 +218,8 @@ const GraphExplorer = () => {
210218
}}
211219
/>
212220
</CCardBody>
213-
</CCollapse>
214-
</CCard>
221+
</CCard>
222+
</CCollapse>
215223
</CCol>
216224
</CRow>
217225
<hr />

‎src/views/tenant/standards/BPAReportBuilder.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,20 @@ const BPAReportBuilder = () => {
141141
<CCardHeader>
142142
<CCardTitle className="d-flex justify-content-between">
143143
Report Settings
144-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
144+
<CButton
145+
size="sm"
146+
variant="ghost"
147+
className="stretched-link"
148+
onClick={() => setVisibleA(!visibleA)}
149+
>
145150
<FontAwesomeIcon icon={visibleA ? 'chevron-down' : 'chevron-right'} />
146151
</CButton>
147152
</CCardTitle>
148153
</CCardHeader>
149-
<CCollapse visible={visibleA}>
154+
</CCard>
155+
<CCollapse visible={visibleA}>
156+
<CCard className="options-card">
157+
<CCardHeader></CCardHeader>
150158
<CCardBody>
151159
<CRow>
152160
<CCol xs={12} lg={6}>
@@ -213,8 +221,8 @@ const BPAReportBuilder = () => {
213221
</CCol>
214222
</CRow>
215223
</CCardBody>
216-
</CCollapse>
217-
</CCard>
224+
</CCard>
225+
</CCollapse>
218226
</CCol>
219227
</CRow>
220228
<hr />

‎src/views/tenant/standards/BestPracticeAnalyser.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,20 @@ const BestPracticeAnalyser = () => {
226226
<CCardHeader>
227227
<CCardTitle className="d-flex justify-content-between">
228228
Report Settings
229-
<CButton size="sm" variant="ghost" onClick={() => setVisibleA(!visibleA)}>
229+
<CButton
230+
size="sm"
231+
variant="ghost"
232+
className="stretched-link"
233+
onClick={() => setVisibleA(!visibleA)}
234+
>
230235
<FontAwesomeIcon icon={visibleA ? faChevronDown : faChevronRight} />
231236
</CButton>
232237
</CCardTitle>
233238
</CCardHeader>
234-
<CCollapse visible={visibleA}>
239+
</CCard>
240+
<CCollapse visible={visibleA}>
241+
<CCard className="options-card">
242+
<CCardHeader></CCardHeader>
235243
<CCardBody>
236244
<Form
237245
initialValues={{
@@ -270,8 +278,8 @@ const BestPracticeAnalyser = () => {
270278
}}
271279
/>
272280
</CCardBody>
273-
</CCollapse>
274-
</CCard>
281+
</CCard>
282+
</CCollapse>
275283
</CCol>
276284
</CRow>
277285
<hr />

0 commit comments

Comments
 (0)