topic cleanup and begin cerulean port

public/src/forum/topic.js

@@ -624,9 +624,9 @@
 			});
 		}
 
-		jQuery('.post-author-info').css('bottom', '0px');
+		jQuery('.mobile-author-info').css('bottom', '0px');
-		postAuthorImage = postAuthorImage || document.getElementById('post-author-image');
+		postAuthorImage = postAuthorImage || document.getElementById('mobile-author-image');
-		postAuthorInfo = postAuthorInfo || document.getElementById('post-author-info');
+		postAuthorInfo = postAuthorInfo || document.getElementById('mobile-author-info');
 		pagination = pagination || document.getElementById('pagination');
 
 		pagination.parentNode.style.display = 'block';

public/templates/topic.tpl

@@ -1,4 +1,5 @@
-<ol class="breadcrumb">
+<div class="topic">
+	<ol class="breadcrumb">
 		<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
 			<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
 		</li>
@@ -8,10 +9,10 @@
 		<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
 			<span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="icon-rss-sign"></i></a></span>
 		</li>
-	<div id="thread_active_users" class="hidden-xs"></div>
+		<div id="thread_active_users" class="active-users pull-right hidden-xs"></div>
-</ol>
+	</ol>
 
-<ul id="post-container" class="topic container" data-tid="{topic_id}">
+	<ul id="post-container" class="container" data-tid="{topic_id}">
 		<!-- BEGIN main_posts -->
 			<a id="post_anchor_{main_posts.pid}" name="{main_posts.pid}"></a>
 			<li class="row post-row main-post" data-pid="{main_posts.pid}" data-uid="{main_posts.uid}" data-username="{main_posts.username}" data-deleted="{main_posts.deleted}">
@@ -83,14 +84,10 @@
 					<a href="/users/{posts.userslug}">
 						<img src="{posts.picture}" align="left" class="img-thumbnail" />
 					</a>
-				<!--<div class="stats">
-					<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
-					<div class="chat hidden-xs" title="Chat"><i class="icon-comment"></i></div>
-				</div>-->
 					<span class="label label-danger {posts.show_banned}">banned</span>
 				</div>
 				<div class="col-md-11">
-				<div class="post-block speech-bubble">
+					<div class="post-block">
 						<div class="post-buttons">
 							<div class="topic-buttons">
 								<div class="btn-group">
@@ -137,18 +134,20 @@
 								<span class="{posts.edited-class}">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span>
 							</span>
 							<div style="clear:both;"></div>
-
 						</div>
 					</div>
 				</div>
 			</li>
 		<!-- END posts -->
-</ul>
+	</ul>
-<div id="loading-indicator" style="text-align:center;" class="hide" done="0">
+
+	<div id="loading-indicator" style="text-align:center;" class="hide" done="0">
 		<i class="icon-spinner icon-spin icon-large"></i>
-</div>
+	</div>
-<hr />
+
-<div class="topic-main-buttons">
+	<hr />
+
+	<div class="topic-main-buttons">
 		<button id="post_reply" class="btn btn-primary btn-lg post_reply" type="button">Reply</button>
 		<div class="btn-group pull-right" id="thread-tools" style="visibility: hidden;">
 			<button class="btn btn-default btn-lg dropdown-toggle" data-toggle="dropdown" type="button">Thread Tools <span class="caret"></span></button>
@@ -161,22 +160,20 @@
 				<li><a href="#" id="delete_thread"><span class="text-error"><i class="icon-trash"></i> Delete Thread</span></a></li>
 			</ul>
 		</div>
-</div>
+	</div>
-
 
-<div class="post-author-info">
+	<div class="mobile-author-info">
 		<div class="row">
 			<div class="col-xs-3">
-			<img id="post-author-image" src="" width=50 height=50 />
+				<img id="mobile-author-image" src="" width=50 height=50 />
 			</div>
 			<div class="col-xs-9">
-			<h4><div id="post-author-info"></div></h4>
+				<h4><div id="mobile-author-info"></div></h4>
+			</div>
 		</div>
 	</div>
-</div>
-
 
-<div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
+	<div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -197,6 +194,8 @@
 				</div>
 			</div>
 		</div>
+	</div>
+
 </div>
 
 <input type="hidden" template-variable="expose_tools" value="{expose_tools}" />

public/themes/cerulean/topic.less

@@ -1 +1,42 @@
 @import "../vanilla/topic";
+
+
+.topic {
+	.sub-posts {
+		/* speech bubbles for child posts */
+		@media (min-width: 979px) {
+			.post-block:after
+			{
+				content: "";
+				position: absolute;
+				top: 15px;
+				left: -7px;
+				border-style: solid;
+				border-width: 7px 7px 7px 0;
+				border-color: transparent rgb(250,250,250);
+				display: block;
+				width: 0;
+				z-index: 1;
+			}
+
+			.post-block:before
+			{
+				content: "";
+				position: absolute;
+				top: 15px;
+				left: -8px;
+				border-style: solid;
+				border-width: 7px 7px 7px 0;
+				border-color: transparent rgba(0, 0, 0, 0.125);
+				display: block;
+				width: 0;
+				z-index: 0;
+			}
+		}
+	}
+
+
+	.active-users {
+		color: rgb(153,153,153);
+	}
+}

