From b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 Mon Sep 17 00:00:00 2001
From: Gô Shoemake <marrus-sh@users.noreply.github.com>
Date: Sun, 30 Jul 2017 10:28:21 -0700
Subject: Multiple frontend support (#110)

* Initial multiple frontend support

* Removed unnecessary require()

* Moved styles/images out of common
---
 app/javascript/packs/common.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/javascript/packs/common.js')

diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index ba7053f1f..de0c68fa5 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -1,9 +1,6 @@
 import { start } from 'rails-ujs';
 
-// import default stylesheet with variables
-require('font-awesome/css/font-awesome.css');
-require('mastodon-application-style');
-
-require.context('../images/', true);
+// import common styling
+require('../styles/common.scss');
 
 start();
-- 
cgit 


From 4b397adb5bfb07be587c788e6e10962aa383d25f Mon Sep 17 00:00:00 2001
From: Ondřej Hruška <ondra@ondrovo.com>
Date: Mon, 16 Oct 2017 21:13:34 +0200
Subject: fix some lint errors

---
 app/javascript/mastodon/components/icon_button.js | 4 ++--
 app/javascript/packs/common.js                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/javascript/packs/common.js')

diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 651b89566..76b0da12f 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -90,11 +90,11 @@ export default class IconButton extends React.PureComponent {
       damping: 7,
     };
     const motionStyle = {
-      rotate: this.props.animate ? spring(rotateDeg, springOpts) : 0,
+      rotate: animate ? spring(rotateDeg, springOpts) : 0,
     };
 
     return (
-      <Motion defaultStyle={{ rotate: active ? -360 : 0 }} style={{ rotate: animate ? spring(active ? -360 : 0, { stiffness: 120, damping: 7 }) : 0 }}>
+      <Motion defaultStyle={motionDefaultStyle} style={motionStyle}>
         {({ rotate }) =>
           <button
             aria-label={title}
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index cb47514d3..5ac6504d4 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -3,6 +3,7 @@ import 'font-awesome/css/font-awesome.css';
 
 // import common styling
 require('../styles/common.scss');
+
 require.context('../images/', true);
 
 start();
-- 
cgit