From 1a912b06549ce0223ab5c6039c064db81af76e80 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 10:16:56 -0400
Subject: [PATCH] Merged #197 "Fix cropped ticket status indicator"

---
 src/main/java/com/gitblit/wicket/pages/TicketPage.html |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index a2f105d..f3f38ec 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
@@ -33,7 +33,7 @@
 		
 	<!-- DISCUSSION TAB -->
 	<div class="tab-pane active" id="discussion">
-		<div class="row">
+		<div class="row" style="min-height: 500px;">
 				
 			<!-- LEFT SIDE -->
 			<div class="span8">		
@@ -316,9 +316,10 @@
 
 <!-- PATCHSET FRAGMENT -->
 <wicket:fragment wicket:id="patchsetFragment">
-	<div class="row" style="padding: 0px 0px 20px;">
+	<div class="row" style="padding: 0px;">
  		<div class="span12 attribution-border">
-			<div wicket:id="panel"></div>		
+ 			<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
+			<div wicket:id="panel"></div>
 		</div>
 	</div>
 	
@@ -351,9 +352,8 @@
 
 <!-- COLLAPSIBLE PATCHSET (temp) -->
 <wicket:fragment wicket:id="collapsiblePatchsetFragment">
-<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div>
 <div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;">
-<div class="patch-group">
+<div class="patch-group" style="margin-bottom: 20px;">
    	<div class="accordion-heading">
 		<div class="attribution-patch-pullright">	
 			<div style="padding-bottom: 2px;"> 
@@ -596,7 +596,7 @@
        		quality="high"
        		wmode="transparent"
        		scale="noscale"
-       		allowScriptAccess="always"></object>
+       		allowScriptAccess="sameDomain"></object>
 </wicket:fragment>
 	
 </wicket:extend>    

--
Gitblit v1.9.1