From fb6d51aa81c4540cd7bb1c47e2729dc48090d041 Mon Sep 17 00:00:00 2001
From: Jon Winn <me@jonwinn.com>
Date: Tue, 20 Nov 2018 13:51:53 -0800
Subject: [PATCH] fix(style): inline animation interpolation; readd lint:css to
 lint script

---
 app/components/LoadingIndicator/Circle.js |  8 ++----
 package-lock.json                         | 30 ++++++-----------------
 package.json                              |  2 +-
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/app/components/LoadingIndicator/Circle.js b/app/components/LoadingIndicator/Circle.js
index fbe230d104..a6b5a2d416 100644
--- a/app/components/LoadingIndicator/Circle.js
+++ b/app/components/LoadingIndicator/Circle.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import styled, { css, keyframes } from 'styled-components';
+import styled, { keyframes } from 'styled-components';
 
 const circleFadeDelay = keyframes`
   0%,
@@ -14,10 +14,6 @@ const circleFadeDelay = keyframes`
   }
 `;
 
-const circleFadeDelayRule = css`
-  ${circleFadeDelay} 1.2s infinite ease-in-out both;
-`;
-
 const Circle = props => {
   const CirclePrimitive = styled.div`
     width: 100%;
@@ -38,7 +34,7 @@ const Circle = props => {
       height: 15%;
       background-color: #999;
       border-radius: 100%;
-      animation: ${circleFadeDelayRule};
+      animation: ${circleFadeDelay} 1.2s infinite ease-in-out both;
       ${props.delay &&
         `
         -webkit-animation-delay: ${props.delay}s;
diff --git a/package-lock.json b/package-lock.json
index 973ce4cb01..d90ac637b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3188,7 +3188,7 @@
         },
         "slice-ansi": {
           "version": "0.0.4",
-          "resolved": "http://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
           "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
           "dev": true
         },
@@ -6546,14 +6546,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6568,20 +6566,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6698,8 +6693,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6711,7 +6705,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6726,7 +6719,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6734,14 +6726,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6760,7 +6750,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6841,8 +6830,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6854,7 +6842,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6976,7 +6963,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/package.json b/package.json
index d7e5167f33..701c2944ad 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "clean": "shjs ./internals/scripts/clean.js",
     "clean:all": "npm run analyze:clean && npm run test:clean && npm run build:clean",
     "generate": "plop --plopfile internals/generators/index.js",
-    "lint": "npm run lint:js",
+    "lint": "npm run lint:js && npm run lint:css",
     "lint:css": "stylelint './app/**/*.js'",
     "lint:eslint": "eslint --ignore-path .gitignore --ignore-pattern internals/scripts",
     "lint:eslint:fix": "eslint --ignore-path .gitignore --ignore-pattern internals/scripts --fix",