diff options
author | Jose Antonio Marquez | 2012-02-16 11:30:33 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-16 11:30:33 -0800 |
commit | 9fe5d98bf469036c856e28d71ad4160d630b4af4 (patch) | |
tree | 930a334bcda0c26ca02eaa33a1506d147e8691e1 /js/components/ui/icon-list-basic | |
parent | 89b5e793ea88ef235b54b6e1d1c379698d3e612b (diff) | |
parent | 71619045b692015b0889a4f5c381c1dee9c056cd (diff) | |
download | ninja-9fe5d98bf469036c856e28d71ad4160d630b4af4.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/components/ui/icon-list-basic')
-rw-r--r-- | js/components/ui/icon-list-basic/icon.reel/icon.css | 16 |
1 files changed, 8 insertions, 8 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 4d71f6b8..9fb180d2 100644 --- a/js/components/ui/icon-list-basic/icon.reel/icon.css +++ b/js/components/ui/icon-list-basic/icon.reel/icon.css | |||
@@ -5,14 +5,14 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .icon{ | 7 | .icon{ |
8 | width:90px; | 8 | width:88px; |
9 | height:80px; | 9 | height:78px; |
10 | display: inline; | 10 | display: inline; |
11 | float: left; | 11 | float: left; |
12 | -moz-border-radius: 8px; | 12 | -moz-border-radius: 8px; |
13 | border-radius: 8px; | 13 | border-radius: 8px; |
14 | margin-bottom: 5px; | 14 | margin-bottom: 8px; |
15 | margin-right: 5px; | 15 | margin-right: 8px; |
16 | background-color: #5f5f5f; | 16 | background-color: #5f5f5f; |
17 | } | 17 | } |
18 | 18 | ||
@@ -29,17 +29,17 @@ | |||
29 | .icon .iconImg{ | 29 | .icon .iconImg{ |
30 | width:35px; | 30 | width:35px; |
31 | height:35px; | 31 | height:35px; |
32 | margin-left: 20px; | 32 | margin-left: 26px; |
33 | margin-top: 10px; | 33 | margin-top: 10px; |
34 | } | 34 | } |
35 | 35 | ||
36 | .icon .iconLabel{ | 36 | .icon .iconLabel{ |
37 | margin-top:8px; | 37 | margin-top:8px; |
38 | white-space: nowrap; | 38 | white-space: nowrap; |
39 | text-overflow:ellipsis; | 39 | text-overflow: ellipsis; |
40 | line-height:15px; | 40 | line-height:15px; |
41 | overflow: hidden; | 41 | overflow: hidden; |
42 | max-width:80%; | 42 | width: 72px; |
43 | padding: 0px 8px; | ||
43 | text-align: center; | 44 | text-align: center; |
44 | padding-left: 2px; | ||
45 | } \ No newline at end of file | 45 | } \ No newline at end of file |