Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 2071691: Update and scope our breadcrumb padding rule so it doesn't effect a pure implementation #11321

Merged

Conversation

sg00dwin
Copy link
Member

Move override rule to .co-breadcrumb
Wrap breadcrumbs and badge row with pf-c-page__main-breadcrumb which sets top and side margins
and remove pf-c-breadcrumb--no-padding-top that is no longer needed since PF <BreadCrumb> has no padding.

After
Screen Shot 2022-04-12 at 1 45 36 PM
Screen Shot 2022-04-12 at 1 45 18 PM

@openshift-ci openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 12, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 12, 2022

@sg00dwin: This pull request references Bugzilla bug 2071691, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @yapei

In response to this:

Bug 2071691: Update and scope our breadcrumb padding rule so it doesn't effect a pure implementation

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the component/core Related to console core functionality label Apr 12, 2022
Copy link
Member

@rhamilto rhamilto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sweet. Nice work! One comment about moving a rule.

frontend/public/style/_overrides.scss Outdated Show resolved Hide resolved
@spadgett
Copy link
Member

@jamestalton fyi

@rhamilto
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 13, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, sg00dwin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2022
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 5f4761a into openshift:master Apr 14, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2022

@sg00dwin: All pull requests linked via external trackers have merged:

Bugzilla bug 2071691 has been moved to the MODIFIED state.

In response to this:

Bug 2071691: Update and scope our breadcrumb padding rule so it doesn't effect a pure implementation

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2022

@sg00dwin: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@spadgett
Copy link
Member

/cherry-pick release-4.10

@openshift-cherrypick-robot

@spadgett: #11321 failed to apply on top of branch "release-4.10":

Applying: Update and scope our breadcrumb padding rule so it doesn't effect a pure implementation
Using index info to reconstruct a base tree...
M	frontend/public/components/sidebars/explore-type-sidebar.tsx
M	frontend/public/components/utils/headings.tsx
M	frontend/public/style/_common.scss
M	frontend/public/style/_overrides.scss
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/style/_overrides.scss
Auto-merging frontend/public/style/_common.scss
Auto-merging frontend/public/components/utils/headings.tsx
CONFLICT (content): Merge conflict in frontend/public/components/utils/headings.tsx
Auto-merging frontend/public/components/sidebars/explore-type-sidebar.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update and scope our breadcrumb padding rule so it doesn't effect a pure implementation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett
Copy link
Member

@sg00dwin Do you mind backporting this to 4.10.z? It affects the ACM plugin, which is targeting 4.10.

@sg00dwin
Copy link
Member Author

@sg00dwin Do you mind backporting this to 4.10.z? It affects the ACM plugin, which is targeting 4.10.

Opened #11365 to backport this to 4.10.
Waiting on https://bugzilla.redhat.com/show_bug.cgi?id=2071691 to be verified by QE
cc @yanpzhan

@yanpzhan
Copy link
Contributor

@sg00dwin the verification for bug https://bugzilla.redhat.com/show_bug.cgi?id=2071691 is blocked by https://bugzilla.redhat.com/show_bug.cgi?id=2071690 , do you have any suggestion?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants