Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Layout fixes for settings page 

(imported from commit 5bb99ee33b22625ad4101daf08ae36118d190b8f)
This commit is contained in:
Allen Rabinovich 2013-11-22 11:50:39 -08:00
parent c3f4ab6c94
commit 1d4a92ec0e
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
static/styles/zulip.css
View File

@ -1964,6 +1964,23 @@ table.floating_recipient {
line-height: 38px; line-height: 38px;
} }
.settings-section .loading_indicator_text {
font-size: 12px;
font-weight: 400;
vertical-align: middle;
line-height: 20px;
display: inline-block;
float: none;
}
.settings-section .loading_indicator_spinner {
width: 12px;
height: 12px;
vertical-align: middle;
display: inline-block;
}
.message_inline_image { .message_inline_image {
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 5px; margin-left: 5px;
@ -2841,6 +2858,10 @@ div.edit_bot {
margin-right: 20px; margin-right: 20px;
} }
.upload_avatar_spinner {
font-size: 14px;
}
.edit_bot_avatar_clear_button, .edit_bot_avatar_clear_button,
#user_avatar_clear_button, #user_avatar_clear_button,
#bot_avatar_clear_button { #bot_avatar_clear_button {
@ -2958,6 +2979,14 @@ div.edit_bot {
position: relative; position: relative;
} }
#settings #notify-settings-status {
width: 80%;
text-align: center;
margin: auto;
margin-top: 10px;
margin-bottom: 10px;
}
#settings .settings-section .account-settings-form, #settings .settings-section .account-settings-form,
#settings .settings-section .new-bot-form, #settings .settings-section .new-bot-form,
#settings .settings-section .edit-bot-form-box { #settings .settings-section .edit-bot-form-box {

27
templates/zerver/settings.html
View File

@ -67,17 +67,6 @@
</div> </div>
{% endif %} {% endif %}
<div class="control-group">
<div class="controls">
<input type="submit" name="change_settings"
value="Save changes" class="btn btn-big btn-primary" />
</div>
</div>
</form>
<div id="user_avatar_file_input_error" class="text-error"></div> <div id="user_avatar_file_input_error" class="text-error"></div>
<div class="control-group"> <div class="control-group">
@ -88,24 +77,30 @@
<p> <p>
<img id="user-settings-avatar" src="{{ avatar_url }}" /> <img id="user-settings-avatar" src="{{ avatar_url }}" />
</p> </p>
</div>
</div>
<div id="upload_avatar_spinner"></div> <div id="upload_avatar_spinner"></div>
</div>
</div>
<div class="control-group">
<div class="controls">
<input type="submit" name="change_settings"
value="Save changes" class="btn btn-big btn-primary" />
</div>
</div>
</form>
</div> </div>
</div> </div>
<div class="alert" id="notify-settings-status"></div>
<form action="/json/notify_settings/change" method="post" <form action="/json/notify_settings/change" method="post"
class="form-horizontal notify-settings">{% csrf_token %} class="form-horizontal notify-settings">{% csrf_token %}
<div id="notification-settings" class="settings-section"> <div id="notification-settings" class="settings-section">
<div class="settings-section-title"><i class="icon-vector-warning-sign settings-section-icon"></i>Notifications <i class="tiny icon-vector-question-sign" id="notification-docs"></i></div> <div class="settings-section-title"><i class="icon-vector-warning-sign settings-section-icon"></i>Notifications <i class="tiny icon-vector-question-sign" id="notification-docs"></i></div>
<div class="alert" id="notify-settings-status"></div>
<div class="notification-settings-form"> <div class="notification-settings-form">
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">