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: update vanilla loading spinner markup and replace expanded containers with margin #7968

Merged
merged 5 commits into from
Mar 16, 2021
Merged

fix: update vanilla loading spinner markup and replace expanded containers with margin #7968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6412a8f
chore: format
emyarod Mar 3, 2021
b3dcac2
fix(loading): match markup with React implementation
emyarod Mar 3, 2021
eba9084
fix(inline-loading): match markup with React implementation
emyarod Mar 3, 2021
2cf8fbb
fix(inline-loading): replace expanded container with margin
emyarod Mar 3, 2021
5d2b127
Merge branch 'main' into 7946-loading-spinner-spacing
kodiakhq[bot] Mar 16, 2021
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
3 changes: 1 addition & 2 deletions packages/components/src/components/inline-loading/_inline-loading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
display: flex;
align-items: center;
justify-content: center;
width: 2rem;
height: 2rem;
margin-right: $carbon--spacing-03;
}

.#{$prefix}--inline-loading__checkmark-container {
Expand Down
14 changes: 8 additions & 6 deletions packages/components/src/components/inline-loading/inline-loading.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
<div data-inline-loading class="{{@root.prefix}}--inline-loading" role="alert" aria-live="assertive">
<div class="{{@root.prefix}}--inline-loading__animation">
<div data-inline-loading-spinner class="{{@root.prefix}}--loading {{@root.prefix}}--loading--small">
<svg class="{{@root.prefix}}--loading__svg" viewBox="-75 -75 150 150">
<circle class="{{@root.prefix}}--loading__background" cx="0" cy="0" r="26.8125" />
<circle class="{{@root.prefix}}--loading__stroke" cx="0" cy="0" r="26.8125"/>
<svg class="{{@root.prefix}}--loading__svg" viewBox="0 0 100 100">
<circle class="{{@root.prefix}}--loading__background" cx="50%" cy="50%" r="42" />
<circle class="{{@root.prefix}}--loading__stroke" cx="50%" cy="50%" r="42" />
</svg>
</div>
{{ carbon-icon "CheckmarkFilled16" data-inline-loading-finished='' hidden='' class=(add @root.prefix '--inline-loading__checkmark-container') }}
{{ carbon-icon "Error20" data-inline-loading-error='' hidden='' class=(add @root.prefix '--inline-loading--error') }}
{{ carbon-icon "CheckmarkFilled16" data-inline-loading-finished='' hidden='' class=(add @root.prefix
'--inline-loading__checkmark-container') }}
{{ carbon-icon "Error20" data-inline-loading-error='' hidden='' class=(add @root.prefix '--inline-loading--error')
}}
</div>
<p data-inline-loading-text-active class="{{@root.prefix}}--inline-loading__text">Loading data...</p>
<p data-inline-loading-text-finished hidden class="{{@root.prefix}}--inline-loading__text">Data loaded.</p>
Expand All @@ -24,4 +26,4 @@
{{#if showToggleButton}}
<button data-inline-loading-demo-button class="{{@root.prefix}}--btn {{@root.prefix}}--btn--primary">Toggle
state</button>
{{/if}}
{{/if}}
27 changes: 14 additions & 13 deletions packages/components/src/components/loading/loading.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<!--
<!--
Copyright IBM Corp. 2016, 2018

This source code is licensed under the Apache-2.0 license found in the
LICENSE file in the root directory of this source tree.
-->

{{#if overlay}}<div class="{{@root.prefix}}--loading-overlay">{{/if}}
<div data-loading class="{{@root.prefix}}--loading{{#if small}} {{@root.prefix}}--loading--small{{/if}}">
<svg class="{{@root.prefix}}--loading__svg" viewBox="-75 -75 150 150">
<title>Loading</title>
{{#if small}}
<circle class="{{@root.prefix}}--loading__background" cx="0" cy="0" r="26.8125" />
<circle class="{{@root.prefix}}--loading__stroke" cx="0" cy="0" r="26.8125" />
{{else}}
<circle class="{{@root.prefix}}--loading__stroke" cx="0" cy="0" r="37.5" />
{{/if}}
</svg>
</div>
{{#if overlay}}</div>{{/if}}
<div data-loading class="{{@root.prefix}}--loading{{#if small}} {{@root.prefix}}--loading--small{{/if}}">
<svg class="{{@root.prefix}}--loading__svg" viewBox="0 0 100 100">
<title>Loading</title>
{{#if small}}
<circle class="{{@root.prefix}}--loading__background" cx="50%" cy="50%" r="42" />
<circle class="{{@root.prefix}}--loading__stroke" cx="50%" cy="50%" r="42" />
{{else}}
<circle class="{{@root.prefix}}--loading__stroke" cx="50%" cy="50%" r="44" />
{{/if}}
</svg>
</div>
{{#if overlay}}
</div>{{/if}}