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): prevent dots blur on Safari #1344

Merged
merged 1 commit into from
Mar 24, 2020
Merged

fix(ui5-busyindicator): prevent dots blur on Safari #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const metadata = {
* @defaultvalue "Large"
* @public
*/
size: { type: BusyIndicatorSize, defaultValue: BusyIndicatorSize.Large },
size: { type: BusyIndicatorSize, defaultValue: BusyIndicatorSize.Medium },

/**
* Defines if the busy indicator is visible on the screen. By default it is not.
Expand Down
45 changes: 22 additions & 23 deletions packages/main/src/themes/BusyIndicator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,35 @@
}

:host([size="Small"]) .ui5-busyindicator-root {
min-width: 3rem;
min-height: 1rem;
min-width: 1.5em;
min-height: .5rem;
}

:host([size="Small"]) .ui5-busyindicator-circle {
width: 0.125rem;
height: 0.125rem;
margin: 0 0.2rem;
width: .5rem;
height: .5rem;
}

:host(:not([size])) .ui5-busyindicator-root,
:host([size="Medium"]) .ui5-busyindicator-root {
min-width: 5rem;
min-height: 2rem;
min-width: 3rem;
min-height: 1rem;
}

:host(:not([size])) .ui5-busyindicator-circle,
:host([size="Medium"]) .ui5-busyindicator-circle {
width: 0.5rem;
height: 0.5rem;
margin: 0 0.4rem;
width: 1rem;
height: 1rem;
}

:host([size="Large"]) .ui5-busyindicator-root {
min-width: 8rem;
min-height: 3rem;
min-width: 6rem;
min-height: 2rem;
}

:host([size="Large"]) .ui5-busyindicator-circle {
width: 1rem;
height: 1rem;
margin: 0 .75rem;
width: 2rem;
height: 2rem;
}

.ui5-busyindicator-root {
Expand Down Expand Up @@ -90,15 +89,15 @@

@keyframes grow {
0%, 50%, 100% {
-webkit-transform: scale(1.0);
-moz-transform: scale(1.0);
-ms-transform: scale(1.0);
transform: scale(1.0);
-webkit-transform: scale(0.5);
-moz-transform: scale(0.5);
-ms-transform: scale(0.5);
transform: scale(0.5);
}
25% {
-webkit-transform: scale(2.5);
-moz-transform: scale(2.5);
-ms-transform: scale(2.5);
transform: scale(2.5);
-webkit-transform: scale(1);
-moz-transform: scale(1);
-ms-transform: scale(1);
transform: scale(1);
}
}
62 changes: 48 additions & 14 deletions packages/main/test/pages/BusyIndicator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
<body style="background-color: var(--sapBackgroundColor);">
<ui5-busyindicator size="Medium" active id="indicator1"></ui5-busyindicator>

<br/>
<br/>
<br />
<br />
<ui5-busyindicator size="Medium" active id="indicator2"></ui5-busyindicator>

<br/>
<br/>
<br />
<br />

<ui5-busyindicator size="Medium" active>
<ui5-button>Hello World</ui5-button>
</ui5-busyindicator>

<br/>
<br/>
<br />
<br />
<ui5-busyindicator size="Medium" active>
<ui5-checkbox text="Hello World"></ui5-checkbox>
</ui5-busyindicator>

<br/>
<br/>
<br />
<br />

<ui5-button id="fetch-btn" style="width: 120px;">Fetch List Data</ui5-button>
<br>
Expand All @@ -59,12 +59,46 @@
<br>

<ui5-busyindicator size="Medium" active style="width: 500px; margin-left: 100px">
<ui5-list style="width: 100%; border: 1px solid black;">
<ui5-li>Item 1</ui5-li>
<ui5-li>Item 2</ui5-li>
<ui5-li>Item 3</ui5-li>
</ui5-list>
</ui5-busyindicator>
<ui5-list style="width: 100%; border: 1px solid black;">
<ui5-li>Item 1</ui5-li>
<ui5-li>Item 2</ui5-li>
<ui5-li>Item 3</ui5-li>
</ui5-list>
</ui5-busyindicator>

<br>
<br>
<br>

<span>Medium (default) </span>
<br>
<br>

<ui5-busyindicator active></ui5-busyindicator>
<br>
<br>
<span>Small </span>

<br>
<br>
<ui5-busyindicator size="Small" active></ui5-busyindicator>
<br>
<br>
<span>Medium </span>

<br>
<br>
<ui5-busyindicator size="Medium" active></ui5-busyindicator>
<br>
<br>
<span>Large </span>

<br>
<br>
<ui5-busyindicator size="Large" active></ui5-busyindicator>
<br>
<br>


<script>
const busyIndocator = document.getElementById("busy-container");
Expand Down