Browse Source

Don't display empty extras.

Ralfp 12 years ago
parent
commit
119eabc4bf

+ 4 - 3
static/cranefly/css/cranefly.css

@@ -1080,7 +1080,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .forum-threads-extra{overflow:auto;}.forum-threads-extra.extra-top{margin-bottom:20px;}
 .forum-threads-extra{overflow:auto;}.forum-threads-extra.extra-top{margin-bottom:20px;}
 .thread-buttons{overflow:auto;}.thread-buttons .pull-right{margin-left:14px;}
 .thread-buttons{overflow:auto;}.thread-buttons .pull-right{margin-left:14px;}
 .thread-body .post-wrapper .post-body{margin-bottom:20px;overflow:auto;}.thread-body .post-wrapper .post-body .user-avatar{border-radius:5px;float:left;width:100px;height:100px;}
 .thread-body .post-wrapper .post-body{margin-bottom:20px;overflow:auto;}.thread-body .post-wrapper .post-body .user-avatar{border-radius:5px;float:left;width:100px;height:100px;}
-.thread-body .post-wrapper .post-body .post-content{background-color:#ffffff;border:1px solid #e7e7e7;border-radius:5px;margin-left:121px;position:relative;}.thread-body .post-wrapper .post-body .post-content:after,.thread-body .post-wrapper .post-body .post-content:before{right:100%;border:solid transparent;content:"";height:0;width:0;position:absolute;pointer-events:none;}
+.thread-body .post-wrapper .post-body .post-content{background-color:#ffffff;border:1px solid #e7e7e7;border-radius:5px;margin-left:121px;min-height:100px;position:relative;}.thread-body .post-wrapper .post-body .post-content:after,.thread-body .post-wrapper .post-body .post-content:before{right:100%;border:solid transparent;content:"";height:0;width:0;position:absolute;pointer-events:none;}
 .thread-body .post-wrapper .post-body .post-content:after{border-color:transparent;border-right-color:#ffffff;border-width:10.5px;top:14px;margin-top:0px;}
 .thread-body .post-wrapper .post-body .post-content:after{border-color:transparent;border-right-color:#ffffff;border-width:10.5px;top:14px;margin-top:0px;}
 .thread-body .post-wrapper .post-body .post-content:before{border-color:transparent;border-right-color:#e7e7e7;border-width:11.5px;top:14px;margin-top:-1px;}
 .thread-body .post-wrapper .post-body .post-content:before{border-color:transparent;border-right-color:#e7e7e7;border-width:11.5px;top:14px;margin-top:-1px;}
 .thread-body .post-wrapper .post-body .post-content .post-header{padding:7px 14px;padding-bottom:0px;color:grayLighter;}.thread-body .post-wrapper .post-body .post-content .post-header .post-author{color:#333333;font-weight:bold;}
 .thread-body .post-wrapper .post-body .post-content .post-header{padding:7px 14px;padding-bottom:0px;color:grayLighter;}.thread-body .post-wrapper .post-body .post-content .post-header .post-author{color:#333333;font-weight:bold;}
@@ -1093,7 +1093,8 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .thread-body .post-wrapper .post-body .post-content .post-header .post-extra{float:right;}.thread-body .post-wrapper .post-body .post-content .post-header .post-extra .label{margin-left:3.5px;text-shadow:none;}.thread-body .post-wrapper .post-body .post-content .post-header .post-extra .label.label-purple{background-color:#7e2ecf;}
 .thread-body .post-wrapper .post-body .post-content .post-header .post-extra{float:right;}.thread-body .post-wrapper .post-body .post-content .post-header .post-extra .label{margin-left:3.5px;text-shadow:none;}.thread-body .post-wrapper .post-body .post-content .post-header .post-extra .label.label-purple{background-color:#7e2ecf;}
 .thread-body .post-wrapper .post-body .post-content .post-message .markdown{padding:14px;}
 .thread-body .post-wrapper .post-body .post-content .post-message .markdown{padding:14px;}
 .thread-body .post-wrapper .post-body .post-content .post-message .post-signature{border-top:1px dotted #bfbfbf;opacity:0.6;filter:alpha(opacity=60);margin:0px 14px;font-size:80%;}.thread-body .post-wrapper .post-body .post-content .post-message .post-signature .markdown{padding:0px;padding-top:5px;padding-bottom:14px;}
 .thread-body .post-wrapper .post-body .post-content .post-message .post-signature{border-top:1px dotted #bfbfbf;opacity:0.6;filter:alpha(opacity=60);margin:0px 14px;font-size:80%;}.thread-body .post-wrapper .post-body .post-content .post-message .post-signature .markdown{padding:0px;padding-top:5px;padding-bottom:14px;}
-.thread-body .post-wrapper .post-body .post-content .post-footer{border-top:1px solid #e7e7e7;overflow:auto;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating{float:left;overflow:auto;padding:7px 14px;border-right:1px dotted #e7e7e7;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating a{color:#999999;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating a:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating a a:active{color:#333333;}
+.thread-body .post-wrapper .post-body .post-content .post-footer{border-top:1px solid #e7e7e7;overflow:auto;}.thread-body .post-wrapper .post-body .post-content .post-footer:empty{display:none;}
+.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating{float:left;overflow:auto;padding:7px 14px;border-right:1px dotted #e7e7e7;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating a{color:#999999;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating a:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating a a:active{color:#333333;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span{float:left;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-score{color:#999999;font-weight:bold;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-score.post-score-good{color:#46a546;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span{float:left;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-score{color:#999999;font-weight:bold;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-score.post-score-good{color:#46a546;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-score.post-score-bad{color:#cf402e;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-score.post-score-bad{color:#cf402e;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-neutral,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-like,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-hate{margin-left:3.5px;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-neutral,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-like,.thread-body .post-wrapper .post-body .post-content .post-footer .post-rating span.post-hate{margin-left:3.5px;}
@@ -1110,7 +1111,7 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{opacity:0.9;filter:alpha(opa
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply{color:#555555;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply a:active{color:#049cdb;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply{color:#555555;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions a.post-reply a:active{color:#049cdb;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn{float:right;margin:0px;margin-left:14px;opacity:1;filter:alpha(opacity=100);padding:0px;color:#999999;font-weight:normal;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:focus{color:#cf402e;text-decoration:underline;}
 .thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn{float:right;margin:0px;margin-left:14px;opacity:1;filter:alpha(opacity=100);padding:0px;color:#999999;font-weight:normal;}.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:hover,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:active,.thread-body .post-wrapper .post-body .post-content .post-footer .post-actions .btn:focus{color:#cf402e;text-decoration:underline;}
 .thread-body .post-wrapper .post-body.post-muted .user-avatar{width:50px;height:50px;opacity:0.75;filter:alpha(opacity=75);}
 .thread-body .post-wrapper .post-body.post-muted .user-avatar{width:50px;height:50px;opacity:0.75;filter:alpha(opacity=75);}
-.thread-body .post-wrapper .post-body.post-muted .post-content{margin-left:71px;opacity:0.75;filter:alpha(opacity=75);padding:14px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-header{float:right;margin:0px;margin-top:-7px;margin-right:-14px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-header .post-header-compact{float:left;margin-right:14px;}
+.thread-body .post-wrapper .post-body.post-muted .post-content{margin-left:71px;min-height:0px;opacity:0.75;filter:alpha(opacity=75);padding:14px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-header{float:right;margin:0px;margin-top:-7px;margin-right:-14px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-header .post-header-compact{float:left;margin-right:14px;}
 .thread-body .post-wrapper .post-body.post-muted .post-content .post-message{color:#999999;font-size:17.5px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-message strong,.thread-body .post-wrapper .post-body.post-muted .post-content .post-message a{color:#333333;font-weight:normal;}
 .thread-body .post-wrapper .post-body.post-muted .post-content .post-message{color:#999999;font-size:17.5px;}.thread-body .post-wrapper .post-body.post-muted .post-content .post-message strong,.thread-body .post-wrapper .post-body.post-muted .post-content .post-message a{color:#333333;font-weight:normal;}
 .thread-body .post-checkpoints .post-checkpoint{text-align:center;margin-bottom:20px;}.thread-body .post-checkpoints .post-checkpoint hr{background-color:#999999;background-image:-webkit-gradient(linear, 0 0, 100% 100%, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);-webkit-background-size:10px 10px;-moz-background-size:10px 10px;background-size:10px 10px;border:none;height:4px;margin-bottom:-12px;}
 .thread-body .post-checkpoints .post-checkpoint{text-align:center;margin-bottom:20px;}.thread-body .post-checkpoints .post-checkpoint hr{background-color:#999999;background-image:-webkit-gradient(linear, 0 0, 100% 100%, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);-webkit-background-size:10px 10px;-moz-background-size:10px 10px;background-size:10px 10px;border:none;height:4px;margin-bottom:-12px;}
 .thread-body .post-checkpoints .post-checkpoint span{background-color:#fbfbfb;padding:0px 14px;color:#999999;}.thread-body .post-checkpoints .post-checkpoint span a{color:#333333;}
 .thread-body .post-checkpoints .post-checkpoint span{background-color:#fbfbfb;padding:0px 14px;color:#999999;}.thread-body .post-checkpoints .post-checkpoint span a{color:#333333;}

+ 6 - 0
static/cranefly/css/cranefly/thread.less

@@ -29,6 +29,7 @@
         border: 1px solid @postBorder;
         border: 1px solid @postBorder;
         border-radius: @borderRadiusLarge;
         border-radius: @borderRadiusLarge;
         margin-left: 100px + (@baseFontSize * 1.5);
         margin-left: 100px + (@baseFontSize * 1.5);
+        min-height: 100px;
         position: relative;
         position: relative;
 
 
         &:after, &:before {
         &:after, &:before {
@@ -153,6 +154,10 @@
           border-top: 1px solid @postBorder;
           border-top: 1px solid @postBorder;
           overflow: auto;
           overflow: auto;
 
 
+          &:empty {
+            display: none;
+          }
+
           .post-rating {
           .post-rating {
             float: left;
             float: left;
             overflow: auto;
             overflow: auto;
@@ -301,6 +306,7 @@
 
 
         .post-content {
         .post-content {
           margin-left: 50px + (@baseFontSize * 1.5);
           margin-left: 50px + (@baseFontSize * 1.5);
+          min-height: 0px;
           .opacity(75);
           .opacity(75);
           padding: @baseFontSize;
           padding: @baseFontSize;
 
 

+ 2 - 2
templates/cranefly/threads/thread.html

@@ -242,7 +242,7 @@
             </div>
             </div>
             {% endif %}
             {% endif %}
           </div>
           </div>
-          <div class="post-footer">
+          <div class="post-footer">{% filter trim %}
             {% if acl.threads.can_see_post_score(forum) %}
             {% if acl.threads.can_see_post_score(forum) %}
             <div class="post-rating">
             <div class="post-rating">
               {% if acl.threads.can_see_post_score(forum) == 1 %}
               {% if acl.threads.can_see_post_score(forum) == 1 %}
@@ -333,7 +333,7 @@
             </div>
             </div>
             {% endif %}
             {% endif %}
             {% endif %}
             {% endif %}
-          </div>
+          {% endfilter %}</div>
         </div>
         </div>
       </div>
       </div>
       {% endif %}
       {% endif %}