public/themes/vanilla/topic.less

@@ -1,11 +1,14 @@
-
 .topic {
+	&.deleted {
+		-moz-opacity: 0.30;
+		opacity: 0.30;
+	}
+
+	> ul {
 		list-style-type: none;
 		padding: 0;
-	margin: 0;
-	clear: both;
 
-	li.row {
+		> li {
 			padding-bottom: 15px;
 
 			&.deleted {
@@ -20,27 +23,34 @@
 				overflow-y:default;
 			}
 		}
+	}
 
+	@media (max-width: 767px) {
+		.topic-main-buttons {
+			margin-bottom: 0px;
+		}
+	}
+
+	@media (max-width: 475px) {
+		.post-tools {
+			display: none;
+		}
+		.favourite-text {
+			display: none;
+		}
+	}
+
+	// styling the chat button in the dropdown to match. surely there's a better way...
 	.chat {
 		display: block;
 		padding: 3px 20px;
 		clear: both;
 		.pointer;
-	}
+
-	.chat:hover, .chat:focus {
+		&:hover, &:focus {
 			color: white;
 			background-color: rgb(66, 139, 202);
 		}
-
-	.profile-block, .post-block {
-		position: relative;
-		border: 1px solid rgba(0, 0, 0, 0.06);
-		border-radius: 5px;
-		padding: 10px;
-
-		p {
-			line-height: 1.75em;
-		}
 	}
 
 	.post-signature {
@@ -57,6 +67,17 @@
 		margin-left: 5px;
 	}
 
+	.profile-block, .post-block {
+		position: relative;
+		border: 1px solid rgba(0, 0, 0, 0.06);
+		border-radius: 5px;
+		padding: 10px;
+
+		p {
+			line-height: 1.75em;
+		}
+	}
+
 	.profile-block {
 		background: rgba(0, 0, 0, 0.02);
 		margin: 15px -11px -11px -11px;
@@ -67,16 +88,6 @@
 		color: #777;
 	}
 
-	.post-content {
-		min-height: 50px;
-		padding: 10px 5px 0 5px;
-		word-wrap: break-word;
-	}
-
-	.post-images{
-		padding: 2px 5px 0 5px;
-	}
-
 	.post-block {
 		.post-buttons {
 			background: rgba(0, 0, 0, 0.02);
@@ -94,41 +105,18 @@
 		}
 	}
 
-	&.deleted {
+	.post-content {
-		-moz-opacity: 0.30;
+		min-height: 50px;
-		opacity: 0.30;
+		padding: 10px 5px 0 5px;
+		word-wrap: break-word;
 	}
 
-	@media (min-width: 979px) {
+	.post-images{
-		.speech-bubble:after
+		padding: 2px 5px 0 5px;
-		{
-			content: "";
-			position: absolute;
-			top: 15px;
-			left: -7px;
-			border-style: solid;
-			border-width: 7px 7px 7px 0;
-			border-color: transparent rgb(250,250,250);
-			display: block;
-			width: 0;
-			z-index: 1;
-		}
-
-		.speech-bubble:before
-		{
-			content: "";
-			position: absolute;
-			top: 15px;
-			left: -8px;
-			border-style: solid;
-			border-width: 7px 7px 7px 0;
-			border-color: transparent rgba(0, 0, 0, 0.125);
-			display: block;
-			width: 0;
-			z-index: 0;
-		}
 	}
 
+
+
 	.sub-posts {
 		.post-tools {
 			margin-right: 9px;
@@ -227,24 +215,12 @@
 
 	}
 
-	.topic-main-buttons {
-		@media (max-width: 767px) {
-			margin-bottom: 0px;
-		}
-	}
 
-	@media (max-width: 475px) {
-		.post-tools {
-			display: none;
-		}
-		.favourite-text {
-			display: none;
-		}
-	}
-}
 
-.post-author-info {
+
+	.mobile-author-info {
 		display: none;
+		z-index: 9999;
 
 		@media (max-width: 767px) {
 			display: block;
@@ -271,47 +247,5 @@
 			font-weight: 300;
 			font-size: 16px;
 		}
-}
-
-
-
-.category-list {
-	li {
-		.inline-block;
-		.pointer;
-		padding: 0.5em 0;
-		text-align: center;
-		margin: 0.5em;
-		-webkit-border-radius: 5px;
-		-moz-border-radius: 5px;
-		border-radius: 5px;
-		padding: 0.5em;
-	}
-}
-
-
-.username-field {
-	.icon-circle {
-		font-size: 12px;
-		color: green;
-		margin-right:3px;
-	}
-	.icon-circle-blank {
-		font-size: 12px;
-		color: red;
-		margin-right:3px;
-	}
-}
-
-
-
-#thread_active_users {
-	float: right;
-	color: rgb(153,153,153);
-
-	strong {
-		color: rgb(100,100,100);
-		font-weight: 600;
-		.pointer;
 	}
 }