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.

Sign up for GitHub

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

Jump to bottom

Fix bug where overview alerts can abut one another #2363

Merged
merged 1 commit into from
Aug 16, 2019
Merged

Fix bug where overview alerts can abut one another #2363

merged 1 commit into from
Aug 16, 2019

Conversation

rhamilto
Copy link
Member

@rhamilto rhamilto commented Aug 15, 2019 •
edited
Loading

Before:
Screen Shot 2019-08-15 at 8 54 32 AM
Screen Shot 2019-08-15 at 8 54 45 AM

After:
Screen Shot 2019-08-15 at 4 30 41 PM

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. component/core Related to console core functionality labels Aug 15, 2019
spadgett
spadgett approved these changes Aug 15, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 15, 2019
jhadvig
jhadvig reviewed Aug 15, 2019
View reviewed changes
frontend/public/components/overview/_project-overview.scss Outdated
@@ -24,6 +24,9 @@
@media (min-width: $screen-md-min) {
grid-area: alert;
}
.co-icon-and-text {
Copy link
Member

Choose a reason for hiding this comment

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

There is also .co-icon-and-text style in the _icon-and-text.scss file. Shouldnt we put it there ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Since this is a contextual override, I prefer keeping it with the context. That way, if the context goes away, the override goes with it.

@rhamilto
Copy link
Member Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 15, 2019
@rhamilto
Copy link
Member Author

This fix causes an issue in Builds alerts when more than one type of build is present. Will rethink the fix.

Screen Shot 2019-08-15 at 3 46 00 PM

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 15, 2019
@rhamilto rhamilto force-pushed the overview-alert-fix branch 2 times, most recently from 27e22ab to af024e4 Compare August 15, 2019 20:35
@rhamilto
Copy link
Member Author

/hold cancel

Take 2. @spadgett, PTAL.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 15, 2019
spadgett
spadgett reviewed Aug 15, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

change looks good, but the indentation in the scss file is off

frontend/public/components/overview/_project-overview.scss
margin-right: 12px;

.project-overview__builds & {
margin-right: 4px;
Copy link
Member

Choose a reason for hiding this comment

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

indentation :)

Copy link
Member Author

@rhamilto rhamilto Aug 16, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks. Fixed. That's what happens when I put up a PR while trying to simultaneously rush out the door.

@spadgett spadgett added this to the v4.2 milestone Aug 15, 2019
@spadgett
Copy link
Member

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Aug 15, 2019
spadgett
spadgett approved these changes Aug 16, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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-bot
Copy link
Contributor

/retest

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

@rhamilto
Copy link
Member Author

/retest

@rhamilto rhamilto mentioned this pull request Aug 16, 2019
Merged
@openshift-merge-robot openshift-merge-robot merged commit 0e21369 into openshift:master Aug 16, 2019
@rhamilto rhamilto deleted the overview-alert-fix branch August 16, 2019 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhadvig jhadvig jhadvig left review comments

@spadgett spadgett spadgett approved these changes

@TheRealJon TheRealJon Awaiting requested review from TheRealJon

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/core Related to console core functionality kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v4.2
Development

Successfully merging this pull request may close these issues.
6 participants
@rhamilto @spadgett @openshift-ci-robot @openshift-bot @jhadvig @openshift-merge-robot