Browse Source

Cybrespace branding

Andrew 11 months ago
parent
commit
8665b93bed

+ 1
- 1
app/javascript/mastodon/components/status_action_bar.js View File

@@ -206,7 +206,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
206 206
       <div className='status__action-bar'>
207 207
         <div className='status__action-bar__counter'><IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('replies_count'))}</span></div>
208 208
         <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
209
-        <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
209
+        <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} />
210 210
         {shareButton}
211 211
 
212 212
         <div className='status__action-bar-dropdown'>

+ 2
- 2
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js View File

@@ -356,8 +356,8 @@ export default class EmojiPickerDropdown extends React.PureComponent {
356 356
         <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}>
357 357
           <img
358 358
             className={classNames('emojione', { 'pulse-loading': active && loading })}
359
-            alt='🙂'
360
-            src={`${assetHost}/emoji/1f602.svg`}
359
+            alt='🤔'
360
+            src={`${assetHost}/emoji/1f914.svg`}
361 361
           />
362 362
         </div>
363 363
 

+ 3
- 3
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js View File

@@ -12,13 +12,13 @@ const DEFAULTS = [
12 12
   '+1',
13 13
   'grinning',
14 14
   'kissing_heart',
15
-  'heart_eyes',
15
+  'vhs',
16 16
   'laughing',
17
-  'stuck_out_tongue_winking_eye',
17
+  'floppy_disk',
18 18
   'sweat_smile',
19 19
   'joy',
20 20
   'yum',
21
-  'disappointed',
21
+  'computer',
22 22
   'thinking_face',
23 23
   'weary',
24 24
   'sob',

+ 13
- 13
app/javascript/mastodon/features/getting_started/index.js View File

@@ -14,20 +14,20 @@ import { Link } from 'react-router-dom';
14 14
 import NavigationBar from '../compose/components/navigation_bar';
15 15
 
16 16
 const messages = defineMessages({
17
-  home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
18
-  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
19
-  public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
17
+  home_timeline: { id: 'tabs_bar.home', defaultMessage: '/timelines/home' },
18
+  notifications: { id: 'tabs_bar.notifications', defaultMessage: '~/.notifications' },
19
+  public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: '/timelines/federated' },
20 20
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
21
-  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
22
-  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
23
-  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
24
-  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
25
-  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
26
-  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
27
-  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
28
-  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
29
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
30
-  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
21
+  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: '/timelines/local' },
22
+  direct: { id: 'navigation_bar.direct', defaultMessage: '~/.dms' },
23
+  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'edit ~/.config' },
24
+  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: '~/.follow-requests' },
25
+  favourites: { id: 'navigation_bar.favourites', defaultMessage: '~/.florps' },
26
+  blocks: { id: 'navigation_bar.blocks', defaultMessage: '~/.blocked' },
27
+  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: '~/.hidden-domains' },
28
+  mutes: { id: 'navigation_bar.mutes', defaultMessage: '~/.muted' },
29
+  pins: { id: 'navigation_bar.pins', defaultMessage: '~/.pinned' },
30
+  lists: { id: 'navigation_bar.lists', defaultMessage: '~/.lists' },
31 31
   discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
32 32
   personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
33 33
   security: { id: 'navigation_bar.security', defaultMessage: 'Security' },

+ 1
- 1
app/javascript/mastodon/features/notifications/components/notification.js View File

@@ -116,7 +116,7 @@ export default class Notification extends ImmutablePureComponent {
116 116
         <div className='notification notification-favourite focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.favourite', defaultMessage: '{name} favourited your status' }, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
117 117
           <div className='notification__message'>
118 118
             <div className='notification__favourite-icon-wrapper'>
119
-              <i className='fa fa-fw fa-star star-icon' />
119
+              <i className='fa fa-fw fa-floppy-o star-icon' />
120 120
             </div>
121 121
             <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
122 122
           </div>

+ 1
- 1
app/javascript/mastodon/features/status/components/action_bar.js View File

@@ -161,7 +161,7 @@ export default class ActionBar extends React.PureComponent {
161 161
       <div className='detailed-status__action-bar'>
162 162
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_id', null) === null ? 'reply' : 'reply-all'} onClick={this.handleReplyClick} /></div>
163 163
         <div className='detailed-status__button'><IconButton disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
164
-        <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
164
+        <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} /></div>
165 165
         {shareButton}
166 166
 
167 167
         <div className='detailed-status__action-bar-dropdown'>

+ 1
- 1
app/javascript/mastodon/features/status/components/detailed_status.js View File

@@ -119,7 +119,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
119 119
           <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener'>
120 120
             <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
121 121
           </a>{applicationLink} · {reblogLink} · <Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
122
-            <i className='fa fa-star' />
122
+            <i className='fa fa-floppy-o' />
123 123
             <span className='detailed-status__favorites'>
124 124
               <FormattedNumber value={status.get('favourites_count')} />
125 125
             </span>

+ 2
- 1
app/views/about/show.html.haml View File

@@ -13,7 +13,8 @@
13 13
       .column-0
