Skip to content

Commit b9a97d2

Browse files
shivani170shivani170
committed
css added
1 parent 23cde53 commit b9a97d2

File tree

7 files changed

+30
-25
lines changed

7 files changed

+30
-25
lines changed

‎src/Shared/Components/CICDHistory/Artifacts.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const CIListItem = ({
7070
return (
7171
<>
7272
{type === 'deployed-artifact' && (
73-
<div className="flex mb-12 dc__width-inherit">
73+
<div className="flex dc__width-inherit">
7474
<div className="w-50 text-underline-dashed-300" />
7575
<Down className="icon-dim-16 ml-8 mr-8" style={{ transform: 'rotate(90deg)' }} />
7676
<div className="w-50 text-underline-dashed-300" />
@@ -89,7 +89,7 @@ export const CIListItem = ({
8989
})}
9090

9191
<div
92-
className={`dc__h-fit-content ci-artifact ci-artifact--${type} image-tag-parent-card bcn-0 br-4 dc__border p-12 w-100 dc__mxw-800 ${
92+
className={`dc__h-fit-content ci-artifact image-tag-parent-card bcn-0 br-4 dc__border p-12 w-100 dc__mxw-800 ci-artifact--${type} ${
9393
headerMetaDataPresent && renderCIListHeader ? 'dc__no-top-radius dc__no-top-border' : ''
9494
}`}
9595
data-testid="hover-on-report-artifact"
@@ -215,7 +215,7 @@ const Artifacts = ({
215215
)
216216
}
217217
return (
218-
<div className={`flex left column ${jobCIClass ?? ''}`}>
218+
<div className={`flex left column dc__gap-12 ${jobCIClass ?? ''}`}>
219219
{!isJobView && type !== HistoryComponentType.CD && (
220220
<CIListItem
221221
type="artifact"

‎src/Shared/Components/CICDHistory/CiPipelineSourceConfig.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ export const CiPipelineSourceConfig = ({
136136
<div className={`flex left ${showTooltip ? 'branch-name' : ''}`}>
137137
{loading && showIcons && <span className="dc__loading-dots">loading</span>}
138138
{!loading && (
139-
<>
139+
<div className="flex dc__gap-4">
140140
{showIcons && (
141141
<img
142142
src={_isWebhook ? webhookIcon : isRegexOrBranchIcon}
143143
alt="branch"
144-
className="icon-dim-12 mr-5"
144+
className="icon-dim-12"
145145
/>
146146
)}
147147
{showTooltip && (
@@ -151,7 +151,10 @@ export const CiPipelineSourceConfig = ({
151151
placement="bottom"
152152
content={sourceValueAdv}
153153
>
154-
<div className="flex" style={{ maxWidth: !baseText ? 'calc(100% - 15px)' : 'auto' }}>
154+
<div
155+
className="flex left dc__gap-4"
156+
style={{ maxWidth: !baseText ? 'calc(100% - 15px)' : 'auto' }}
157+
>
155158
{!baseText && (
156159
<>
157160
<div
@@ -162,9 +165,7 @@ export const CiPipelineSourceConfig = ({
162165
{sourceValueBase}
163166
</div>
164167
{sourceValue !== DEFAULT_GIT_BRANCH_VALUE && (
165-
<div className="mt-2">
166-
<Info className="icon-dim-12 fcn-5 ml-4" />
167-
</div>
168+
<Info className="icon-dim-12 fcn-5" />
168169
)}
169170
</>
170171
)}
@@ -177,7 +178,7 @@ export const CiPipelineSourceConfig = ({
177178
</Tippy>
178179
)}
179180
{!showTooltip && <span className="dc__ellipsis-right">{sourceValueAdv}</span>}
180-
</>
181+
</div>
181182
)}
182183
</div>
183184
)

‎src/Shared/Components/CICDHistory/History.components.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ export const GitChanges = ({
130130
const extractImageArtifact = extractImage(artifact)
131131

132132
return (
133-
<div className="flex column left w-100 ">
133+
<div className="flex column left w-100 p-16 dc__gap-12">
134134
{ciMaterials?.map((ciMaterial, index) => {
135135
const gitTrigger = gitTriggers[ciMaterial.id]
136136
return gitTrigger && (gitTrigger.Commit || gitTrigger.WebhookData?.data) ? (
137137
<div
138138
// eslint-disable-next-line react/no-array-index-key
139139
key={`mat-${gitTrigger?.Commit}-${index}`}
140-
className="bcn-0 pt-12 br-4 en-2 bw-1 pb-12 mt-16 ml-16"
140+
className="bcn-0 br-4 en-2 bw-1"
141141
data-testid="source-code-git-hash"
142142
style={{ width: 'min( 100%, 800px )' }}
143143
>
@@ -160,7 +160,7 @@ export const GitChanges = ({
160160
) : null
161161
})}
162162
{artifact && (
163-
<div className="flex left column mt-16 mb-16 ml-16" style={{ width: 'min( 100%, 800px )' }}>
163+
<div className="flex left column dc__gap-12" style={{ width: 'min( 100%, 800px )' }}>
164164
<CIListItem
165165
type="deployed-artifact"
166166
userApprovalMetadata={userApprovalMetadata}

‎src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,15 +378,15 @@ const StartDetails = ({
378378
href={createGitCommitUrl(ciMaterial.url, gitDetail.Commit)}
379379
className="dc__app-commit__hash mr-12 bcn-1 cn-7"
380380
>
381-
{gitDetail.Commit?.substr(0, 8)}
381+
{gitDetail.Commit?.substr(0, 7)}
382382
</a>
383383
)}
384384
{ciMaterial.type === 'WEBHOOK' &&
385385
gitDetail.WebhookData &&
386386
gitDetail.WebhookData.Data && (
387387
<span className="dc__app-commit__hash">
388388
{gitDetail.WebhookData.EventActionType === 'merged'
389-
? gitDetail.WebhookData.Data['target checkout']?.substr(0, 8)
389+
? gitDetail.WebhookData.Data['target checkout']?.substr(0, 7)
390390
: gitDetail.WebhookData.Data['target checkout']}
391391
</span>
392392
)}

‎src/Shared/Components/GitCommitInfoGeneric/GitCommitInfoGeneric.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ const GitCommitInfoGeneric = ({
193193
>
194194
<span
195195
data-testid="excluded-git-commit"
196-
className="dc_max-width__max-content flex left cr-5 cursor-not-allowed"
196+
className="dc_max-width__max-content flex left cr-5 cursor-not-allowed dc__uppercase"
197197
>
198198
<Abort className="mr-4 fcr-5" />
199199
Excluded
@@ -241,11 +241,13 @@ const GitCommitInfoGeneric = ({
241241
className="material-history__header flex dc__gap-4"
242242
data-testid={`git-commit-credential${index}`}
243243
>
244-
<Commit className="commit-hash__icon" />
244+
<Commit className="commit-hash__icon mr-0" />
245245
{_lowerCaseCommitInfo.commit.slice(0, 7)}
246246
</div>
247247
</a>
248-
<ClipboardButton content={_lowerCaseCommitInfo.commit} />
248+
<span className="git-commit-info-generic__copy" data-testid="git-commit-copy">
249+
<ClipboardButton content={_lowerCaseCommitInfo.commit} />
250+
</span>
249251
</div>
250252
) : null}
251253
{selectedCommitInfo ? renderCommitStatus() : null}
@@ -256,7 +258,7 @@ const GitCommitInfoGeneric = ({
256258
data-testid={`${_lowerCaseCommitInfo.message.trim()}-${isExcluded ? 'excluded' : 'included'}`}
257259
className="material-history__text lh-20 flex left dc__gap-8 top material-history-text--padded dc__word-break-all"
258260
>
259-
<span className="fs-13 fw-6 lh-20 cn-9"> {_lowerCaseCommitInfo.message}</span>
261+
<span className="fs-13 fw-6 lh-20 cn-9">{_lowerCaseCommitInfo.message}</span>
260262
</div>
261263
) : null}
262264
<div className="flexbox-col dc__gap-4">

‎src/Shared/Components/GitCommitInfoGeneric/GitMaterialInfoHeader.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,17 @@ const GitMaterialInfoHeader = ({
4242
return (
4343
<div
4444
{...props}
45-
className="git-commit-info-generic__header p-16 dc__box-shadow fs-12 fw-6 dc__gap-12"
45+
className="git-commit-info-generic__header px-16 py-12 dc__box-shadow fs-12 fw-6 dc__gap-12"
4646
style={style}
4747
>
4848
<div className={getGitIcon(repoUrl)} />
49-
<div className="flex column left">
50-
<div className="repo fs-12 cn-9 fw-6" data-testid={`deployment-history-source-code-repo${index}`}>
51-
/{repo}
49+
<div className="flex left left dc__gap-4 fs-13">
50+
{/* {getGitMaterialIcon(repoUrl)} */}
51+
<div className="repo cn-9 fw-6" data-testid={`deployment-history-source-code-repo${index}`}>
52+
{repo}
5253
</div>
53-
<div className="branch flex left fs-14 cn-7">
54+
<div className="branch flex left cn-7 dc__gap-4">
55+
<span>/</span>
5456
<CiPipelineSourceConfig sourceType={materialType} sourceValue={materialValue} showTooltip />
5557
</div>
5658
</div>

‎src/Shared/Components/MaterialHistory/MaterialHistory.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const MaterialHistory = ({ material, pipelineName, ciPipelineId, selectCommit }:
4040
<div
4141
data-testid={`material-history-${index}`}
4242
key={_commitId}
43-
className={`material-history w-auto ${history.isSelected ? 'material-history-selected' : ''}`}
43+
className={`material-history w-auto cursor ${history.isSelected ? 'material-history-selected' : ''}`}
4444
onClick={(e) => onClickMaterialHistory(e, _commitId, history.excluded)}
4545
>
4646
<GitCommitInfoGeneric

0 commit comments

Comments
 (0)