tweak pixels to allow excerpts to show for double line titles

paviliondev · Jul 25, 2016 · 74bd386 · 74bd386
1 parent a6573f3
commit 74bd386
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/assets/javascripts/discourse/initializers/preview-edits.js.es6 b/assets/javascripts/discourse/initializers/preview-edits.js.es6
@@ -126,7 +126,8 @@ export default {
           var height = 0;
           this.$('.topic-details > :not(.topic-excerpt):not(.discourse-tags)').each(function(){ height += $(this).height() })
           var excerpt = 100 - height;
-          $excerpt.css('max-height', (excerpt > 19 ? (excerpt > 35 ? excerpt : 19) : 0))
+          console.log(excerpt)
+          $excerpt.css('max-height', (excerpt >= 17 ? (excerpt > 35 ? excerpt : 17) : 0))
         }
       },
 

diff --git a/assets/stylesheets/previews.scss b/assets/stylesheets/previews.scss
@@ -61,6 +61,7 @@
   color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
   font-size: 13px;
   display: inline-block;
+  vertical-align: bottom;
   margin-right: 2px;
   .vote-count {
     height: initial;
@@ -84,23 +85,22 @@
   font-size: 0.9em;
   background: transparent;
   border: none;
-  padding: 3px 4px;
+  padding: 2px 4px;
   overflow: hidden;
+  i {
+    vertical-align: bottom;
+  }
 
-  &.topic-like:hover {
+  &.has-like, &.topic-like:hover {
     color: $love;
-    background: dark-light-diff($love, $secondary, 85%, -60%)
   }
-
-  &.has-like {color: $love;}
   &.has-like[disabled]:hover {
     background: transparent;
   }
   &.has-like[disabled]:active {
     box-shadow: none;
   }
-
-  &.bookmarked {
+  &.bookmarked, &.topic-bookmark:hover {
     i.fa-bookmark {
       color: $tertiary;
     }