Skip to content

Commit 12433ae

Browse files
authored
Merge pull request #1358 from processing/center-loader
Fixes #1284 - Center loader in sketch list, collection list, and asset list
2 parents eeb7e34 + 68d4bdd commit 12433ae

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import React from 'react';
22

33
const Loader = () => (
4-
<div className="loader">
5-
<div className="loader__circle1" />
6-
<div className="loader__circle2" />
4+
<div className="loader-container">
5+
<div className="loader">
6+
<div className="loader__circle1" />
7+
<div className="loader__circle2" />
8+
</div>
79
</div>
810
);
911
export default Loader;

client/styles/components/_asset-list.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.asset-table-container {
22
overflow-y: auto;
33
max-width: 100%;
4-
min-height: #{400 / $base-font-size}rem;
4+
min-height: 100%;
55
}
66

77
.asset-table {

client/styles/components/_loader.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
.loader-container {
2+
width: 100%;
3+
height: 100%;
4+
display: flex;
5+
justify-content: center;
6+
align-items: center;
7+
}
8+
9+
110
.loader {
211
width: #{80 / $base-font-size }rem;
312
height: #{80 / $base-font-size}rem;
413

514
position: relative;
6-
margin: #{100 / $base-font-size}rem auto;
715
}
816

917
.loader__circle1,

client/styles/components/_sketch-list.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.sketches-table-container {
22
overflow-y: auto;
33
max-width: 100%;
4-
min-height: #{400 / $base-font-size}rem;
4+
min-height: 100%;
55
}
66

77
.sketches-table {

0 commit comments

Comments
 (0)