summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-09-30 09:48:27 -0400
committerJames Moger <james.moger@gitblit.com>2014-09-30 09:48:27 -0400
commit2654d99368054b7f8cfaec056b599cac4cfb53d9 (patch)
tree156736e99b4ce8116c0d11830cf0cbbcf96bcd71
parent3513117364394110f6ae8d5264602f1e1a7fcf1f (diff)
parent1f217a28cd29d5d29cf656727610c0dbd3c7764a (diff)
downloadgitblit-2654d99368054b7f8cfaec056b599cac4cfb53d9.tar.gz
gitblit-2654d99368054b7f8cfaec056b599cac4cfb53d9.zip
Merge branch 'ticket/196' into develop
-rw-r--r--src/main/java/com/gitblit/wicket/pages/TicketPage.html2
-rw-r--r--src/main/java/com/gitblit/wicket/pages/TicketsPage.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index 36dca4c4..f3f38ec3 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">
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
index b0f8968e..3a3d977a 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
@@ -23,7 +23,7 @@
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tickets">
- <div class="row" style="min-height:400px;" >
+ <div class="row" style="min-height:500px;" >
<!-- query controls -->
<div class="span3">