Merge pull request #44 from flying-sheep/patch-1

made text-overflow backwards-compatible
maxmx · May 21, 2014 · 583b711 · 583b711
2 parents 98d9f13 + 68a7356
commit 583b711
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/stylus/mixins.styl b/stylus/mixins.styl
@@ -80,9 +80,13 @@ placeholder(color = $input-color-placeholder) {
 // Text overflow
 // Requires inline-block or block for proper styling
 text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  if arguments {
+    text-overflow: arguments;
+  } else {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 }
 
 // CSS image replacement
@@ -913,4 +917,4 @@ input-size(input-height, padding-vertical, padding-horizontal, font-size, line-h
   select[multiple]& {
     height: auto;
   }
-}
+}