Skip to content

Commit deef131

Browse files
committed
Fixed spinner alignment
#1531
1 parent f25873a commit deef131

9 files changed

Lines changed: 21 additions & 14 deletions

File tree

packages/code-studio/src/styleguide/Tooltips.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function Tooltips(): React.ReactElement {
4646
<hr />
4747
<div>And some icons down here</div>
4848
<div>
49-
<LoadingSpinner />
49+
<LoadingSpinner className="mimic-fa-layers-vertical-align" />
5050
{iconElements}
5151
</div>
5252
</Tooltip>

packages/components/scss/BaseStyleSheet.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,15 @@ span.btn-disabled-wrapper {
180180
}
181181
}
182182

183+
.btn-spinner .loading-spinner,
184+
.mimic-fa-layers-vertical-align {
185+
// The original LoadingSpinner used `.fa-layers` to create the spinner icon.
186+
// This includes a vertical aligment adjustment to center the spinner along
187+
// side of other inline content. Copying this value from the `.fa-layers`
188+
// class to avoid breaking alignment of the new spinner.
189+
vertical-align: -0.125em;
190+
}
191+
183192
.btn-link.no-underline,
184193
.btn-link.no-underline:hover {
185194
text-decoration: none;

packages/components/src/LoadingSpinner.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,11 @@
1616
margin: 0 auto;
1717
width: var(--size);
1818
height: var(--size);
19-
20-
// The original LoadingSpinner used `.fa-layers` to create the spinner icon.
21-
// This vertical-align value was copied from the `.fa-layers` class to avoid
22-
// breaking alignment in existing usages such as `ContextActions` and
23-
// `.btn-spinner`
24-
vertical-align: -0.125em;
2519
}
2620

2721
.loading-spinner-large {
2822
--border-width: 4px;
2923
--size: 56px;
30-
31-
vertical-align: 0;
3224
}
3325

3426
// Spinning circle with colored border and transparent center. Half of the

packages/components/src/context-actions/ContextMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ class ContextMenu extends PureComponent<ContextMenuProps, ContextMenuState> {
594594
if (pendingItems.length > 0) {
595595
pendingElement = (
596596
<div className="loading">
597-
<LoadingSpinner />
597+
<LoadingSpinner className="mimic-fa-layers-vertical-align" />
598598
</div>
599599
);
600600
}

packages/console/src/command-history/CommandHistoryItemTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export class CommandHistoryItemTooltip extends Component<
195195
{hasTimeString ? (
196196
<span className="time-string">{timeString}</span>
197197
) : (
198-
<LoadingSpinner />
198+
<LoadingSpinner className="mimic-fa-layers-vertical-align" />
199199
)}
200200
</div>
201201
</div>

packages/iris-grid/src/ColumnStatistics.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@
7777
display: inline-block;
7878
color: $gray-400;
7979
}
80+
.column-statistics-loading .loading-spinner {
81+
margin-right: 5px;
82+
}

packages/iris-grid/src/ColumnStatistics.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class ColumnStatistics extends Component<
258258
)}
259259
{loading && (
260260
<div className="column-statistics-loading">
261-
<LoadingSpinner className="mr-2" />
261+
<LoadingSpinner className="mimic-fa-layers-vertical-align" />
262262
Calculating Stats...
263263
</div>
264264
)}

packages/iris-grid/src/IrisGridBottomBar.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ $ease-out-bounce-back: cubic-bezier(0.175, 0.885, 0.32, 1.275);
5252

5353
.btn {
5454
min-width: 10rem;
55-
.svg-inline--fa {
55+
.svg-inline--fa,
56+
.loading-spinner {
5657
margin-right: 0.5rem;
5758
}
5859
}

packages/iris-grid/src/IrisGridCopyHandler.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,9 @@ class IrisGridCopyHandler extends Component<
409409
onClick={this.handleCopyClick}
410410
disabled={isFetching}
411411
>
412-
{isFetching && <LoadingSpinner />}
412+
{isFetching && (
413+
<LoadingSpinner className="mimic-fa-layers-vertical-align" />
414+
)}
413415
{copyButtonText}
414416
</Button>
415417
</div>

0 commit comments

Comments
 (0)