Skip to content

Commit 72bbeda

Browse files
Merge pull request #675 from devtron-labs/fix/release-css-main
fix: css for release
2 parents 745b918 + 1119ff7 commit 72bbeda

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.10.0-patch-3",
3+
"version": "1.10.0-patch-4",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/ImageTags.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export const ImageTagsContainer = ({
297297

298298
if (newDescription === '' && displayedTags.length === 0 && !isEditing) {
299299
return tagsEditable ? (
300-
<div className="bg__primary mt-8 add-image-button">
300+
<div className="bg__primary mt-8 flexbox">
301301
<AddImageButton handleEditClick={handleEditClick} />
302302
</div>
303303
) : (
@@ -568,11 +568,13 @@ const AddImageButton = ({ handleEditClick }) => {
568568
}
569569

570570
return (
571-
<div className="add-tag-button flex pt-12 pr-12" data-testid="add-tags-button" onClick={handleClick}>
572-
<div className="lh-16 flex">
573-
<Add className="icon-dim-16 cn-6" />
574-
<span className="cn-7">Add labels/comment</span>
575-
</div>
576-
</div>
571+
<button
572+
className="dc__transparent px-8 py-4 flexbox dc__align-items-center dc__gap-4 dc__border-dashed--n3 br-4"
573+
data-testid="add-tags-button"
574+
onClick={handleClick}
575+
>
576+
<Add className="icon-dim-16 cn-6 dc__no-shrink" />
577+
<span className="cn-7 lh-16">Add labels/comment</span>
578+
</button>
577579
)
578580
}

src/Shared/Components/CICDHistory/Artifacts.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export const CIListItem = ({
9898
}`}
9999
data-testid="hover-on-report-artifact"
100100
>
101-
<div className="ci-artifacts-grid flex left">
101+
<div className="flex left dc__gap-12">
102102
<div className="bcn-1 flex br-4 icon-dim-40">
103103
<img src={type === 'report' ? folder : docker} className="icon-dim-20" alt="type" />
104104
</div>

src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ReactComponent as Arrow } from '../../../Assets/Icon/ic-arrow-forward.s
2929
import mechanicalOperation from '../../../Assets/Icon/ic-mechanical-operation.svg'
3030
import CDEmptyState from './CDEmptyState'
3131
import DeploymentStatusDetailBreakdown from './DeploymentStatusBreakdown'
32-
import { getIsApprovalPolicyConfigured, processDeploymentStatusDetailsData } from '../../Helpers'
32+
import { getHandleOpenURL, getIsApprovalPolicyConfigured, processDeploymentStatusDetailsData } from '../../Helpers'
3333

3434
let deploymentStatusTimer = null
3535
const DeploymentDetailSteps = ({
@@ -119,16 +119,15 @@ const DeploymentDetailSteps = ({
119119

120120
const redirectToDeploymentStatus = () => {
121121
if (isHelmApps) {
122-
history.push({
123-
pathname: `${URLS.APP}/${URLS.DEVTRON_CHARTS}/${URLS.APP_DEPLOYMNENT_HISTORY}/${appId}/env/${envId}/${URLS.DETAILS}/${URLS.APP_DETAILS_K8}`,
124-
search: DEPLOYMENT_STATUS_QUERY_PARAM,
125-
})
122+
getHandleOpenURL(
123+
`${window.__BASE_URL__}${URLS.APP}/${URLS.DEVTRON_CHARTS}/${URLS.APP_DEPLOYMNENT_HISTORY}/${appId}/env/${envId}/${URLS.DETAILS}/${URLS.APP_DETAILS_K8}?${DEPLOYMENT_STATUS_QUERY_PARAM}`,
124+
)()
126125
return
127126
}
128-
history.push({
129-
pathname: `${URLS.APP}/${appId}/${URLS.APP_DETAILS}/${envId}/${URLS.APP_DETAILS_K8}`,
130-
search: DEPLOYMENT_STATUS_QUERY_PARAM,
131-
})
127+
128+
getHandleOpenURL(
129+
`${window.__BASE_URL__}${URLS.APP}/${appId}/${URLS.APP_DETAILS}/${envId}/${URLS.APP_DETAILS_K8}?${DEPLOYMENT_STATUS_QUERY_PARAM}`,
130+
)()
132131
}
133132

134133
const getDeploymentStatusDetails = () =>

src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
9292
const CDBuildReportUrl = `app/cd-pipeline/workflow/download/${appId}/${envId}/${pipelineId}/${triggerId}`
9393

9494
return (
95-
<div className="trigger-outputs-container flexbox-col flex-grow-1 h-100">
95+
<div className="trigger-outputs-container bg__tertiary flexbox-col flex-grow-1 h-100">
9696
{loading ? (
9797
<Progressing pageLoader />
9898
) : (

0 commit comments

Comments
 (0)