Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json

less/chats.less

@@ -43,6 +43,7 @@
 			width:24px;
 			height:24px;
 			margin-left: 0.5em;
+			border-radius: 50%;
 		}
 	}
 }

less/header.less

@@ -129,6 +129,7 @@
 				max-width: 32px;
 				max-height: 32px;
 				float: left;
+				border-radius: 50%;
 			}
 
 			a {
@@ -208,6 +209,7 @@
 				img {
 					width: 32px;
 					margin-right: 1em;
+					border-radius: 50%;
 				}
 			}
 

less/notifications.less

@@ -34,6 +34,7 @@
 		.user-img {
 			width: 24px;
 			height: 24px;
+			border-radius: 50%;
 		}
 	}
 }

templates/account/edit.tpl

@@ -114,7 +114,7 @@
 						<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"><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>
 						</div>
 					</div>
@@ -124,7 +124,7 @@
 						<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"><i class="fa fa-circle-o"></i></span>
+								<span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
 							</span>
 						</div>
 					</div>

templates/account/favourites.tpl

@@ -7,7 +7,7 @@
 	<!-- ENDIF !posts.length -->
 
 	<div class="row">
-
+		<div class="col-xs-12">
 			<!-- IMPORT partials/posts_list.tpl -->
 
 			<!-- IF config.usePagination -->
@@ -15,5 +15,6 @@
 			<!-- ENDIF config.usePagination -->
 		</div>
 	</div>
+</div>
 
 <!-- IMPORT partials/variables/account.tpl -->

templates/account/groups.tpl

@@ -1,7 +1,7 @@
 
 <!-- IMPORT partials/account_menu.tpl -->
 
-<div id="groups-list" class="groups">
+<div component="groups/container" id="groups-list" class="groups row">
 	<!-- IF !groups.length -->
 	<div class="alert alert-warning">[[groups:no_groups_found]]</div>
 	<!-- ELSE -->

templates/account/posts.tpl

@@ -4,11 +4,11 @@
 <div class="favourites">
 
 	<!-- IF !posts.length -->
-	<div class="alert alert-info">[[user:has_no_posts]]</div>
+	<div class="alert alert-warning">[[user:has_no_posts]]</div>
 	<!-- ENDIF !posts.length -->
 
 	<div class="row">
-
+		<div class="col-xs-12">
 			<!-- IMPORT partials/posts_list.tpl -->
 
 			<!-- IF config.usePagination -->
@@ -16,5 +16,6 @@
 			<!-- ENDIF config.usePagination -->
 		</div>
 	</div>
+</div>
 
 <!-- IMPORT partials/variables/account.tpl -->

templates/account/profile.tpl

@@ -156,7 +156,7 @@
 
 		<div class="col-md-7">
 		<!-- IF !posts.length -->
-		<div class="alert alert-info">[[user:has_no_posts]]</div>
+		<div class="alert alert-warning">[[user:has_no_posts]]</div>
 		<!-- ENDIF !posts.length -->
 		<!-- IMPORT partials/posts_list.tpl -->
 		</div>

templates/chats.tpl

@@ -1,3 +1,4 @@
+<div class="row">
 	<div class="col-sm-9">
 		<!-- IF !allowed -->
 		<div class="alert alert-warning">
@@ -63,3 +64,4 @@
 			</div>
 		</div>
 	</div>
+</div>

templates/partials/topics_list.tpl

@@ -31,7 +31,7 @@
 
 				<span class="tag-list">
 					<!-- BEGIN tags -->
-					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag">{topics.tags.value}</span></a>
+					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.value}</span></a>
 					<!-- END tags -->
 					<!-- IF topics.tags.length --><small>&bull;</small><!-- ENDIF topics.tags.length -->
 				</span>

templates/unread.tpl

@@ -34,11 +34,11 @@
 			</button>
 			<ul class="dropdown-menu" role="menu">
 				<li role="presentation" class="category">
-					<a role="menu-item" href="/unread"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
+					<a role="menu-item" href="{config.relative_path}/unread"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
 				</li>
 				<!-- BEGIN categories -->
 				<li role="presentation" class="category" data-cid="{categories.cid}">
-					<a role="menu-item" href="/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
+					<a role="menu-item" href="{config.relative_path}/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
 				</li>
 				<!-- END categories -->
 			</ul>

templates/users.tpl

@@ -29,7 +29,7 @@
 		<!-- IMPORT partials/users_list.tpl -->
 		<!-- IF anonymousUserCount -->
 		<li class="users-box anon-user">
-			<img src="https://secure.gravatar.com/avatar/" />
+			<img src="{defaultGravatar}" />
 			<br/>
 			<div class="user-info">
 				<span id="online_anon_count">{anonymousUserCount}</span>