aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.css
diff options
context:
space:
mode:
authorJonathan Duran2012-04-10 08:13:00 -0700
committerJonathan Duran2012-04-10 08:13:00 -0700
commit58e049b68e03abbacde93206d2666361022c0858 (patch)
treef1ce6b8a378674d4abcac68acd0bcca93b838a39 /js/panels/Materials/materials-popup.reel/materials-popup.css
parenta9050f96d814469f420bcf3630d16d576b62258e (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-58e049b68e03abbacde93206d2666361022c0858.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.css')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css46
1 files changed, 39 insertions, 7 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 89233c64..2d339411 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -37,21 +37,53 @@
37.mp_property 37.mp_property
38{ 38{
39 height:40px; 39 height:40px;
40 position: relative;
40} 41}
41 42
42.mp_property > .prop-label 43.mp_property > .prop-label
43{ 44{
44 float: left; 45 position:relative;
45 /*width:86px;*/ 46 top:12px;
46 margin: 0px 8px 2px 5px; 47 float: left;
48 width: 100px;
47} 49}
48 50
49.mp_property > .prop-controller 51.mp_property > .prop-controller
50{ 52{
51 float: right; 53 position:relative;
52 clear: left; 54 top:12px;
53 width: auto; 55 left: 10px;
54 margin: 0px 0px 3px 0px; 56 float: left;
57}
58
59.mp_property .hottext,
60.mp_property .hottextInput
61{
62 width: 30px;
63}
64
65.mp_property .button
66{
67 width: 30px;
68 height: 20px;
69}
70
71.mp_property .inputRow
72{
73 top: 8px;
74 position: relative;
75}
76
77.mp_properties_list
78{
79 padding-bottom: 8px;
80}
81
82.mp_properties_list > .mp_property > .colortoolbar
83{
84 width: 27px !important;
85 height: 27px !important;
86 overflow:hidden !important;
55} 87}
56 88
57.mp_buttons { 89.mp_buttons {