Skip to content

Commit

Permalink
Replace bower's spinkit with npm (#666)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tonkpils authored Sep 22, 2023
1 parent b234e83 commit 38d0dec
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 20 deletions.
8 changes: 3 additions & 5 deletions frontend/app/styles/spinner.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
$spinkit-spinner-margin: 40px auto !default;
$spinkit-size: 40px !default;
$spinkit-spinner-color: $primary !default;

@import 'spinners/7-three-bounce';
:root {
--sk-color: #{$primary};
}
8 changes: 4 additions & 4 deletions frontend/app/templates/application-loading.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="sk-three-bounce">
<div class="sk-child sk-bounce1"></div>
<div class="sk-child sk-bounce2"></div>
<div class="sk-child sk-bounce3"></div>
<div class="sk-flow sk-center">
<div class="sk-flow-dot"></div>
<div class="sk-flow-dot"></div>
<div class="sk-flow-dot"></div>
</div>
8 changes: 4 additions & 4 deletions frontend/app/templates/application/three-bounce-spinner.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="sk-three-bounce">
<div class="sk-child sk-bounce1"></div>
<div class="sk-child sk-bounce2"></div>
<div class="sk-child sk-bounce3"></div>
<div class="sk-flow sk-center">
<div class="sk-flow-dot"></div>
<div class="sk-flow-dot"></div>
<div class="sk-flow-dot"></div>
</div>
1 change: 0 additions & 1 deletion frontend/bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "flaredown",
"dependencies": {
"spinkit": "~1.2",
"bourbon": "4.2.3",
"neat": "~1.7.2",
"pace": "vectart/pace",
Expand Down
9 changes: 3 additions & 6 deletions frontend/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ module.exports = function(defaults) {
}
},

sassOptions: {
includePaths: [
'bower_components/spinkit/scss'
]
},

fingerprint: {
exclude: [
'weather/clear-day',
Expand Down Expand Up @@ -61,6 +55,9 @@ module.exports = function(defaults) {

vendorLib = map(vendorLib, (content) => `if (typeof FastBoot === 'undefined') { ${content} \n }`);

// Spinkit
app.import('node_modules/spinkit/spinkit.css')

// d3
app.import(app.bowerDirectory + '/d3/d3.min.js');

Expand Down
13 changes: 13 additions & 0 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,8 @@
"lib/full-story",
"lib/heap-analytics"
]
},
"dependencies": {
"spinkit": "^2.0.1"
}
}

0 comments on commit 38d0dec

Please sign in to comment.