Merge pull request #129 from henrywright/128

Replaced inline styles where possible
main
psychobunny 10 years ago
commit 0ce20291d1

@ -3,7 +3,7 @@
<div class="account"> <div class="account">
<div class="row"> <div class="row">
<div class="col-md-2" style="text-align: center; margin-bottom:20px;"> <div class="col-md-2">
<div class="account-picture-block text-center"> <div class="account-picture-block text-center">
<img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br /><br /> <img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br /><br />
<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a> <a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
@ -98,43 +98,41 @@
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div style="vertical-align:top;"> <form class='form-horizontal'>
<form class='form-horizontal'> <!-- IF isSelf -->
<!-- IF isSelf --> <div class="control-group">
<div class="control-group"> <label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label> <div class="controls">
<div class="controls"> <input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
</div>
</div>
<!-- ENDIF isSelf -->
<div class="control-group">
<label class="control-label" for="inputNewPassword">[[user:password]]</label>
<div class="input-group">
<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
<span class="input-group-addon">
<span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
</span>
</div>
</div> </div>
</div>
<!-- ENDIF isSelf -->
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label> <label class="control-label" for="inputNewPassword">[[user:password]]</label>
<div class="input-group"> <div class="input-group">
<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value=""> <input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
<span class="input-group-addon"> <span class="input-group-addon">
<span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span> <span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
</span> </span>
</div>
</div> </div>
<br/> </div>
<div class="form-actions">
<a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a> <div class="control-group">
<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
<div class="input-group">
<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
<span class="input-group-addon">
<span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
</span>
</div> </div>
</div>
<br/>
<div class="form-actions">
<a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
</div>
</form> </form>
</div>
</div> </div>
</div> </div>

@ -188,7 +188,7 @@
<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_colour]]</button> <button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_colour]]</button>
<input type="hidden" name="labelColor" value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" /> <input type="hidden" name="labelColor" value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" /> <input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
<div id="icons" style="display:none;"> <div id="icons" class="hidden">
<div class="icon-container"> <div class="icon-container">
<div class="row fa-icons"> <div class="row fa-icons">
<i class="fa fa-doesnt-exist"></i> <i class="fa fa-doesnt-exist"></i>

@ -10,7 +10,7 @@
<p> <p>
[[topic:disabled_categories_note]] [[topic:disabled_categories_note]]
</p> </p>
<div id="move-confirm" style="display: none;"> <div id="move-confirm" class="hidden">
<hr /> <hr />
<div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div> <div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div>
</div> </div>

@ -7,7 +7,7 @@
</span> </span>
<div class="topic-main-buttons pull-right"> <div class="topic-main-buttons pull-right">
<span class="loading-indicator btn pull-left" done="0" style="display:none;"> <span class="loading-indicator btn pull-left hidden" done="0">
<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i> <span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
</span> </span>
@ -25,6 +25,6 @@
<!-- IMPORT partials/thread_tools.tpl --> <!-- IMPORT partials/thread_tools.tpl -->
</div> </div>
<div style="clear:both;"></div> <div class="clearfix"></div>
<hr /> <hr />

@ -6,11 +6,11 @@
</div> </div>
<div class="well"> <div class="well">
<div class="alert alert-success" id="success" style="display:none"> <div class="alert alert-success hidden" id="success">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>[[reset_password:password_reset_sent]]</strong> <strong>[[reset_password:password_reset_sent]]</strong>
</div> </div>
<div class="alert alert-danger" id="error" style="display:none"> <div class="alert alert-danger hidden" id="error">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>[[reset_password:invalid_email]]</strong> <strong>[[reset_password:invalid_email]]</strong>
</div> </div>

@ -7,12 +7,12 @@
[[reset_password:password_expired]] [[reset_password:password_expired]]
</div> </div>
<!-- ENDIF displayExpiryNotice --> <!-- ENDIF displayExpiryNotice -->
<div class="alert alert-success" id="success" style="display:none"> <div class="alert alert-success hidden" id="success">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>[[reset_password:password_changed.title]]</strong> <strong>[[reset_password:password_changed.title]]</strong>
<p>[[reset_password:password_changed.message]]</p> <p>[[reset_password:password_changed.message]]</p>
</div> </div>
<div class="alert alert-warning" id="notice" style="display:none"> <div class="alert alert-warning hidden" id="notice">
<strong></strong> <strong></strong>
<p></p> <p></p>
</div> </div>

Loading…
Cancel
Save