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

fix(ui5-busyindicator): Set bigger opacity for IE #2010

Merged
merged 2 commits into from
Jul 28, 2020
Merged

fix(ui5-busyindicator): Set bigger opacity for IE #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afba932
fix(ui5-busyindicator): Set bigger opacity for IE
ilhan007 Jul 27, 2020
ac4f232
eslint
ilhan007 Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/main/src/BusyIndicator.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ui5-busyindicator-root">
<div class="{{classes.root}}">
<div class="ui5-busyindicator-wrapper">
{{#if active}}
<div class="ui5-busyindicator-dynamic-content" role="progressbar" aria-valuemin="0" aria-valuemax="100" title="{{ariaTitle}}">
Expand Down
10 changes: 10 additions & 0 deletions packages/main/src/BusyIndicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
import { isIE } from "@ui5/webcomponents-base/dist/Device.js";
import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import BusyIndicatorSize from "./types/BusyIndicatorSize.js";
import Label from "./Label.js";
Expand Down Expand Up @@ -159,6 +160,15 @@ class BusyIndicator extends UI5Element {
return this.i18nBundle.getText(BUSY_INDICATOR_TITLE);
}

get classes() {
return {
root: {
"ui5-busyindicator-root": true,
"ui5-busyindicator-root--ie": isIE(),
},
};
}

_preventEvent(event) {
if (this.active) {
event.stopImmediatePropagation();
Expand Down
12 changes: 8 additions & 4 deletions packages/main/src/themes/BusyIndicator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@
pointer-events: none;
}


:host([active]) :not(.ui5-busyindicator-root--ie) ::slotted(:not([class^="ui5-busyindicator-"])) {
opacity: 0.6;
}

/**
* IE fix: using just the "*" all selector in IE,
* will set the opacity=0.6 to busy indicator internal elements
* IE fix: 0.6 makes the content almost invisible, so we set it to 0.95 in IE
*/
:host([active]) ::slotted(:not([class^="ui5-busyindicator-"])) {
opacity: 0.6;
:host([active]) .ui5-busyindicator-root--ie ::slotted(:not([class^="ui5-busyindicator-"])) {
opacity: 0.95;
}

:host([size="Small"]) .ui5-busyindicator-root {
Expand Down