diff options
author | Eric Guzman | 2012-03-29 16:29:04 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-29 16:29:04 -0700 |
commit | ccd57d8610a7839cf14b2c9e354b64acf53093a7 (patch) | |
tree | f11b4418483fd21831b72ca6dc0451422a25bfe2 /js/components/ui/icon-list-basic/icon.reel/icon.css | |
parent | 7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (diff) | |
parent | f4949cab544886702e7ad6eeaa6215125c7b067a (diff) | |
download | ninja-ccd57d8610a7839cf14b2c9e354b64acf53093a7.tar.gz |
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/components/ui/icon-list-basic/icon.reel/icon.css')
-rw-r--r-- | js/components/ui/icon-list-basic/icon.reel/icon.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css index 9fb180d2..203db65c 100644 --- a/js/components/ui/icon-list-basic/icon.reel/icon.css +++ b/js/components/ui/icon-list-basic/icon.reel/icon.css | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | .icon .iconLabel{ | 36 | .icon .iconLabel{ |
37 | margin-top:8px; | 37 | margin-top:8px; |
38 | white-space: nowrap; | 38 | white-space: pre; |
39 | text-overflow: ellipsis; | 39 | text-overflow: ellipsis; |
40 | line-height:15px; | 40 | line-height:15px; |
41 | overflow: hidden; | 41 | overflow: hidden; |