14 14
         .brand
15 15
           = link_to root_url do
16
-            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
16
+            = image_tag asset_pack_path('logo-cybre.png')
17
+            = Setting.site_title
17 18
 
18 19
       - if Setting.timeline_preview
19 20
         .column-1

+ 1
- 1
app/views/layouts/admin.html.haml View File

@@ -6,7 +6,7 @@
6 6
     .sidebar-wrapper
7 7
       .sidebar
8 8
         = link_to root_path do
9
-          = image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon'
9
+          = image_tag asset_pack_path('logo-cybre.png'), class: 'logo', alt: 'Cybrespace'
10 10
 
11 11
         = render_navigation
12 12
     .content-wrapper

+ 2
- 1
app/views/layouts/auth.html.haml View File

@@ -6,7 +6,8 @@
6 6
     .logo-container
7 7
       %h1
8 8
         = link_to root_path do
9
-          = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
9
+          = image_tag asset_pack_path('logo-cybre.png')
10
+          = Setting.site_title
10 11
 
11 12
     .form-container
12 13
       = render 'flashes'

+ 1
- 1
config/settings.yml View File

@@ -7,7 +7,7 @@
7 7
 # For more information, see docs/Running-Mastodon/Administration-guide.md
8 8
 #
9 9
 defaults: &defaults
10
-  site_title: Mastodon
10
+  site_title: 'Cybrespace'
11 11
   site_short_description: ''
12 12
   site_description: ''
13 13
   site_extended_description: ''

+ 2
- 2
lib/mastodon/version.rb View File

@@ -29,7 +29,7 @@ module Mastodon
29 29
     end
30 30
 
31 31
     def to_s
32
-      [to_a.join('.'), flags].join
32
+      [to_a.join('.'), flags, '-cybre'].join
33 33
     end
34 34
 
35 35
     def repository
@@ -37,7 +37,7 @@ module Mastodon
37 37
     end
38 38
 
39 39
     def source_base_url
40
-      "https://github.com/#{repository}"
40
+      'https://cybre.tech/cybrespace/mastodon'
41 41
     end
42 42
 
43 43
     # specify git tag or commit hash here

BIN
public/android-chrome-192x192.png View File


BIN
public/apple-touch-icon.png View File


BIN
public/background-cybre.png View File


+ 1
- 1
public/browserconfig.xml View File

@@ -3,7 +3,7 @@
3 3
   <msapplication>
4 4
     <tile>
5 5
       <square150x150logo src="/mstile-150x150.png"/>
6
-      <TileColor>#282c37</TileColor>
6
+      <TileColor>#1ea21e</TileColor>
7 7
     </tile>
8 8
   </msapplication>
9 9
 </browserconfig>

+ 54
- 0
public/clock.js View File

@@ -0,0 +1,54 @@
1
+document.addEventListener("DOMContentLoaded", function(event) { 
2
+  updateClock();
3
+  setInterval(updateClock, 1000);
4
+});
5
+
6
+function getNextOpen(now) {
7
+    var days = [[0, 14], [4, 18], [8, 22], [12], [2, 16], [6, 20], [10]]
8
+    var nowday = now.getUTCDay();
9
+    var nour = now.getUTCHours();
10
+
11
+    var open_hour = -1;
12
+    var d = 0;
13
+
14
+    while (open_hour == -1) {
15
+        var times = days[(nowday + d) % 7];
16
+        for (var i = 0; i < times.length; ++i) {
17
+            var time = times[i];
18
+            if (time == nour) {
19
+                return "refresh";
20
+            } else if (time > nour || d > 0) {
21
+                open_hour = time;
22
+                break;
23
+            }
24
+        }
25
+        if (open_hour == -1) {
26
+            d += 1;
27
+            nour = -1;
28
+        }
29
+    }
30
+
31
+    var open = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + d));
32
+    var ts = open.setUTCHours(open_hour);
33
+    return open;
34
+}
35
+
36
+function updateClock() {
37
+    var clock = document.querySelector(".closed-registrations-message .clock");
38
+    var now = new Date();
39
+    var open = getNextOpen(now);
40
+
41
+    if (open == "refresh") {
42
+        location.reload();
43
+        return;
44
+    }
45
+
46
+    var until = open - now;
47
+    var ms = until % 1000;
48
+    var s =  Math.floor((until / 1000)) % 60;
49
+    var m =  Math.floor((until / 1000 / 60)) % 60;
50
+    var h =  Math.floor((until / 1000 / 60 / 60));
51
+    if (m < 10) m = "0" + m;
52
+    if (s < 10) s = "0" + s;
53
+    clock.innerHTML = h + ":" + m + ":" + s;
54
+}

+ 17
- 1
public/emoji/1f418.svg
File diff suppressed because it is too large
View File


BIN
public/favicon.ico View File


BIN
public/header.jpeg View File


BIN
public/logo-cybre-glitch.gif View File


BIN
public/logo-cybre.png View File


BIN
public/mstile-150x150.png View File


BIN
public/riot-glitch.png View File