fix mikutter announcements style conflicting with new admin announcem…

…ents style.
Na0ki · Jan 31, 2020 · 7d05662 · 7d05662
1 parent 446e203
commit 7d05662
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/app/javascript/mastodon/features/compose/components/announcements.js b/app/javascript/mastodon/features/compose/components/announcements.js
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import axios from 'axios';
 import classnames from 'classnames';
 
-class Announcement extends React.PureComponent {
+class MikutterAnnouncement extends React.PureComponent {
 
   static propTypes = {
     item: ImmutablePropTypes.map,
@@ -16,10 +16,10 @@ class Announcement extends React.PureComponent {
     const { item } = this.props;
 
     const contents = [];
-    contents.push(<div key='body' className='announcements__body'>{item.get('text')}</div>);
+    contents.push(<div key='body' className='mikutter__announcements__body'>{item.get('text')}</div>);
     if (item.get('icon')) {
       contents.push(
-        <div key='icon' className='announcements__icon'>
+        <div key='icon' className='mikutter__announcements__icon'>
           <img src={item.get('icon')} alt='' />
         </div>
       );
@@ -28,8 +28,8 @@ class Announcement extends React.PureComponent {
     const url = item.get('url');
 
     const classname = classnames({
-      'announcements__item': true,
-      'announcements__item--clickable': !!url,
+      'mikutter__announcements__item': true,
+      'mikutter__announcements__item--clickable': !!url,
     });
 
     if (!url) {
@@ -50,7 +50,7 @@ const validTimeout = (items, now) => {
   return Math.min(nextTick, ONE_DAY);
 };
 
-export default class Announcements extends React.PureComponent {
+export default class MikutterAnnouncements extends React.PureComponent {
 
   state = {
     items: Immutable.List(),
@@ -91,9 +91,9 @@ export default class Announcements extends React.PureComponent {
     }
 
     return (
-      <ul className='announcements'>
+      <ul className='mikutter__announcements'>
         <li>
-          <Announcement item={items.get(0)} />
+          <MikutterAnnouncement item={items.get(0)} />
         </li>
       </ul>
     );

diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
@@ -17,7 +17,7 @@ import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
 import { mascot } from '../../initial_state';
 import Icon from 'mastodon/components/icon';
 import { logOut } from 'mastodon/utils/log_out';
-import Announcements from './components/announcements';
+import MikutterAnnouncements from './components/announcements';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -129,7 +129,7 @@ class Compose extends React.PureComponent {
 
             <ComposeFormContainer />
 
-            <Announcements />
+            <MikutterAnnouncements />
 
             <div className='drawer__inner__mastodon'>
               <img alt='' draggable='false' src={mascot || elephantUIPlane} />

diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.js b/app/javascript/mastodon/features/ui/components/compose_panel.js
@@ -3,14 +3,14 @@ import SearchContainer from 'mastodon/features/compose/containers/search_contain
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
 import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
 import LinkFooter from './link_footer';
-import Announcements from 'mastodon/features/compose/components/announcements';
+import MikutterAnnouncements from 'mastodon/features/compose/components/announcements';
 
 const ComposePanel = () => (
   <div className='compose-panel'>
     <SearchContainer openInRoute />
     <NavigationContainer />
     <ComposeFormContainer singleColumn />
-    <Announcements />
+    <MikutterAnnouncements />
     <LinkFooter withHotkeys />
   </div>
 );

diff --git a/app/javascript/styles/mods/announcements.scss b/app/javascript/styles/mods/announcements.scss
@@ -1,6 +1,6 @@
 @import '../mastodon/variables';
 
-.announcements__item {
+.mikutter__announcements__item {
   display: flex;
   padding: 10px;
   margin: 10px;
@@ -16,11 +16,11 @@
   }
 }
 
-.announcements__body {
+.mikutter__announcements__body {
   flex: 1 1 auto;
 }
 
-.announcements__icon {
+.mikutter__announcements__icon {
   flex: 0 0 auto;
   height: 40px;
   width: 40px;