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

[Maps] fix attribution overflow with exit full screen button #62699

Merged
merged 5 commits into from
Apr 8, 2020
Merged

[Maps] fix attribution overflow with exit full screen button #62699

merged 5 commits into from
Apr 8, 2020

Conversation

nreese
Copy link
Contributor

@nreese nreese commented Apr 6, 2020

fixes #41702

Screen Shot 2020-04-06 at 2 09 59 PM

Screen Shot 2020-04-06 at 2 10 06 PM

@nreese nreese added release_note:fix [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 v7.8.0 labels Apr 6, 2020
@nreese nreese requested review from a team as code owners April 6, 2020 20:12
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis (Team:Geo)

@nreese
Copy link
Contributor Author

nreese commented Apr 7, 2020

@elasticmachine merge upstream

thomasneirynck
thomasneirynck approved these changes Apr 8, 2020
View reviewed changes
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

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

Tested and works. Suggestion on how to rewrite rule slightly (although I'm not a CSS expert, @miukimiu (?))

...aps/public/connected_components/widget_overlay/attribution_control/_attribution_control.scss Outdated
@@ -4,3 +4,7 @@
pointer-events: all;
padding-left: $euiSizeM;
}

.mapAttributionControl__fullScreen {
padding-left: $euiSizeXXL * 4 !important;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not an expert on this.

Wouldn't margin-left work here? The attribution box won't stretch over the exit-full-screen-button then, as opposed to padding, where it does stretch over.

It would also remove the need for the !important override, which if I understand it is somewhat of a code-smell in CSS.

.mapAttributionControl__fullScreen {
  margin-left: $euiSizeXXL * 4;
}

@nreese
Copy link
Contributor Author

nreese commented Apr 8, 2020

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@nreese nreese merged commit 3598b8c into elastic:master Apr 8, 2020
nreese added a commit to nreese/kibana that referenced this pull request Apr 8, 2020
@nreese @elasticmachine
[Maps] fix attribution overflow with exit full screen button (elastic…
bbaf56c 
…#62699)

* [Maps] fix attribution overflow with exit full screen button

* use margin-left instead of padding-left

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@nreese nreese mentioned this pull request Apr 8, 2020
Merged
nreese added a commit that referenced this pull request Apr 8, 2020
@nreese @elasticmachine
[Maps] fix attribution overflow with exit full screen button (#62699) (…
0a7c421 
…#62988)

* [Maps] fix attribution overflow with exit full screen button

* use margin-left instead of padding-left

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
jloleysens added a commit to jloleysens/kibana that referenced this pull request Apr 9, 2020
@jloleysens
Merge branch 'master' of github.com:elastic/kibana into es_ui_shared/…
43763b0 
…chore/put-all-xjson-together

* 'master' of github.com:elastic/kibana: (35 commits)
  [SIEM] [Detection Engine] Fixes bug when notification doesn't… (elastic#63013)
  [SIEM][Detection Engine] Fix rule notification critical bugs
  Add Error Exception Type Column (elastic#59596)
  [APM] Agent remote configuration: changes in Java property descriptions (elastic#62282)
  [Alerting] Displays warning when a permanent encryption key is missing and hides alerting UI appropriately (elastic#62772)
  FTR: add chromium-based Edge browser support (elastic#61684)
  [Ingest] Data source configuration validation UI (elastic#61180)
  restore empty_kibana after saved objects test (elastic#62951)
  Index pattern management plugin - src/legacy/core_plugins/management => new platform plugin (elastic#62594)
  Add basic StatusService (elastic#60335)
  [kbn/optimizer] link to kibanaReact/kibanaUtils plugins (elastic#62720)
  [APM] Service map - fixes layout issues for maps with no rum services (elastic#62887)
  Exclude disabled datasources and streams from agent config (elastic#62869)
  [Alerting] Fix validation support for nested IErrorObjects (elastic#62833)
  [Metrics UI] Invalidate non-count alerts which have no metrics (elastic#62837)
  Add --filter option to API docs script (elastic#62888)
  [Maps] fix attribution overflow with exit full screen button (elastic#62699)
  [Uptime]Alerting UI text in case filter is selected (elastic#62570)
  [Maps] Show create filter button for top-term tooltip property (elastic#62461)
  skip flaky suite (elastic#59030)
  ...

# Conflicts:
#	src/plugins/es_ui_shared/public/index.ts
gmmorris added a commit to gmmorris/kibana that referenced this pull request Apr 9, 2020
@gmmorris
Merge branch 'master' into alerting/es-query
e9106a8 
* master: (40 commits)
  [ML] Functional transform tests - stabilize source selection (elastic#63087)
  add embed flag to saved object url as well (elastic#62926)
  [SIEM] [Detection Engine] Fixes bug when notification doesn't… (elastic#63013)
  [SIEM][Detection Engine] Fix rule notification critical bugs
  Add Error Exception Type Column (elastic#59596)
  [APM] Agent remote configuration: changes in Java property descriptions (elastic#62282)
  [Alerting] Displays warning when a permanent encryption key is missing and hides alerting UI appropriately (elastic#62772)
  FTR: add chromium-based Edge browser support (elastic#61684)
  [Ingest] Data source configuration validation UI (elastic#61180)
  restore empty_kibana after saved objects test (elastic#62951)
  Index pattern management plugin - src/legacy/core_plugins/management => new platform plugin (elastic#62594)
  Add basic StatusService (elastic#60335)
  [kbn/optimizer] link to kibanaReact/kibanaUtils plugins (elastic#62720)
  [APM] Service map - fixes layout issues for maps with no rum services (elastic#62887)
  Exclude disabled datasources and streams from agent config (elastic#62869)
  [Alerting] Fix validation support for nested IErrorObjects (elastic#62833)
  [Metrics UI] Invalidate non-count alerts which have no metrics (elastic#62837)
  Add --filter option to API docs script (elastic#62888)
  [Maps] fix attribution overflow with exit full screen button (elastic#62699)
  [Uptime]Alerting UI text in case filter is selected (elastic#62570)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thomasneirynck thomasneirynck thomasneirynck approved these changes

Assignees
No one assigned
Labels
[Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation release_note:fix v7.8.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Maps] Exit full screen button overlapped by attributions
4 participants
@nreese @elasticmachine @kibanamachine @thomasneirynck