about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/ui/index.js3
-rw-r--r--app/javascript/themes/spin/pack.js2
-rw-r--r--app/javascript/themes/spin/style.scss14
-rw-r--r--app/javascript/themes/spin/theme.yml2
4 files changed, 3 insertions, 18 deletions
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index fc51df163..69eb1bbf7 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -54,6 +54,9 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
   isComposing: state.getIn(['compose', 'is_composing']),
   hasComposingText: state.getIn(['compose', 'text']) !== '',
+  layout: state.getIn(['local_settings', 'layout']),
+  isWide: state.getIn(['local_settings', 'stretch']),
+  navbarUnder: state.getIn(['local_settings', 'navbar_under']),
 });
 
 const keyMap = {
diff --git a/app/javascript/themes/spin/pack.js b/app/javascript/themes/spin/pack.js
deleted file mode 100644
index b11ac4802..000000000
--- a/app/javascript/themes/spin/pack.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '../../packs/application';
-import './style.scss';
diff --git a/app/javascript/themes/spin/style.scss b/app/javascript/themes/spin/style.scss
deleted file mode 100644
index 1a9381fd0..000000000
--- a/app/javascript/themes/spin/style.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-:root:root:root {
-  .button, .icon-button, .emoji-button, .account__avatar, .account__avatar-overlay {
-    animation: spin 4s linear infinite;
-  }
-}
-
-@keyframes spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
diff --git a/app/javascript/themes/spin/theme.yml b/app/javascript/themes/spin/theme.yml
deleted file mode 100644
index a684997dc..000000000
--- a/app/javascript/themes/spin/theme.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: spin
-pack: pack.js
\ No newline at end of file