Making public pages responsive, removing reblogs/favs counts from them

8 files changed, 31 insertions, 57 deletions

diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index 571cee5c9..57da32856 100644
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@@ -8,6 +8,11 @@
   overflow: hidden;
   position: relative;
 
+  @media screen and (max-width: 700px) {
+    border-radius: 0;
+    box-shadow: none;
+  }
+
   &:after {
     background: rgba(0, 0, 0, 0.5);
     display: block;
@@ -192,6 +197,11 @@
   padding-bottom: 10px;
   overflow: hidden;
 
+  @media screen and (max-width: 700px) {
+    border-radius: 0;
+    box-shadow: none;
+  }
+
   .account-grid-card {
     box-sizing: border-box;
     width: 335px;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 1bae0b44e..917a2f9d9 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -69,6 +69,7 @@ body {
   padding-bottom: 140px;
   text-rendering: optimizelegibility;
   font-feature-settings: "kern";
+  min-width: 380px;
 
   &.app-body {
     position: fixed;
@@ -90,6 +91,11 @@ body {
   width: 700px;
   margin: 0 auto;
   margin-top: 40px;
+
+  @media screen and (max-width: 700px) {
+    width: 100%;
+    margin: 0;
+  }
 }
 
 .logo-container {
@@ -141,6 +147,7 @@ body {
 .form-container {
   width: 400px;
   margin: 0 auto;
+  padding: 20px;
 
   .field {
     margin-bottom: 15px;
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss
index d91ce20cf..a111ec1e6 100644
--- a/app/assets/stylesheets/stream_entries.scss
+++ b/app/assets/stylesheets/stream_entries.scss
@@ -56,11 +56,18 @@
     }
   }
 
-  &.activity-stream-embedded {
+  @media screen and (max-width: 700px) {
+    border-radius: 0;
     box-shadow: none;
 
-    .entry {
-      border-radius: 0;
+    &.activity-stream-headless {
+      .entry:first-child {
+        border-radius: 0;
+
+        &:last-child {
+          border-radius: 0;
+        }
+      }
     }
   }
 
@@ -76,7 +83,7 @@
       width: 56px;
       height: 56px;
       display: block;
-      border-radius: 56px;
+      border-radius: 4px;
     }
   }
 
@@ -96,27 +103,7 @@
     }
 
     .header__right {
-      .counter-btn {
-        color: #d9e1e8;
-        display: inline-block;
-        padding: 0 10px;
-        cursor: default;
 
-        .counter-number {
-          font-weight: 500;
-          display: inline-block;
-          margin-left: 3px;
-          font-size: 12px;
-        }
-
-        &.reblogged {
-          color: #2b90d9;
-        }
-
-        &.favourited {
-          color: #df405a;
-        }
-      }
     }
 
     .name {
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 55b1f3c45..9f4751771 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -8,15 +8,6 @@ class AccountsController < ApplicationController
     respond_to do |format|
       format.html do
         @statuses = @account.statuses.order('id desc').with_includes.with_counters.paginate(page: params[:page], per_page: 10)
-
-        if user_signed_in?
-          status_ids  = @statuses.collect { |s| [s.id, s.reblog_of_id] }.flatten.uniq
-          @favourited = Status.favourites_map(status_ids, current_user.account_id)
-          @reblogged  = Status.reblogs_map(status_ids, current_user.account_id)
-        else
-          @favourited = {}
-          @reblogged  = {}
-        end
       end
 
       format.atom do
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index fd8b97c9f..e1b664b08 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -11,15 +11,6 @@ class StreamEntriesController < ApplicationController
     if @stream_entry.activity_type == 'Status'
       @ancestors   = @stream_entry.activity.ancestors
       @descendants = @stream_entry.activity.descendants
-
-      if user_signed_in?
-        status_ids  = [@stream_entry.activity_id] + @ancestors.map(&:id) + @descendants.map(&:id)
-        @favourited = Status.favourites_map(status_ids, current_user.account_id)
-        @reblogged  = Status.reblogs_map(status_ids, current_user.account_id)
-      else
-        @favourited = {}
-        @reblogged  = {}
-      end
     end
 
     respond_to do |format|
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index 3681181e5..4f9b20942 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -14,9 +14,7 @@ class Favourite < ApplicationRecord
     "#{account.acct} favourited a status by #{status.account.acct}"
   end
 
-  def object_type
-    target.object_type
-  end
+  delegate :object_type, to: :target
 
   def thread
     status
diff --git a/app/models/user.rb b/app/models/user.rb
index 9c0546c2f..04f3eb02c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,8 +11,4 @@ class User < ApplicationRecord
   scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') }
   scope :recent,   -> { order('created_at desc') }
   scope :admins,   -> { where(admin: true) }
-
-  def admin?
-    admin
-  end
 end
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index 6254d75e9..4e74fa131 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -23,18 +23,12 @@
           = link_to TagManager.instance.url_for(proper_status(status).account), class: 'name' do
             %strong= display_name(proper_status(status).account)
             = "@#{proper_status(status).account.acct}"
+
+        .header__right
           = link_to TagManager.instance.url_for(proper_status(status)), class: 'time' do
             %span{ title: proper_status(status).created_at }
               = relative_time(proper_status(status).created_at)
 
-        .header__right
-          .counter-btn{ class: reblogged_by_me_class(proper_status(status)) }
-            %i.fa.fa-retweet
-            %span.counter-number= proper_status(status).reblogs_count
-          .counter-btn{ class: favourited_by_me_class(proper_status(status)) }
-            %i.fa.fa-star
-            %span.counter-number= proper_status(status).favourites_count
-
       .content= Formatter.instance.format(proper_status(status))
 
       %ul.media-attachments