From 9c733b42df5263ce4b4059ae07562d86acee8a36 Mon Sep 17 00:00:00 2001 From: Ryan Rehman Date: Sun, 24 May 2020 18:57:58 +0530 Subject: [PATCH] minor: Rename loading_more_messages_indicator. `loading_more_messages_indicator` is renamed to `loading_older_messages_indicator`. This is a prep commit to introduce `loading_newer_messages_indicator`. --- static/js/message_scroll.js | 14 +++++++------- static/styles/night_mode.scss | 2 +- static/styles/zulip.scss | 6 +++--- templates/zerver/app/home.html | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/static/js/message_scroll.js b/static/js/message_scroll.js index 66ac5053dd..6d5b905e78 100644 --- a/static/js/message_scroll.js +++ b/static/js/message_scroll.js @@ -1,19 +1,19 @@ let actively_scrolling = false; -let loading_more_messages_indicator_showing = false; +let loading_older_messages_indicator_showing = false; exports.show_loading_older = function () { - if (!loading_more_messages_indicator_showing) { - loading.make_indicator($('#loading_more_messages_indicator'), + if (!loading_older_messages_indicator_showing) { + loading.make_indicator($('#loading_older_messages_indicator'), {abs_positioned: true}); - loading_more_messages_indicator_showing = true; + loading_older_messages_indicator_showing = true; floating_recipient_bar.hide(); } }; exports.hide_loading_older = function () { - if (loading_more_messages_indicator_showing) { - loading.destroy_indicator($("#loading_more_messages_indicator")); - loading_more_messages_indicator_showing = false; + if (loading_older_messages_indicator_showing) { + loading.destroy_indicator($("#loading_older_messages_indicator")); + loading_older_messages_indicator_showing = false; } }; diff --git a/static/styles/night_mode.scss b/static/styles/night_mode.scss index 516aa5b402..100a36dff1 100644 --- a/static/styles/night_mode.scss +++ b/static/styles/night_mode.scss @@ -692,7 +692,7 @@ on a dark background, and don't change the dark labels dark either. */ color: hsl(200, 79%, 66%); } - #loading_more_messages_indicator path { + #loading_older_messages_indicator path { fill: hsl(0, 0%, 100%); } diff --git a/static/styles/zulip.scss b/static/styles/zulip.scss index b65d8873bf..b9c776a206 100644 --- a/static/styles/zulip.scss +++ b/static/styles/zulip.scss @@ -2011,16 +2011,16 @@ div.floating_recipient { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; } -#loading_more_messages_indicator { +#loading_older_messages_indicator { margin: 10px; } -#loading_more_messages_indicator_box_container { +#loading_older_messages_indicator_box_container { position: absolute; left: 50%; } -#loading_more_messages_indicator_box { +#loading_older_messages_indicator_box { position: relative; left: -50%; top: -43px; diff --git a/templates/zerver/app/home.html b/templates/zerver/app/home.html index c5b9213d9f..85acc0f8d7 100644 --- a/templates/zerver/app/home.html +++ b/templates/zerver/app/home.html @@ -29,7 +29,7 @@ {% endtrans %}

-
+

{% trans %}Welcome to Zulip.{% endtrans %}