tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/better-themeing' into merging-upstream

Browse Source
This commit is contained in:
Ondřej Hruška
2017-09-28 09:20:59 +02:00
parent 83bda6c1a8 f7ca205f38
commit daad07b1d5
25 changed files with 116 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/glitch/components/local_settings/navigation/item/style.scss
View File

@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';
.glitch.local-settings__navigation__item {
display: block;

2
app/javascript/glitch/components/local_settings/navigation/style.scss
View File

@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';
.glitch.local-settings__navigation {
background: $primary-text-color;

2
app/javascript/glitch/components/local_settings/page/item/style.scss
View File

@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';
.glitch.local-settings__page__item {
select {

2
app/javascript/glitch/components/local_settings/page/style.scss
View File

@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';
.glitch.local-settings__page {
display: block;

2
app/javascript/glitch/components/local_settings/style.scss
View File

@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';
.glitch.local-settings {
position: relative;

2
app/javascript/packs/application.js
View File

@ -2,7 +2,7 @@ import loadPolyfills from '../mastodon/load_polyfills';
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('mastodon-application-style');
import 'styles/application';
require.context('../images/', true);

16
app/javascript/packs/frontends/mastodon.js
View File

@ -1,16 +0,0 @@
// This file replaces `app/javascript/packs/application.js` for use
// with multiple frontends.
import loadPolyfills from '../../mastodon/load_polyfills';
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('mastodon-application-style');
require.context('../../images/', true);
loadPolyfills().then(() => {
require('../../mastodon/main').default();
}).catch(e => {
console.error(e);
});

1
app/javascript/styles/custom.scss
View File

@ -1 +0,0 @@
@import 'application';

9
app/javascript/themes/default/theme.yml Normal file
View File

@ -0,0 +1,9 @@
# (REQUIRED) Name must be unique across all installed themes.
name: default
# (REQUIRED) The location of the pack file inside `pack_directory`.
pack: application.js
# (OPTIONAL) The directory which contains the pack file.
# Defaults to the theme directory (`app/javascript/themes/[theme]`).
pack_directory: app/javascript/packs

2
app/javascript/themes/spin/pack.js Normal file
View File

@ -0,0 +1,2 @@
import 'packs/application';
import 'themes/spin/style';

14
app/javascript/themes/spin/style.scss Normal file
View File

@ -0,0 +1,14 @@
: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);
}
}

2
app/javascript/themes/spin/theme.yml Normal file
View File

@ -0,0 +1,2 @@
name: spin
pack: pack.js