Skip to content

Commit

Permalink
Fix style issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@blablacio
blablacio committed Mar 23, 2016
1 parent 2249ba3 commit 14ad252
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 30 deletions.
38 changes: 27 additions & 11 deletions static/styles/zulip.css
View file
Expand Up @@ -3200,7 +3200,8 @@ div.edit_bot {
}

.edit_bot_form .control-label,
#create_bot_form .control-label {
#create_bot_form .control-label,
.admin-emoji-form .control-label {
width: 10em;
text-align: right;
margin-right: 20px;
Expand Down Expand Up @@ -3351,21 +3352,23 @@ div.edit_bot {
}

#administration .settings-section .admin-realm-form,
#administration .settings-section .admin-emoji-form,
#settings .settings-section .account-settings-form,
#settings .settings-section .new-bot-form,
#emoji-settings .new-emoji-form,
#settings .settings-section .edit-bot-form-box {
width: 400px;
margin: auto;
}

#administration .settings-section .admin-realm-form,
#settings .settings-section .new-bot-form,
#emoji-settings .new-emoji-form,
#settings .settings-section .edit-bot-form-box {
margin-top: 35px;
}

#settings .settings-section .new-bot-section-title {
#settings .settings-section .new-bot-section-title,
#emoji-settings .new-emoji-section-title {
top: 20px;
left: 20px;
}
Expand All @@ -3378,12 +3381,14 @@ div.edit_bot {

#settings .settings-section .account-settings-form .control-label,
#settings .settings-section .new-bot-form .control-label,
#emoji-settings .new-emoji-form .control-label,
#settings .settings-section .edit-bot-form-box .control-label {
width: 120px;
}

#settings .settings-section .account-settings-form .controls,
#settings .settings-section .new-bot-form .controls,
#emoji-settings .new-emoji-form .controls,
#settings .settings-section .edit-bot-form-box .controls {
margin-left: 140px;
}
Expand Down Expand Up @@ -3451,7 +3456,8 @@ div.edit_bot {
}

#settings .bot-information-box,
#settings .add-new-bot-box {
#settings .add-new-bot-box,
#emoji-settings .add-new-emoji-box {
background: #e3e3e3;
padding: 10px;
margin-left: 38px;
Expand All @@ -3462,7 +3468,8 @@ div.edit_bot {
font-size: 14px;
}

#settings .add-new-bot-box {
#settings .add-new-bot-box,
#emoji-settings .add-new-emoji-box {
background: #cbe3cb;
}

Expand Down Expand Up @@ -3512,14 +3519,16 @@ div.edit_bot {


#settings .settings-section .new-bot-form .control-label,
#emoji-settings .new-emoji-form .control-label,
#settings .settings-section .edit-bot-form-box .control-label {
float: left;
width: 120px;
padding-top: 0;
text-align: right;
}

#settings .settings-section .new-bot-form .controls {
#settings .settings-section .new-bot-form .controls,
#emoji-settings .new-emoji-form .controls {
margin-left: 110px;
}

