diff --git a/static/styles/app_components.scss b/static/styles/app_components.scss index e31ae312ed..56f0e58916 100644 --- a/static/styles/app_components.scss +++ b/static/styles/app_components.scss @@ -410,3 +410,21 @@ margin: 0px 5px; top: 9px; } + +/* Standard loading indicators generated by the loading.js API */ +.loading_indicator_spinner { + /* If you change these, make sure to adjust the constants in + loading.make_indicator as well */ + height: 38px; + width: 38px; + float: left; +} + +.loading_indicator_text { + /* If you change these, make sure to adjust the constants in + loading.make_indicator as well */ + margin-left: 5px; + font-size: 1.2em; + font-weight: 300; + line-height: 38px; +} diff --git a/static/styles/settings.scss b/static/styles/settings.scss index 322f573d4d..502b45304f 100644 --- a/static/styles/settings.scss +++ b/static/styles/settings.scss @@ -362,6 +362,73 @@ td .button { .tip::before { content: "\f0a2"; } + + #admin_page_users_loading_indicator, + #attachments_loading_indicator, + #admin_page_deactivated_users_loading_indicator, + #admin_page_bots_loading_indicator { + margin: 0 auto; + } + + .loading_indicator_text { + font-size: 12px; + font-weight: 400; + vertical-align: middle; + line-height: 20px; + display: inline-block; + float: none; + margin-top: 9px; + } + + .loading_indicator_spinner { + width: 30%; + height: 30px; + margin-top: 7px; + vertical-align: middle; + display: inline-block; + } + + .realm-icon-section { + .loading_indicator_text, + .loading_indicator_text { + font-size: 14px; + font-weight: 400; + vertical-align: middle; + line-height: 20px; + display: inline-block; + float: none; + margin-top: 0px; + margin-left: -12px; + } + + .loading_indicator_spinner, + .loading_indicator_spinner { + width: 10%; + height: 16px; + margin-top: 2px; + vertical-align: middle; + display: inline-block; + } + } + + #default_language { + text-decoration: none; + } + + #default_language_modal { + table { + width: 90%; + margin-top: 20px; + } + + td { + padding-left: 80px; + } + } + + .inline { + display: inline !important; + } } #admin-user-list, diff --git a/static/styles/zulip.scss b/static/styles/zulip.scss index c4bfccea13..f9e0568e6e 100644 --- a/static/styles/zulip.scss +++ b/static/styles/zulip.scss @@ -2006,92 +2006,6 @@ div.floating_recipient { height: 300px; } -.loading_indicator_spinner { - /* If you change these, make sure to adjust the constants in - loading.make_indicator as well */ - height: 38px; - width: 38px; - float: left; -} - -.loading_indicator_text { - /* If you change these, make sure to adjust the constants in - loading.make_indicator as well */ - margin-left: 5px; - font-size: 1.2em; - font-weight: 300; - line-height: 38px; -} - -.settings-section { - #admin_page_users_loading_indicator, - #attachments_loading_indicator, - #admin_page_deactivated_users_loading_indicator, - #admin_page_bots_loading_indicator { - margin: 0 auto; - } - - .loading_indicator_text { - font-size: 12px; - font-weight: 400; - vertical-align: middle; - line-height: 20px; - display: inline-block; - float: none; - margin-top: 9px; - } - - .loading_indicator_spinner { - width: 30%; - height: 30px; - margin-top: 7px; - vertical-align: middle; - display: inline-block; - } - - .realm-icon-section { - .loading_indicator_text, - .loading_indicator_text { - font-size: 14px; - font-weight: 400; - vertical-align: middle; - line-height: 20px; - display: inline-block; - float: none; - margin-top: 0px; - margin-left: -12px; - } - - .loading_indicator_spinner, - .loading_indicator_spinner { - width: 10%; - height: 16px; - margin-top: 2px; - vertical-align: middle; - display: inline-block; - } - } - - #default_language { - text-decoration: none; - } - - #default_language_modal { - table { - width: 90%; - margin-top: 20px; - } - - td { - padding-left: 80px; - } - } - - .inline { - display: inline !important; - } -} - .operator_value { font-family: Monaco, Menlo, Consolas, "Courier New", monospace; color: hsl(353, 70%, 65%);