Add awoospace branding

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,

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 (
       <div className='composer'>

app/javascript/flavours/glitch/features/emoji_picker/index.js

@@ -441,8 +441,8 @@ class EmojiPickerDropdown extends React.PureComponent {
         <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
           <img
             className={classNames('emojione', { 'pulse-loading': active && loading })}
-            alt='🙂'
-            src={`${assetHost}/emoji/1f602.svg`}
+            alt='🐺'
+            src={`${assetHost}/emoji/1f43a.svg`}
           />
         </div>
 

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: <span><a href='https://github.com/glitch-soc/mastodon' rel='noopener noreferrer' target='_blank'>glitch-soc/mastodon</a> (v{version})</span>,
+              github: <span><a href='https://github.com/noiob/awoospace' rel='noopener noreferrer' target='_blank'>noiob/awoospace</a> (v{version})</span>,
               Mastodon: <a href='https://github.com/tootsuite/mastodon' rel='noopener noreferrer' target='_blank'>Mastodon</a> }}
           />
         </p>

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);

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 {

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;

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js

@@ -359,8 +359,8 @@ class EmojiPickerDropdown extends React.PureComponent {
         <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
           <img
             className={classNames('emojione', { 'pulse-loading': active && loading })}
-            alt='🙂'
-            src={`${assetHost}/emoji/1f602.svg`}
+            alt='🐺'
+            src={`${assetHost}/emoji/1f43a.svg`}
           />
         </div>
 

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 {

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;

app/models/status.rb

@@ -458,7 +458,7 @@ class Status < ApplicationRecord
   end
 
   def local_only_emoji
-    '👁'
+    '🐺'
   end
 
   def status_stat

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')

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',

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: [

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,