diff options
author | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
commit | 0bd1cefea2ab350fad1a891bdc926053b799aafc (patch) | |
tree | 962f559fcc02a3dfeb297d59907e40fa153453f3 /js/components/ui/icon-list-basic/icon.reel/icon.css | |
parent | 695bc5082f48dddf66ce31480a4faefc067b38bd (diff) | |
parent | 2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff) | |
download | ninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz |
Merge branch 'refs/heads/master' into new-tool-icons
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 | 25 |
1 files changed, 14 insertions, 11 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 ca591aff..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,38 +5,41 @@ | |||
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 | ||
19 | .icon .selected{ | 19 | .icon .selected{ |
20 | /*background-color: #d1d1d1;*/ | ||
21 | background-color: #919191; | 20 | background-color: #919191; |
22 | } | 21 | } |
23 | 22 | ||
23 | /*highlight on hover*/ | ||
24 | .icon:hover{ | ||
25 | background-color: #919191; | ||
26 | } | ||
27 | /*end- test*/ | ||
28 | |||
24 | .icon .iconImg{ | 29 | .icon .iconImg{ |
25 | width:35px; | 30 | width:35px; |
26 | height:35px; | 31 | height:35px; |
27 | /*border: 1px solid #000000; | 32 | margin-left: 26px; |
28 | box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);*/ | ||
29 | margin-left: 20px; | ||
30 | margin-top: 10px; | 33 | margin-top: 10px; |
31 | } | 34 | } |
32 | 35 | ||
33 | .icon .iconLabel{ | 36 | .icon .iconLabel{ |
34 | margin-top:8px; | 37 | margin-top:8px; |
35 | white-space: nowrap; | 38 | white-space: nowrap; |
36 | text-overflow:ellipsis; | 39 | text-overflow: ellipsis; |
37 | line-height:15px; | 40 | line-height:15px; |
38 | overflow: hidden; | 41 | overflow: hidden; |
39 | max-width:80%; | 42 | width: 72px; |
43 | padding: 0px 8px; | ||
40 | text-align: center; | 44 | text-align: center; |
41 | padding-left: 2px; | ||
42 | } \ No newline at end of file | 45 | } \ No newline at end of file |