Merge pull request eurucamp#66 from isleofruby/feature/css-elipsis

Truncate long activity titles w/ellipsis using CSS
devconfpl · Sep 6, 2018 · 65e02e5 · 65e02e5
2 parents c0b66d1 + 874cf13
commit 65e02e5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require jquery_ujs
 //= require jquery.easing.min
 //= require jquery.progress
-//= require jquery.dotdotdot.min
 //= require pickadate/picker
 //= require pickadate/picker.date
 //= require pickadate/picker.time

diff --git a/app/assets/javascripts/initializers.coffee b/app/assets/javascripts/initializers.coffee
@@ -2,9 +2,6 @@ ready = ->
   $(document).ajaxError (e, xhr) ->
     window.location.replace(App.paths.login) if xhr.status == 401
 
-  $('#activities .labels h4').dotdotdot
-    height: 55
-
   # hide validation errors on focus
   $('input.validation-error').on 'focus', ->
     $(@).next('span.validation-error-message').fadeOut()

diff --git a/app/assets/stylesheets/partials/activities/_index.scss b/app/assets/stylesheets/partials/activities/_index.scss
@@ -124,6 +124,10 @@ a#new-activity {
         margin: 0;
         padding: 0 0.727272em;
 
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
         @extend %transition-all-15s-ease-out;
 
         @extend %ornamental-divider-before;

diff --git a/vendor/assets/javascripts/jquery.dotdotdot.min.js b/vendor/assets/javascripts/jquery.dotdotdot.min.js