Skip to content
Permalink
Browse files

Rename themes -> flavours ? ?

  • Loading branch information
marrus-sh committed Dec 4, 2017
1 parent d216547 commit bc4fa6b198557a7f3989eb0865e2c77ac7451d29
Showing 313 changed files with 665 additions and 681 deletions.
@@ -1,3 +0,0 @@
[submodule "app/javascript/themes/mastodon-go"]
path = app/javascript/themes/mastodon-go
url = https://github.com/marrus-sh/mastodon-go
@@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base

helper_method :current_account
helper_method :current_session
helper_method :current_theme
helper_method :current_flavour
helper_method :current_skin
helper_method :single_user_mode?

@@ -57,8 +57,8 @@ def after_sign_out_path_for(_resource_or_scope)
def pack(data, pack_name, skin = 'default')
return nil unless pack?(data, pack_name)
pack_data = {
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.get(current_theme) : Themes.instance.core, 'common'),
name: data['name'],
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common'),
flavour: data['name'],
pack: pack_name,
preload: nil,
skin: nil,
@@ -88,8 +88,8 @@ def pack?(data, pack_name)

def nil_pack(data, pack_name, skin = 'default')
{
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.get(current_theme) : Themes.instance.core, 'common', skin),
name: data['name'],
common: pack_name == 'common' ? nil : resolve_pack(data['name'] ? Themes.instance.flavour(current_flavour) : Themes.instance.core, 'common', skin),
flavour: data['name'],
pack: nil,
preload: nil,
skin: nil,
@@ -102,23 +102,23 @@ def resolve_pack(data, pack_name, skin = 'default')
if data['name'] && data.key?('fallback')
if data['fallback'].nil?
return nil_pack(data, pack_name, skin)
elsif data['fallback'].is_a?(String) && Themes.instance.get(data['fallback'])
return resolve_pack(Themes.instance.get(data['fallback']), pack_name, skin)
elsif data['fallback'].is_a?(String) && Themes.instance.flavour(data['fallback'])
return resolve_pack(Themes.instance.flavour(data['fallback']), pack_name, skin)
elsif data['fallback'].is_a?(Array)
data['fallback'].each do |fallback|
return resolve_pack(Themes.instance.get(fallback), pack_name, skin) if Themes.instance.get(fallback)
return resolve_pack(Themes.instance.flavour(fallback), pack_name, skin) if Themes.instance.flavour(fallback)
end
end
return nil_pack(data, pack_name, skin)
end
return data.key?('name') && data['name'] != default_theme ? resolve_pack(Themes.instance.get(default_theme), pack_name, skin) : nil_pack(data, pack_name, skin)
return data.key?('name') && data['name'] != Setting.default_settings['flavour'] ? resolve_pack(Themes.instance.flavour(Setting.default_settings['flavour']), pack_name, skin) : nil_pack(data, pack_name, skin)
end
result
end

def use_pack(pack_name)
@core = resolve_pack(Themes.instance.core, pack_name)
@theme = resolve_pack(Themes.instance.get(current_theme), pack_name, current_skin)
@theme = resolve_pack(Themes.instance.flavour(current_flavour), pack_name, current_skin)
end

protected
@@ -151,21 +151,13 @@ def current_session
@current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id'])
end

def default_theme
Setting.default_settings['theme']
end

def current_theme
return default_theme unless Themes.instance.names.include? current_user&.setting_theme
current_user.setting_theme
end

def default_skin
'default'
def current_flavour
return Setting.default_settings['flavour'] unless Themes.instance.flavours.include? current_user&.setting_flavour
current_user.setting_flavour
end

def current_skin
return default_skin unless Themes.instance.skins_for(current_theme).include? current_user&.setting_skin
return 'default' unless Themes.instance.skins_for(current_flavour).include? current_user&.setting_skin
current_user.setting_skin
end

@@ -3,7 +3,7 @@
const { length } = require('stringz');
const { delegate } = require('rails-ujs');

import { processBio } from 'themes/glitch/util/bio_metadata';
import { processBio } from 'flavours/glitch/util/bio_metadata';

