diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index f80642bd8..70c74b130 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -147,7 +147,7 @@ export function submitCompose(routerHistory) {
dispatch(submitComposeRequest());
if (getState().getIn(['compose', 'advanced_options', 'do_not_federate'])) {
- status = status + ' 👁️';
+ status = status + ' 🐺';
}
api(getState).post('/api/v1/statuses', {
status,
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
index 6e07998ec..a4aade62e 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
@@ -294,7 +294,7 @@ class ComposeForm extends ImmutablePureComponent {
let disabledButton = isSubmitting || isUploading || isChangingUpload || (!text.trim().length && !anyMedia);
- const countText = `${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 👁️' : ''}`;
+ const countText = `${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 🐺' : ''}`;
return (
diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js
index 6e5518b0c..b1270e9d2 100644
--- a/app/javascript/flavours/glitch/features/emoji_picker/index.js
+++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js
@@ -441,8 +441,8 @@ class EmojiPickerDropdown extends React.PureComponent {
diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js
index 4d7fc36c2..692053e22 100644
--- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js
+++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js
@@ -60,7 +60,7 @@ class LinkFooter extends React.PureComponent {
id='getting_started.open_source_notice'
defaultMessage='Glitchsoc is open source software, a friendly fork of {Mastodon}. You can contribute or report issues on GitHub at {github}.'
values={{
- github:
glitch-soc/mastodon (v{version}),
+ github:
noiob/awoospace (v{version}),
Mastodon:
Mastodon }}
/>
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 0f807790b..cb75d90f6 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -178,7 +178,7 @@ function continueThread (state, status) {
map.set('in_reply_to', status.id);
map.update(
'advanced_options',
- map => map.merge(new ImmutableMap({ do_not_federate: /👁\ufe0f?\u200b?(?:<\/p>)?$/.test(status.content) }))
+ map => map.merge(new ImmutableMap({ do_not_federate: /🐺\ufe0f?\u200b?(?:<\/p>)?$/.test(status.content) }))
);
map.set('privacy', status.visibility);
map.set('sensitive', false);
@@ -378,7 +378,7 @@ export default function compose(state = initialState, action) {
map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
map.update(
'advanced_options',
- map => map.merge(new ImmutableMap({ do_not_federate: /👁\ufe0f?\u200b?(?:<\/p>)?$/.test(action.status.get('content')) }))
+ map => map.merge(new ImmutableMap({ do_not_federate: /🐺\ufe0f?\u200b?(?:<\/p>)?$/.test(action.status.get('content')) }))
);
map.set('focusDate', new Date());
map.set('caretPosition', null);
diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss
index a38ca99b4..2b78508a6 100644
--- a/app/javascript/flavours/glitch/styles/about.scss
+++ b/app/javascript/flavours/glitch/styles/about.scss
@@ -717,7 +717,6 @@ $small-breakpoint: 960px;
}
.hero-widget {
- margin-top: 30px;
margin-bottom: 0;
h4 {
@@ -873,6 +872,10 @@ $small-breakpoint: 960px;
.brand {
position: relative;
text-decoration: none;
+ font-size: 45px;
+ font-weight: 500;
+ color: #ffffff;
+ font-family: "mastodon-font-sans-serif",sans-serif;
}
.brand__tagline {
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 1ed1a5778..79079d472 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -10,9 +10,9 @@ $red-bookmark: $warning-red;
// Values from the classic Mastodon UI
$classic-base-color: #282c37; // Midnight Express
-$classic-primary-color: #9baec8; // Echo Blue
+$classic-primary-color: #bca498; // Muted Rust
$classic-secondary-color: #d9e1e8; // Pattens Blue
-$classic-highlight-color: #2b90d9; // Summer Sky
+$classic-highlight-color: #f50; // Sunset Orange
// Variables for defaults in UI
$base-shadow-color: $black !default;
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index e57c3c20c..1b47db971 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -359,8 +359,8 @@ class EmojiPickerDropdown extends React.PureComponent {
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index cf16b54ac..817296162 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -714,7 +714,6 @@ $small-breakpoint: 960px;
}
.hero-widget {
- margin-top: 30px;
margin-bottom: 0;
h4 {
@@ -870,6 +869,10 @@ $small-breakpoint: 960px;
.brand {
position: relative;
text-decoration: none;
+ font-size: 45px;
+ font-weight: 500;
+ color: #fff;
+ font-family: "mastodon-font-sans-serif",sans-serif;
}
.brand__tagline {
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 8602c3dde..cb4dacb24 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -10,9 +10,9 @@ $red-bookmark: $warning-red;
// Values from the classic Mastodon UI
$classic-base-color: #282c37; // Midnight Express
-$classic-primary-color: #9baec8; // Echo Blue
+$classic-primary-color: #bca498; // Muted Rust
$classic-secondary-color: #d9e1e8; // Pattens Blue
-$classic-highlight-color: #2b90d9; // Summer Sky
+$classic-highlight-color: #f50; // Sunset Orange
// Variables for defaults in UI
$base-shadow-color: $black !default;
diff --git a/app/models/status.rb b/app/models/status.rb
index c189d19bf..c40fa6d6e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -458,7 +458,7 @@ class Status < ApplicationRecord
end
def local_only_emoji
- '👁'
+ '🐺'
end
def status_stat
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index e0ec98ec9..0001a103d 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -7,13 +7,48 @@
.landing
.landing__brand
+ = image_tag '/awoo logo.svg', style: 'width: 80px; padding-right: 15px;'
= link_to root_url, class: 'brand' do
- = svg_logo_full
- %span.brand__tagline=t 'about.tagline'
+ = @site_hostname
.landing__grid
.landing__grid__column.landing__grid__column-registration
+ .hero-widget
+ .hero-widget__img
+ = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title
+
+ .hero-widget__text
+ %p
+ = @instance_presenter.site_description.html_safe.presence || t('about.about_mastodon_html')
+ %p
+ = link_to about_more_path, class: 'button' do
+ = t('about.learn_more')
+ = fa_icon 'angle-double-right'
+
+ .hero-widget__footer
+ .hero-widget__footer__column
+ %h4= t 'about.administered_by'
+
+ = account_link_to @instance_presenter.contact_account
+
+ .hero-widget__footer__column
+ %h4= t 'about.server_stats'
+
+ %div{ style: 'display: flex' }
+ .hero-widget__counter{ style: 'width: 50%' }
+ %strong= number_to_human @instance_presenter.user_count, strip_insignificant_zeros: true
+ %span= t 'about.user_count_after', count: @instance_presenter.user_count
+ .hero-widget__counter{ style: 'width: 50%' }
+ %strong= number_to_human @instance_presenter.active_user_count, strip_insignificant_zeros: true
+ %span
+ = t 'about.active_count_after'
+ %abbr{ title: t('about.active_footnote') } *
+
+ .landing__grid__column.landing__grid__column-login
.box-widget
+ = render 'login'
+
+ .box-widget{ style: 'margin-top: 30px;' }
= render 'registration'
.directory
@@ -42,38 +77,4 @@
%h4
= fa_icon 'tablet fw'
= t('about.get_apps')
- %small= t('about.apps_platforms')
-
- .landing__grid__column.landing__grid__column-login
- .box-widget
- = render 'login'
-
- .hero-widget
- .hero-widget__img
- = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title
-
- .hero-widget__text
- %p
- = @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')
- = link_to about_more_path do
- = t('about.learn_more')
- = fa_icon 'angle-double-right'
-
- .hero-widget__footer
- .hero-widget__footer__column
- %h4= t 'about.administered_by'
-
- = account_link_to @instance_presenter.contact_account
-
- .hero-widget__footer__column
- %h4= t 'about.server_stats'
-
- %div{ style: 'display: flex' }
- .hero-widget__counter{ style: 'width: 50%' }
- %strong= number_to_human @instance_presenter.user_count, strip_insignificant_zeros: true
- %span= t 'about.user_count_after', count: @instance_presenter.user_count
- .hero-widget__counter{ style: 'width: 50%' }
- %strong= number_to_human @instance_presenter.active_user_count, strip_insignificant_zeros: true
- %span
- = t 'about.active_count_after'
- %abbr{ title: t('about.active_footnote') } *
+ %small= t('about.apps_platforms')
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 00571a35a..0893d8674 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -104,7 +104,7 @@ Rails.application.configure do
config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
config.action_dispatch.default_headers = {
- 'Server' => 'Mastodon',
+ 'Server' => 'awoo.space',
'X-Frame-Options' => 'DENY',
'X-Content-Type-Options' => 'nosniff',
'X-XSS-Protection' => '1; mode=block',
diff --git a/config/webpack/production.js b/config/webpack/production.js
index bceffaf5c..e173ebbe3 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -72,7 +72,7 @@ module.exports = merge(sharedConfig, {
],
},
externals: [
- '/emoji/1f602.svg', // used for emoji picker dropdown
+ '/emoji/1f43a.svg', // used for emoji picker dropdown
'/emoji/sheet_10.png', // used in emoji-mart
],
excludes: [
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 7a99a1964..f0f82e74f 100644
Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index b12aa55a3..f27a55e90 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/awoo logo bk.png b/public/awoo logo bk.png
new file mode 100644
index 000000000..41bc75efd
Binary files /dev/null and b/public/awoo logo bk.png differ
diff --git a/public/awoo logo.svg b/public/awoo logo.svg
new file mode 100644
index 000000000..8ed85fff8
--- /dev/null
+++ b/public/awoo logo.svg
@@ -0,0 +1,91 @@
+
+
+
+
diff --git a/public/doggif.gif b/public/doggif.gif
new file mode 100644
index 000000000..c7ece9592
Binary files /dev/null and b/public/doggif.gif differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 79000c9cc..e59aeab78 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/mask-icon.svg b/public/mask-icon.svg
index f91ff5067..e938a1ac0 100644
--- a/public/mask-icon.svg
+++ b/public/mask-icon.svg
@@ -1 +1,95 @@
-
+
+
+
+
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index a4994062d..8f57f5902 100644
Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ
diff --git a/public/oops.png b/public/oops.png
index 0a48cbf94..6aa3155ae 100644
Binary files a/public/oops.png and b/public/oops.png differ
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 26b131977..6e6196670 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -19,7 +19,7 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
site_short_description: 'something',
site_description: 'something',
version_number: '1.0',
- source_url: 'https://github.com/tootsuite/mastodon',
+ source_url: 'https://github.com/noiob/awoospace',
open_registrations: false,
thumbnail: nil,
hero: nil,