helper_method :current_account
helper_method :current_session
+ helper_method :current_theme
helper_method :single_user_mode?
rescue_from ActionController::RoutingError, with: :not_found
@current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id'])
end
+ def current_theme
+ return Setting.default_settings['theme'] unless Themes.instance.names.include? current_user&.setting_theme
+ current_user.setting_theme
+ end
+
def cache_collection(raw, klass)
return raw unless klass.respond_to?(:with_includes)
:setting_auto_play_gif,
:setting_system_font_ui,
:setting_noindex,
+ :setting_theme,
notification_emails: %i(follow follow_request reblog favourite mention digest),
interactions: %i(must_be_follower must_be_following)
)
-@import 'variables';
+@import 'styles/variables';
.glitch.local-settings__navigation__item {
display: block;
-@import 'variables';
+@import 'styles/variables';
.glitch.local-settings__navigation {
background: $primary-text-color;
-@import 'variables';
+@import 'styles/variables';
.glitch.local-settings__page__item {
select {
-@import 'variables';
+@import 'styles/variables';
.glitch.local-settings__page {
display: block;
-@import 'variables';
+@import 'styles/variables';
.glitch.local-settings {
position: relative;
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
-require('mastodon-application-style');
+import 'styles/application';
require.context('../images/', true);
+++ /dev/null
-// 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);
-});
+++ /dev/null
-@import 'application';
--- /dev/null
+# (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
--- /dev/null
+import 'packs/application';
+import 'themes/spin/style';
--- /dev/null
+: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);
+ }
+}
--- /dev/null
+name: spin
+pack: pack.js
\ No newline at end of file
--- /dev/null
+# frozen_string_literal: true
+
+require 'singleton'
+require 'yaml'
+
+class Themes
+ include Singleton
+
+ def initialize
+ result = Hash.new
+ Dir.glob(Rails.root.join('app', 'javascript', 'themes', '*', 'theme.yml')) do |path|
+ data = YAML.load_file(path)
+ if data['pack'] && data['name']
+ result[data['name']] = data
+ end
+ end
+ @conf = result
+ end
+
+ def names
+ @conf.keys
+ end
+end
user.settings['auto_play_gif'] = auto_play_gif_preference
user.settings['system_font_ui'] = system_font_ui_preference
user.settings['noindex'] = noindex_preference
+ user.settings['theme'] = theme_preference
end
def merged_notification_emails
boolean_cast_setting 'setting_noindex'
end
+ def theme_preference
+ settings['setting_theme']
+ end
+
def boolean_cast_setting(key)
settings[key] == '1'
end
settings.noindex
end
+ def setting_theme
+ settings.theme
+ end
+
def token_for_app(a)
return nil if a.nil? || a.owner != self
Doorkeeper::AccessToken
%meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
%script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
- = javascript_pack_tag "frontends/#{@frontend}", integrity: true, crossorigin: 'anonymous'
- = stylesheet_pack_tag "frontends/#{@frontend}", integrity: true, media: 'all'
+ = javascript_pack_tag "themes/#{current_theme}", integrity: true, crossorigin: 'anonymous'
+ = stylesheet_pack_tag "themes/#{current_theme}", integrity: true, media: 'all'
.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
%noscript
= render 'shared/error_messages', object: current_user
.fields-group
+ = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| safe_join([I18n.t("themes.#{theme}", default: theme)])}, wrapper: :with_label, include_blank: false
+
= f.input :locale,
collection: I18n.available_locales,
wrapper: :with_label,
+++ /dev/null
-# Be sure to restart your server when you modify this file.
-
-Rails.application.configure do
- frontends = []
- Rails.root.join('app', 'javascript', 'packs', 'frontends').each_child(false) { |f| frontends.push f.to_s }
- config.x.available_frontends = frontends
-end
one: <span class="note-counter">1</span> character left
other: <span class="note-counter">%{count}</span> characters left
setting_noindex: Affects your public profile and status pages
+ setting_theme: Affects how Mastodon looks when you're logged in from any device.
imports:
data: CSV file exported from another Mastodon instance
sessions:
setting_noindex: Opt-out of search engine indexing
setting_system_font_ui: Use system's default font
setting_unfollow_modal: Show confirmation dialog before unfollowing someone
+ setting_theme: Site theme
severity: Severity
type: Import type
username: Username
auto_play_gif: false
system_font_ui: false
noindex: false
+ theme: 'default'
notification_emails:
follow: false
reblog: false
// Common configuration for webpacker loaded from config/webpacker.yml
-const { join, resolve } = require('path');
+const { dirname, join, resolve } = require('path');
const { env } = require('process');
const { safeLoad } = require('js-yaml');
const { readFileSync } = require('fs');
+const glob = require('glob');
const configPath = resolve('config', 'webpacker.yml');
const loadersDir = join(__dirname, 'loaders');
const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV];
+const themeFiles = glob.sync('app/javascript/themes/*/theme.yml');
+const themes = {};
+
+for (let i = 0; i < themeFiles.length; i++) {
+ const themeFile = themeFiles[i];
+ const data = safeLoad(readFileSync(themeFile), 'utf8');
+ if (!data.pack_directory) {
+ data.pack_directory = dirname(themeFile);
+ }
+ if (data.name && data.pack) {
+ themes[data.name] = data;
+ }
+}
function removeOuterSlashes(string) {
return string.replace(/^\/*/, '').replace(/\/*$/, '');
module.exports = {
settings,
+ themes,
env,
loadersDir,
output,
{ loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
{ loader: 'postcss-loader', options: { sourceMap: true } },
'resolve-url-loader',
- { loader: 'sass-loader', options: { includePaths: ['app/javascript/styles'] } },
+ { loader: 'sass-loader', options: { includePaths: ['app/javascript'] } },
],
}),
};
// Note: You must restart bin/webpack-dev-server for changes to take effect
-const { existsSync } = require('fs');
const webpack = require('webpack');
const { basename, dirname, join, relative, resolve } = require('path');
const { sync } = require('glob');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const ManifestPlugin = require('webpack-manifest-plugin');
const extname = require('path-complete-extname');
-const { env, settings, output, loadersDir } = require('./configuration.js');
+const { env, settings, themes, output, loadersDir } = require('./configuration.js');
const localePackPaths = require('./generateLocalePacks');
const extensionGlob = `**/*{${settings.extensions.join(',')}}*`;
const customApplicationStyle = resolve(join(settings.source_path, 'styles/custom.scss'));
const originalApplicationStyle = resolve(join(settings.source_path, 'styles/application.scss'));
+const themePaths = Object.keys(themes).reduce(
+ (themePaths, name) => {
+ themeData = themes[name];
+ themePaths[`themes/${name}`] = resolve(themeData.pack_directory, themeData.pack);
+ return themePaths;
+ }, {}
+);
+
module.exports = {
- entry: entryPacks.reduce(
- (map, entry) => {
- const localMap = map;
- let namespace = relative(join(entryPath), dirname(entry));
- if (namespace === join('..', '..', '..', 'tmp', 'packs')) {
- namespace = ''; // generated by generateLocalePacks.js
- }
- localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
- return localMap;
- }, {}
+ entry: Object.assign(
+ entryPacks.reduce(
+ (map, entry) => {
+ const localMap = map;
+ let namespace = relative(join(entryPath), dirname(entry));
+ if (namespace === join('..', '..', '..', 'tmp', 'packs')) {
+ namespace = ''; // generated by generateLocalePacks.js
+ }
+ localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
+ return localMap;
+ }, {}
+ ), themePaths
),
output: {
],
resolve: {
- alias: {
- 'mastodon-application-style': existsSync(customApplicationStyle) ?
- customApplicationStyle : originalApplicationStyle,
- },
extensions: settings.extensions,
modules: [
resolve(settings.source_path),
cat aescling's git repositories / mastodon.git / commitdiff