delegate(document, '.account_display_name', 'input', ({ target }) => {
const nameCounter = document.querySelector('.name-counter');
@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';

export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { fetchRelationships } from './accounts';

export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST';
export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS';
@@ -1,6 +1,6 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';
import { throttle } from 'lodash';
import { search as emojiSearch } from 'themes/glitch/util/emoji/emoji_mart_search_light';
import { search as emojiSearch } from 'flavours/glitch/util/emoji/emoji_mart_search_light';
import { useEmoji } from './emojis';

import {
@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';

export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';

export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const REBLOG_REQUEST = 'REBLOG_REQUEST';
export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
@@ -1,6 +1,6 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { fetchRelationships } from './accounts';
import { openModal } from 'themes/glitch/actions/modal';
import { openModal } from 'flavours/glitch/actions/modal';

export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';
@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { List as ImmutableList } from 'immutable';
import IntlMessageFormat from 'intl-messageformat';
import { fetchRelationships } from './accounts';
@@ -1,10 +1,10 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';

import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';

export function fetchPinnedStatuses() {
return (dispatch, getState) => {
@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';
import { openModal, closeModal } from './modal';

export const REPORT_INIT = 'REPORT_INIT';
@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

export const SEARCH_CHANGE = 'SEARCH_CHANGE';
export const SEARCH_CLEAR = 'SEARCH_CLEAR';
@@ -1,4 +1,4 @@
import api from 'themes/glitch/util/api';
import api from 'flavours/glitch/util/api';

import { deleteFromTimelines } from './timelines';
import { fetchStatusCard } from './cards';
@@ -1,4 +1,4 @@
import { connectStream } from 'themes/glitch/util/stream';
import { connectStream } from 'flavours/glitch/util/stream';
import {
updateTimeline,
deleteFromTimelines,
@@ -1,4 +1,4 @@
import api, { getLinks } from 'themes/glitch/util/api';
import api, { getLinks } from 'flavours/glitch/util/api';
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';

export const TIMELINE_UPDATE = 'TIMELINE_UPDATE';
@@ -7,7 +7,7 @@ import Permalink from './permalink';
import IconButton from './icon_button';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
follow: { id: 'account.follow', defaultMessage: 'Follow' },
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import unicodeMapping from 'themes/glitch/util/emoji/emoji_unicode_mapping_light';
import unicodeMapping from 'flavours/glitch/util/emoji/emoji_unicode_mapping_light';

const assetHost = process.env.CDN_HOST || '';

@@ -1,9 +1,9 @@
import React from 'react';
import AutosuggestAccountContainer from 'themes/glitch/features/compose/containers/autosuggest_account_container';
import AutosuggestAccountContainer from 'flavours/glitch/features/compose/containers/autosuggest_account_container';
import AutosuggestEmoji from './autosuggest_emoji';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { isRtl } from 'themes/glitch/util/rtl';
import { isRtl } from 'flavours/glitch/util/rtl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import Textarea from 'react-textarea-autosize';
import classNames from 'classnames';
@@ -1,5 +1,5 @@
import React from 'react';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import PropTypes from 'prop-types';

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import detectPassiveEvents from 'detect-passive-events';
import { scrollTop } from 'themes/glitch/util/scroll';
import { scrollTop } from 'flavours/glitch/util/scroll';

export default class Column extends React.PureComponent {

@@ -4,8 +4,7 @@ import classNames from 'classnames';
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';

// Glitch imports
import NotificationPurgeButtonsContainer from 'themes/glitch/containers/notification_purge_buttons_container';
import NotificationPurgeButtonsContainer from 'flavours/glitch/containers/notification_purge_buttons_container';

const messages = defineMessages({
show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import IconButton from './icon_button';
import Overlay from 'react-overlays/lib/Overlay';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import detectPassiveEvents from 'detect-passive-events';

@@ -1,5 +1,5 @@
import React from 'react';
import Motion from 'themes/glitch/util/optional_motion';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';
import PropTypes from 'prop-types';
import classNames from 'classnames';
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import scheduleIdleTask from 'themes/glitch/util/schedule_idle_task';
import getRectFromEntry from 'themes/glitch/util/get_rect_from_entry';
import scheduleIdleTask from 'flavours/glitch/util/schedule_idle_task';
import getRectFromEntry from 'flavours/glitch/util/get_rect_from_entry';
import { is } from 'immutable';

// Diff these props in the "rendered" state
@@ -4,9 +4,9 @@ import PropTypes from 'prop-types';
import { is } from 'immutable';
import IconButton from './icon_button';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { isIOS } from 'themes/glitch/util/is_mobile';
import { isIOS } from 'flavours/glitch/util/is_mobile';
import classNames from 'classnames';
import { autoPlayGif } from 'themes/glitch/util/initial_state';
import { autoPlayGif } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
@@ -1,13 +1,13 @@
import React, { PureComponent } from 'react';
import { ScrollContainer } from 'react-router-scroll-4';
import PropTypes from 'prop-types';
import IntersectionObserverArticleContainer from 'themes/glitch/containers/intersection_observer_article_container';
import IntersectionObserverArticleContainer from 'flavours/glitch/containers/intersection_observer_article_container';
import LoadMore from './load_more';
import IntersectionObserverWrapper from 'themes/glitch/util/intersection_observer_wrapper';
import IntersectionObserverWrapper from 'flavours/glitch/util/intersection_observer_wrapper';
import { throttle } from 'lodash';
import { List as ImmutableList } from 'immutable';
import classNames from 'classnames';
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'themes/glitch/util/fullscreen';
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'flavours/glitch/util/fullscreen';

export default class ScrollableList extends PureComponent {

@@ -6,9 +6,9 @@ import StatusHeader from './status_header';
import StatusContent from './status_content';
import StatusActionBar from './status_action_bar';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { MediaGallery, Video } from 'themes/glitch/util/async-components';
import { MediaGallery, Video } from 'flavours/glitch/util/async-components';
import { HotKeys } from 'react-hotkeys';
import NotificationOverlayContainer from 'themes/glitch/features/notifications/containers/overlay_container';
import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';

// We use the component (and not the container) since we do not want
// to use the progress bar to show download progress
@@ -1,14 +1,11 @@
// THIS FILE EXISTS FOR UPSTREAM COMPATIBILITY & SHOULDN'T BE USED !!
// SEE INSTEAD : glitch/components/status/action_bar

import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import IconButton from './icon_button';
import DropdownMenuContainer from 'themes/glitch/containers/dropdown_menu_container';
import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from 'themes/glitch/util/initial_state';
import { me } from 'flavours/glitch/util/initial_state';
import RelativeTimestamp from './relative_timestamp';

const messages = defineMessages({
@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { isRtl } from 'themes/glitch/util/rtl';
import { isRtl } from 'flavours/glitch/util/rtl';
import { FormattedMessage } from 'react-intl';
import Permalink from './permalink';
import classnames from 'classnames';
@@ -1,7 +1,7 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import StatusContainer from 'themes/glitch/containers/status_container';
import StatusContainer from 'flavours/glitch/containers/status_container';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ScrollableList from './scrollable_list';

@@ -1,19 +1,19 @@
import React from 'react';
import { connect } from 'react-redux';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { makeGetAccount } from 'themes/glitch/selectors';
import Account from 'themes/glitch/components/account';
import { makeGetAccount } from 'flavours/glitch/selectors';
import Account from 'flavours/glitch/components/account';
import {
followAccount,
unfollowAccount,
blockAccount,
unblockAccount,
muteAccount,
unmuteAccount,
} from 'themes/glitch/actions/accounts';
import { openModal } from 'themes/glitch/actions/modal';
import { initMuteModal } from 'themes/glitch/actions/mutes';
import { unfollowModal } from 'themes/glitch/util/initial_state';
} from 'flavours/glitch/actions/accounts';
import { openModal } from 'flavours/glitch/actions/modal';
import { initMuteModal } from 'flavours/glitch/actions/mutes';
import { unfollowModal } from 'flavours/glitch/util/initial_state';

const messages = defineMessages({
unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import Card from 'themes/glitch/features/status/components/card';
import Card from 'flavours/glitch/features/status/components/card';
import { fromJS } from 'immutable';

export default class CardContainer extends React.PureComponent {

0 comments on commit bc4fa6b

Please sign in to comment.
You can’t perform that action at this time.