Merge pull request mastodon#18 from GenbuHase/v4

数種機能の廃止
GenbuHase · Jan 23, 2018 · 455cf2f · 455cf2f
2 parents fc3a796 + 06bccf5
commit 455cf2f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 24 deletions.
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -216,11 +216,6 @@ export default class ComposeForm extends ImmutablePureComponent {
         </div>
 
         <div className='compose-form__publish'>
-          <div className="user-counter__wrapper">
-            <i className="fa fa-users"></i>
-            <span>10人</span>
-          </div>
-
           <div className='compose-form__publish-button-wrapper'>
             <Button className="compose-form__utilBtns-risa" text={intl.formatMessage(messages.utilBtns_risa)} onClick={this.handleOnRisaSubmit} />
 

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
@@ -542,15 +542,6 @@
     min-width: 0;
     padding-top: 10px;
 
-    .user-counter__wrapper {
-      display: inline-flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-
-      flex: 1;
-    }
-
     .compose-form__publish-button-wrapper {
       overflow: hidden;
 

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
@@ -8,16 +8,6 @@
 
   = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
 
-  / Global site tag (gtag.js) - Google Analytics
-  - analytics_id = 'UA-112532720-2'
-  %script{ src: 'https://www.googletagmanager.com/gtag/js?id=#{analytics_id}', async: 'async' }
-  :javascript
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-
-    gtag('js', new Date());
-    gtag('config', '#{analytics_id}');
-
 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
     = image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'