All cybrespace changes through 5/28

9 files changed, 59 insertions, 47 deletions

diff --git a/app/javascript/images/background-cybre.png b/app/javascript/images/background-cybre.png
new file mode 100644
index 000000000..151fd5584
--- /dev/null
+++ b/app/javascript/images/background-cybre.png
Binary files differdiff --git a/app/javascript/images/logo-cybre.png b/app/javascript/images/logo-cybre.png
new file mode 100644
index 000000000..41dd8fd4c
--- /dev/null
+++ b/app/javascript/images/logo-cybre.png
Binary files differdiff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index edb2d6eb0..a8ac7a70a 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -140,7 +140,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
       <div className='status__action-bar'>
         <IconButton className='status__action-bar-button' title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
         <IconButton className='status__action-bar-button' disabled={reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
-        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} />
 
         <div className='status__action-bar-dropdown'>
           <DropdownMenu items={menu} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index f8ea01024..c8490abe9 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -10,19 +10,19 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
   heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
-  home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
-  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
-  public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
+  home_timeline: { id: 'tabs_bar.home', defaultMessage: '/timelines/home' },
+  notifications: { id: 'tabs_bar.notifications', defaultMessage: '~/.notifications' },
+  public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: '/timelines/federated' },
   navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
-  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+  community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: '/timelines/local' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
-  sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
-  favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
-  blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
-  mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
-  info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
+  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: '~/.follow-requests' },
+  sign_out: { id: 'navigation_bar.logout', defaultMessage: 'exit' },
+  favourites: { id: 'navigation_bar.favourites', defaultMessage: '~/.florps' },
+  blocks: { id: 'navigation_bar.blocks', defaultMessage: '~/.blocked' },
+  mutes: { id: 'navigation_bar.mutes', defaultMessage: '~/.muted' },
+  info: { id: 'navigation_bar.info', defaultMessage: '/about/more' },
 });
 
 const mapStateToProps = state => ({
@@ -65,7 +65,7 @@ export default class GettingStarted extends ImmutablePureComponent {
     }
 
     navItems = navItems.concat([
-      <ColumnLink key='4' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
+      <ColumnLink key='4' icon='floppy-o' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
     ]);
 
     if (me.get('locked')) {
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 9d631644a..0a4ba0214 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -39,7 +39,7 @@ export default class Notification extends ImmutablePureComponent {
       <div className='notification notification-favourite'>
         <div className='notification__message'>
           <div className='notification__favourite-icon-wrapper'>
-            <i className='fa fa-fw fa-star star-icon' />
+            <i className='fa fa-fw fa-floppy-o star-icon'/>
           </div>
           <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
         </div>
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 29080529d..03779c2c1 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -82,7 +82,7 @@ export default class ActionBar extends React.PureComponent {
       <div className='detailed-status__action-bar'>
         <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>
         <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>
-        <div className='detailed-status__button'><IconButton animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} activeStyle={{ color: '#ca8f04' }} /></div>
+        <div className='detailed-status__button'><IconButton animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} activeStyle={{ color: '#ca8f04' }} /></div>
 
         <div className='detailed-status__action-bar-dropdown'>
           <DropdownMenu size={18} icon='ellipsis-h' items={menu} direction='left' ariaLabel='More' />
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 619957dbe..6f2415965 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -76,7 +76,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
               <FormattedNumber value={status.get('reblogs_count')} />
             </span>
           </Link> · <Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
-            <i className='fa fa-star' />
+            <i className='fa fa-floppy-o' />
             <span className='detailed-status__favorites'>
               <FormattedNumber value={status.get('favourites_count')} />
             </span>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 608d911e9..84579f188 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -2,7 +2,7 @@
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
   "account.disclaimer": "This user is from another instance. This number may be larger.",
-  "account.edit_profile": "Edit profile",
+  "account.edit_profile": "edit ~/.profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
   "account.follows": "Follows",
@@ -10,7 +10,7 @@
   "account.media": "Media",
   "account.mention": "Mention @{name}",
   "account.mute": "Mute @{name}",
-  "account.posts": "Posts",
+  "account.posts": "Pings",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
   "account.unblock": "Unblock @{name}",
@@ -18,14 +18,14 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
-  "column.blocks": "Blocked users",
-  "column.community": "Local timeline",
-  "column.favourites": "Favourites",
-  "column.follow_requests": "Follow requests",
-  "column.home": "Home",
-  "column.mutes": "Muted users",
-  "column.notifications": "Notifications",
-  "column.public": "Federated timeline",
+  "column.blocks": "~/.blocked",
+  "column.community": "/timelines/local",
+  "column.favourites": "~/.florps",
+  "column.follow_requests": "~/.follow-requests",
+  "column.home": "/timelines/home",
+  "column.mutes": "~/.muted",
+  "column.notifications": "~/.notifications",
+  "column.public": "/timelines/federated",
   "column_back_button.label": "Back",
   "column_header.pin": "Pin",
   "column_header.unpin": "Unpin",
@@ -33,9 +33,9 @@
   "column_subheading.settings": "Settings",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
-  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.placeholder": "What is in your databanks?",
   "compose_form.privacy_disclaimer": "Your post will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is not a public post, and it may be boosted or otherwise made visible to unintended recipients.",
-  "compose_form.publish": "Toot",
+  "compose_form.publish": "Ping",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Mark media as sensitive",
   "compose_form.spoiler": "Hide text behind warning",
@@ -61,7 +61,7 @@
   "emoji_button.travel": "Travel & Places",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "You aren't following anyone yet. Visit {public} or use search to get started and meet other users.",
+  "empty_column.home": "You aren't following anyone yet. Visit {public} or use query to get started and meet other users.",
   "empty_column.home.inactivity": "Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon.",
   "empty_column.home.public_timeline": "the public timeline",
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
@@ -76,24 +76,24 @@
   "home.column_settings.advanced": "Advanced",
   "home.column_settings.basic": "Basic",
   "home.column_settings.filter_regex": "Filter out by regular expressions",
-  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_reblogs": "Show relays",
   "home.column_settings.show_replies": "Show replies",
   "home.settings": "Column settings",
   "lightbox.close": "Close",
   "loading_indicator.label": "Loading...",
   "media_gallery.toggle_visible": "Toggle visibility",
   "missing_indicator.label": "Not found",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.edit_profile": "Edit profile",
-  "navigation_bar.favourites": "Favourites",
-  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.info": "About this instance",
-  "navigation_bar.logout": "Logout",
-  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.blocks": "~/.blocks",
+  "navigation_bar.community_timeline": "/timelines/local",
+  "navigation_bar.edit_profile": "edit ~/.profile",
+  "navigation_bar.favourites": "~/.florps",
+  "navigation_bar.follow_requests": "~/.follow-requests",
+  "navigation_bar.info": "/about/more",
+  "navigation_bar.logout": "Jack out",
+  "navigation_bar.mutes": "~/.muted",
   "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
-  "notification.favourite": "{name} favourited your status",
+  "navigation_bar.public_timeline": "/timelines/federated",
+  "notification.favourite": "{name} florped your ping",
   "notification.follow": "{name} followed you",
   "notification.mention": "{name} mentioned you",
   "notification.reblog": "{name} boosted your status",
@@ -140,18 +140,18 @@
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
-  "search.placeholder": "Search",
+  "search.placeholder": "Query...",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
-  "status.cannot_reblog": "This post cannot be boosted",
+  "status.cannot_reblog": "This ping cannot be relayed",
   "status.delete": "Delete",
-  "status.favourite": "Favourite",
+  "status.favourite": "Florp",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this status",
-  "status.reblog": "Boost",
-  "status.reblogged_by": "{name} boosted",
+  "status.reblog": "Relay",
+  "status.reblogged_by": "{name} relayed",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
diff --git a/app/javascript/styles/custom.scss b/app/javascript/styles/custom.scss
index 8c6c12316..aa3fb9f0c 100644
--- a/app/javascript/styles/custom.scss
+++ b/app/javascript/styles/custom.scss
@@ -12,13 +12,25 @@ body {
 @media screen and (min-width: 1300px) { 
   .column {
     flex-grow: 1 !important;
-    max-width: 400px;
+    max-width: 500px;
   }
 
   .drawer {
-    width: 17%;
-    max-width: 400px;
+    width: 20%;
   }
+
+  .columns-area { 
+    justify-content: center; 
+  } 
+}
+
+@media screen and (min-width: 1900px) { 
+  .column, .drawer { 
+    width: 400px; 
+    border-radius: 4px; 
+    height: 96vh; 
+    margin-top: 2vh; 
+  } 
 }
 
 .muted {