about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvoidSatisfaction <lourie@naver.com>2017-09-07 00:32:15 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-06 17:32:15 +0200
commit13ffa3c59e1a2727b287b2e6cde47f39c14ae815 (patch)
tree3dd91e61b2c01caf35a28e76ec2db323e06faa74
parentaec5097d44212455e3662c77f6b3f1f76e2570d6 (diff)
Add Smartphone screen favourite back button and adjust styles (#4813)
* Feat add get-back button on favourite columnHeader

* Style adjust nice looking get-back button

* Fix delete media query and add padding right

* fix: restore padding and add lastchild style for back-button
-rw-r--r--app/javascript/mastodon/features/favourited_statuses/index.js1
-rw-r--r--app/javascript/styles/components.scss4
2 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 82b16b369..1e1f5873c 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -77,6 +77,7 @@ export default class Favourites extends ImmutablePureComponent {
           onClick={this.handleHeaderClick}
           pinned={pinned}
           multiColumn={multiColumn}
+          showBackButton
         />
 
         <StatusList
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index bd7d0c3d4..7fd16f6b3 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1622,6 +1622,10 @@
   &:hover {
     text-decoration: underline;
   }
+
+  &:last-child {
+    padding: 0 15px 0 0;
+  }
 }
 
 .column-back-button__icon {