diff options
| author | shpuld <shpuld@gmail.com> | 2017-03-05 19:00:35 +0200 |
|---|---|---|
| committer | shpuld <shpuld@gmail.com> | 2017-03-05 19:00:35 +0200 |
| commit | e19bfb9a22f1db562de7079b71dee6e53a8a54fb (patch) | |
| tree | 8f12ac8f21679e036f42e0a156f345bf4d0f2156 /src/components/timeline/timeline.js | |
| parent | 015bf78dd9b17a1eac11119e38d8e83be8d791ae (diff) | |
| parent | 049c74f8e87e0aa19ee416bb72c987296a3e2dc9 (diff) | |
Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else.
Diffstat (limited to 'src/components/timeline/timeline.js')
| -rw-r--r-- | src/components/timeline/timeline.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index addd0255..b4e80fe1 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -5,7 +5,8 @@ import StatusOrConversation from '../status_or_conversation/status_or_conversati const Timeline = { props: [ 'timeline', - 'timelineName' + 'timelineName', + 'title' ], components: { Status, |