Merge 9d2e41a547 into 624c024766

app/javascript/mastodon/components/button/button.stories.tsx

@@ -8,7 +8,6 @@ const meta = {
   component: Button,
   args: {
     secondary: false,
-    plain: false,
     compact: false,
     dangerous: false,
     disabled: false,
@@ -58,14 +57,6 @@ export const Secondary: Story = {
   play: buttonTest,
 };
 
-export const Plain: Story = {
-  args: {
-    plain: true,
-    children: 'Plain button',
-  },
-  play: buttonTest,
-};
-
 export const Compact: Story = {
   args: {
     compact: true,
@@ -110,14 +101,6 @@ export const SecondaryDisabled: Story = {
   play: disabledButtonTest,
 };
 
-export const PlainDisabled: Story = {
-  args: {
-    ...Plain.args,
-    disabled: true,
-  },
-  play: disabledButtonTest,
-};
-
 const loadingButtonTest: Story['play'] = async ({
   args,
   canvas,

app/javascript/mastodon/components/button/index.tsx

@@ -9,7 +9,6 @@ interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
-  plain?: boolean;
   compact?: boolean;
   dangerous?: boolean;
   loading?: boolean;
@@ -36,7 +35,6 @@ export const Button: React.FC<Props> = ({
   disabled,
   block,
   secondary,
-  plain,
   compact,
   dangerous,
   loading,
@@ -64,7 +62,6 @@ export const Button: React.FC<Props> = ({
     <button
       className={classNames('button', className, {
         'button-secondary': secondary,
-        'button--plain': plain,
         'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,

app/javascript/styles/mastodon/components.scss

@@ -201,41 +201,6 @@
     }
   }
 
-  &.button--plain {
-    color: $highlight-text-color;
-    background: transparent;
-    padding: 6px;
-
-    // The button has no outline, so we use negative margin to
-    // visually align its label with its surroundings while maintaining
-    // a generous click target
-    margin-inline: -6px;
-    border: 1px solid transparent;
-
-    &:active,
-    &:focus,
-    &:hover {
-      border-color: transparent;
-      color: lighten($highlight-text-color, 4%);
-      background-color: transparent;
-      text-decoration: none;
-    }
-
-    &:disabled,
-    &.disabled {
-      opacity: 0.7;
-      border-color: transparent;
-      color: $ui-button-disabled-color;
-
-      &:active,
-      &:focus,
-      &:hover {
-        border-color: transparent;
-        color: $ui-button-disabled-color;
-      }
-    }
-  }
-
   &.button-tertiary {
     background: transparent;
     padding: 6px 17px;

app/serializers/activitypub/note_serializer.rb

@@ -232,15 +232,6 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
       canQuote: {
         automaticApproval: approved_uris,
       },
-      canReply: {
-        always: 'https://www.w3.org/ns/activitystreams#Public',
-      },
-      canLike: {
-        always: 'https://www.w3.org/ns/activitystreams#Public',
-      },
-      canAnnounce: {
-        always: 'https://www.w3.org/ns/activitystreams#Public',
-      },
     }
   end
 

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.92.0
-  resolution: "sass@npm:1.92.0"
+  version: 1.91.0
+  resolution: "sass@npm:1.91.0"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -11969,7 +11969,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/bdff9fa6988620e2a81962efdd016e3894d19934cfadc105cf41db767f59dd47afd8ff32840e612ef700cb67e19d9e83c108f1724eb8f0bef56c4877dbe6f14d
+  checksum: 10c0/5be1c98f7a618cb5f90b62f63d2aa0f78f9bf369c93ec7cd9880752a26b0ead19aa63cc341e8a26ce6c74d080baa5705f1685dff52fe6a3f28a7828ae50182b6
   languageName: node
   linkType: hard