diff options
author | Milutin Kristofic <milutin@google.com> | 2021-10-21 14:00:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-21 14:00:56 +0000 |
commit | 242b1330bea7f70faf55dd0673760261c8935613 (patch) | |
tree | 3db01c8e930a4b684a633e732d756c9fe370bd60 | |
parent | e86d57d77db943bef940262be2db33755c589444 (diff) | |
parent | 225270a06ed19ed8c622d4dbf60cb1eba1f828d0 (diff) |
Merge "Submit Requirements - overridden icon"
3 files changed, 5 insertions, 2 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-submit-requirements/gr-submit-requirements.ts b/polygerrit-ui/app/elements/change/gr-submit-requirements/gr-submit-requirements.ts index 35192ad5c1..c493be48c0 100644 --- a/polygerrit-ui/app/elements/change/gr-submit-requirements/gr-submit-requirements.ts +++ b/polygerrit-ui/app/elements/change/gr-submit-requirements/gr-submit-requirements.ts @@ -78,7 +78,8 @@ export class GrSubmitRequirements extends LitElement { width: var(--line-height-normal, 20px); height: var(--line-height-normal, 20px); } - iron-icon.check { + iron-icon.check, + iron-icon.overridden { color: var(--success-foreground); } iron-icon.close { diff --git a/polygerrit-ui/app/elements/shared/gr-icons/gr-icons.ts b/polygerrit-ui/app/elements/shared/gr-icons/gr-icons.ts index da1a782b17..1a6239fc43 100644 --- a/polygerrit-ui/app/elements/shared/gr-icons/gr-icons.ts +++ b/polygerrit-ui/app/elements/shared/gr-icons/gr-icons.ts @@ -160,6 +160,8 @@ $_documentContainer.innerHTML = `<iron-iconset-svg name="gr-icons" size="24"> <g id="feedback"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 12h-2v-2h2v2zm0-4h-2V6h2v4z"/></g> <!-- This SVG is a copy from material.io https://fonts.google.com/icons?selected=Material+Icons&icon.query=description --> <g id="description"><path xmlns="http://www.w3.org/2000/svg" d="M0 0h24v24H0V0z" fill="none"/><path xmlns="http://www.w3.org/2000/svg" d="M8 16h8v2H8zm0-4h8v2H8zm6-10H6c-1.1 0-2 .9-2 2v16c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm4 18H6V4h7v5h5v11z"/></g> + <!-- This SVG is a copy from material.io https://fonts.google.com/icons?selected=Material+Icons&icon.query=settings_backup_restore and 0.65 scale and 4 translate https://fonts.google.com/icons?selected=Material+Icons&icon.query=done--> + <g id="overridden"><path xmlns="http://www.w3.org/2000/svg" d="M0 0h24v24H0V0z" fill="none"/><path xmlns="http://www.w3.org/2000/svg" d="M12 15 zM2 4v6h6V8H5.09C6.47 5.61 9.04 4 12 4c4.42 0 8 3.58 8 8s-3.58 8-8 8-8-3.58-8-8H2c0 5.52 4.48 10 10.01 10C17.53 22 22 17.52 22 12S17.53 2 12.01 2C8.73 2 5.83 3.58 4 6.01V4H2z"/><path xmlns="http://www.w3.org/2000/svg" d="M9.85 14.53 7.12 11.8l-.91.91L9.85 16.35 17.65 8.55l-.91-.91L9.85 14.53z"/></g> </defs> </svg> </iron-iconset-svg>`; diff --git a/polygerrit-ui/app/utils/label-util.ts b/polygerrit-ui/app/utils/label-util.ts index f50fd16b3b..c50bbe2604 100644 --- a/polygerrit-ui/app/utils/label-util.ts +++ b/polygerrit-ui/app/utils/label-util.ts @@ -227,7 +227,7 @@ export function iconForStatus(status: SubmitRequirementStatus) { case SubmitRequirementStatus.UNSATISFIED: return 'close'; case SubmitRequirementStatus.OVERRIDDEN: - return 'warning'; + return 'overridden'; case SubmitRequirementStatus.NOT_APPLICABLE: return 'info'; default: |