Expand All @@ -3534,6 +3543,7 @@ div.edit_bot {
#administration .settings-section .organization-settings .admin-realm-form,
#settings .settings-section .account-settings-form,
#settings .settings-section .new-bot-form,
#emoji-settings .new-emoji-form,
#settings .settings-section .notification-settings-form,
#settings .settings-section .display-settings-form,
#settings .settings-section .edit-bot-form-box {
Expand All @@ -3543,6 +3553,7 @@ div.edit_bot {
#administration .settings-section .admin-realm-form .control-label,
#settings .settings-section .account-settings-form .control-label,
#settings .settings-section .new-bot-form .control-label,
#emoji-settings .new-emoji-form .control-label,
#settings .settings-section .edit-bot-form-box .control-label {
display: block;
width: 120px;
Expand All @@ -3556,6 +3567,7 @@ div.edit_bot {
#administration .settings-section .admin-realm-form .controls,
#settings .settings-section .account-settings-form .controls,
#settings .settings-section .new-bot-form .controls,
#emoji-settings .new-emoji-form .controls,
#settings .settings-section .edit-bot-form-box .controls {
margin: auto;
text-align: center;
Expand All @@ -3566,13 +3578,16 @@ div.edit_bot {
#settings .settings-section .account-settings-form .controls button,
#settings .settings-section .account-settings-form .controls input,
#settings .settings-section .new-bot-form .controls button,
#emoji-settings .new-emoji-form .controls button,
#settings .settings-section .edit-bot-form-box .controls button,
#settings .settings-section .new-bot-form .controls input,
#emoji-settings .new-emoji-form .controls input,
#settings .settings-section .edit-bot-form-box .controls input {
margin: auto;
}

#settings .settings-section .new-bot-form {
#settings .settings-section .new-bot-form,
#emoji-settings .new-emoji-form {
padding: 0px;
width: 100%;
text-align: center;
Expand Down Expand Up @@ -4188,12 +4203,13 @@ li.show-more-private-messages a {

.admin_emoji_table {
margin: 20px auto;
width: 90%;
}

.admin_emoji_table caption {
font-size: 18px;
}
.admin_emoji_table th.actions,
.admin_emoji_table th.image {width: 80px;}

.emoji_image {width: 50px; display: block;}
.emoji_image img {max-width: 100%;}

#admin-emoji-name-status, #admin-emoji-url-status {
margin: 20px 0 0 0;
Expand Down
44 changes: 25 additions & 19 deletions static/templates/admin_tab.handlebars
View file
Expand Up @@ -59,32 +59,38 @@
<input type="submit" class="btn btn-big btn-primary" value="Save changes" />
</div>
</form>
</div>
<div id="emoji-settings" class="settings-section">
<div class="settings-section-title"><i class="icon-vector-smile settings-section-icon"></i>
Custom realm emoji</div>
<table class="table table-condensed table-striped admin_emoji_table">
<caption>Custom realm emoji:</caption>
<tbody id="admin_emoji_table">
<th>Name</th>
<th>Image</th>
<th>Actions</th>
<th class="image">Image</th>
<th class="actions">Actions</th>
</tbody>
</table>
<form class="form-horizontal admin-emoji-form">
<div class="control-group">
<div class="alert" id="admin-emoji-status"></div>
<label for="emoji_name" class="control-label">Emoji name</label>
<div class="controls">
<input type="text" name="name" id="emoji_name" placeholder="MouseFace" />
</div>
<div class="alert" id="admin-emoji-name-status"></div>
</div>
<div class="control-group">
<label for="emoji_url" class="control-label">Emoji URL</label>
<div class="controls">
<input type="text" name="url" id="emoji_url" placeholder="http://emojipedia-us.s3.amazonaws.com/cache/46/7f/467fe69069c408e07517621f263ea9b5.png" />
<div class="add-new-emoji-box">
<div class="new-emoji-form">
<div class="settings-section-title new-emoji-section-title">Add a New Emoji</div>
<div class="alert" id="admin-emoji-status"></div>
<div class="control-group">
<label for="emoji_name" class="control-label">Emoji name</label>
<input type="text" name="name" id="emoji_name" placeholder="MouseFace" />
<div class="alert" id="admin-emoji-name-status"></div>
</div>
<div class="control-group">
<label for="emoji_url" class="control-label">Emoji URL</label>
<input type="text" name="url" id="emoji_url" placeholder="http://emojipedia-us.s3.amazonaws.com/cache/46/7f/467fe69069c408e07517621f263ea9b5.png" />
<div class="alert" id="admin-emoji-url-status"></div>
</div>
<div class="control-group">
<div class="controls">
<input type="submit" class="btn btn-big btn-primary" value="Add emoji" />
</div>
</div>
</div>
<div class="alert" id="admin-emoji-url-status"></div>
</div>
<div class="controls">
<input type="submit" class="btn btn-big btn-primary" value="Add emoji" />
</div>
</form>
</div>
Expand Down

0 comments on commit 14ad252

Please sign in to comment.