Skip to content
This repository was archived by the owner on Sep 10, 2022. It is now read-only.

Commit 4d7db12

Browse files
author
Matt Gaunt
committed
Fixing up a few issues with changes to layout and chaning the loader to make use of auto prefixer
1 parent 945a47e commit 4d7db12

File tree

4 files changed

+45
-47
lines changed

4 files changed

+45
-47
lines changed

gulp-tasks/service-worker.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ gulp.task('service-worker', function(cb) {
3636
GLOBAL.config.dest + '/manifest.json'
3737
],
3838
dynamicUrlToDependencies: {
39-
'/app-shell': ['server/layouts/app-shell.handlebars'],
39+
'/app-shell': ['server/views/layouts/app-shell.handlebars'],
4040
'/partials/': [
41-
'server/layouts/partial.handlebars',
41+
'server/views/layouts/partial.handlebars',
4242
'server/views/index.handlebars'
4343
],
4444
'/partials/url-1': [
45-
'server/layouts/partial.handlebars',
45+
'server/views/layouts/partial.handlebars',
4646
'server/views/url-1.handlebars'
4747
],
4848
'/partials/url-2': [
49-
'server/layouts/partial.handlebars',
49+
'server/views/layouts/partial.handlebars',
5050
'server/views/url-2.handlebars'
5151
]
5252
},

server/views/layouts/app-shell.handlebars

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,11 @@
11
{{> open-page}}
2-
<main class="main js-main" aria-role="main">
2+
<main class="main js-global-main" aria-role="main">
33

44
</main>
55

66
<!-- Loading Dialog For use by Activities -->
77
<div class="loader js-global-loader is-hidden">
88
<svg viewBox="0 0 32 32" width="32" height="32">
9-
<style>
10-
#spinner {
11-
box-sizing: border-box;
12-
stroke: #673AB7;
13-
stroke-width: 3px;
14-
transform-origin: 50%;
15-
16-
-webkit-animation: line 1.6s cubic-bezier(0.4, 0.0, 0.2, 1) infinite, rotate 1.6s linear infinite;
17-
}
18-
19-
@-webkit-keyframes rotate {
20-
21-
from {
22-
transform: rotate(0)
23-
}
24-
25-
to {
26-
transform: rotate(450deg);
27-
}
28-
}
29-
30-
@-webkit-keyframes line {
31-
0% {
32-
stroke-dasharray: 2, 85.964;
33-
transform: rotate(0);
34-
}
35-
36-
50% {
37-
stroke-dasharray: 65.973, 21.9911;
38-
stroke-dashoffset: 0;
39-
}
40-
41-
100% {
42-
stroke-dasharray: 2, 85.964;
43-
stroke-dashoffset: -65.973;
44-
transform: rotate(90deg);
45-
}
46-
}
47-
</style>
489
<circle id="spinner" cx="16" cy="16" r="14" fill="none"></circle>
4910
</svg>
5011
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{> open-page}}
2-
<main class="main js-main" aria-role="main">
2+
<main class="main js-global-main" aria-role="main">
33
{{{body}}}
44
</main>
55
{{> close-page}}

src/styles/core/_loader.scss

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,43 @@
1919
left: 50%;
2020
top: 50%;
2121
position: fixed;
22-
-webkit-transform: translate(-50%, -50%);
23-
transform: translate(-50%, -50%);
22+
transform: translate(-50%, -50%);
23+
24+
#spinner {
25+
box-sizing: border-box;
26+
stroke: #673AB7;
27+
stroke-width: 3px;
28+
transform-origin: 50%;
29+
30+
animation: line 1.6s cubic-bezier(0.4, 0.0, 0.2, 1) infinite, rotate 1.6s linear infinite;
31+
}
32+
33+
@keyframes rotate {
34+
35+
from {
36+
transform: rotate(0)
37+
}
38+
39+
to {
40+
transform: rotate(450deg);
41+
}
42+
}
43+
44+
@keyframes line {
45+
0% {
46+
stroke-dasharray: 2, 85.964;
47+
transform: rotate(0);
48+
}
49+
50+
50% {
51+
stroke-dasharray: 65.973, 21.9911;
52+
stroke-dashoffset: 0;
53+
}
54+
55+
100% {
56+
stroke-dasharray: 2, 85.964;
57+
stroke-dashoffset: -65.973;
58+
transform: rotate(90deg);
59+
}
60+
}
2461
}

0 commit comments

Comments
 (0)