
project-menu: change menu number-badge style
@e8fe8fc90af0530a8e7f10ef6f8f126b76df541b
--- app/assets/stylesheets/less/_page.less
+++ app/assets/stylesheets/less/_page.less
... | ... | @@ -495,18 +495,14 @@ |
495 | 495 |
} |
496 | 496 |
|
497 | 497 |
.project-menu-count { |
498 |
- font-size:12px; |
|
499 |
- border:2px solid #FFF; |
|
500 |
- line-height:20px; |
|
501 |
- padding:0 5px; |
|
502 |
- background-color:@yobi-primary; |
|
503 |
- color:#ECF0F1; |
|
498 |
+ font-size: 12px; |
|
499 |
+ line-height: 20px; |
|
500 |
+ padding: 1px 5px; |
|
501 |
+ background-color: @yobi-primary; |
|
502 |
+ color: #ECF0F1; |
|
503 |
+ vertical-align: top; |
|
504 | 504 |
.border-radius(10px); |
505 |
- |
|
506 |
- -webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.2), inset 0 1px 1px rgba(0,0,0,0.1); |
|
507 |
- -moz-box-shadow: 0 1px 1px rgba(0,0,0,0.2), inset 0 1px 1px rgba(0,0,0,0.1); |
|
508 |
- -o-box-shadow: 0 1px 1px rgba(0,0,0,0.2), inset 0 1px 1px rgba(0,0,0,0.1); |
|
509 |
- box-shadow: 0 1px 1px rgba(0,0,0,0.2), inset 0 1px 1px rgba(0,0,0,0.1); |
|
505 |
+ font-family: @fixed-font-family; |
|
510 | 506 |
} |
511 | 507 |
|
512 | 508 |
.project-page-wrap { |
--- app/models/CommentThread.java
+++ app/models/CommentThread.java
... | ... | @@ -28,6 +28,7 @@ |
28 | 28 |
import play.data.validation.Constraints; |
29 | 29 |
import play.db.ebean.Model; |
30 | 30 |
|
31 |
+import javax.annotation.Nullable; |
|
31 | 32 |
import javax.persistence.*; |
32 | 33 |
import java.util.ArrayList; |
33 | 34 |
import java.util.Date; |
... | ... | @@ -168,7 +169,10 @@ |
168 | 169 |
* @return |
169 | 170 |
*/ |
170 | 171 |
|
171 |
- public static int countReviewsBy(Long projectId, ReviewSearchCondition cond) { |
|
172 |
+ public static int countReviewsBy(Long projectId, @Nullable ReviewSearchCondition cond) { |
|
173 |
+ if(cond == null){ |
|
174 |
+ cond = new ReviewSearchCondition(); |
|
175 |
+ } |
|
172 | 176 |
return cond.asExpressionList(Project.find.byId(projectId)).findRowCount(); |
173 | 177 |
} |
174 | 178 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?