diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/gradientpicker.reel/css/gradientpicker.scss | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/gradientpicker.reel/css/gradientpicker.scss')
-rwxr-xr-x | js/components/gradientpicker.reel/css/gradientpicker.scss | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/js/components/gradientpicker.reel/css/gradientpicker.scss b/js/components/gradientpicker.reel/css/gradientpicker.scss index cc9b4cb9..b8f7362c 100755 --- a/js/components/gradientpicker.reel/css/gradientpicker.scss +++ b/js/components/gradientpicker.reel/css/gradientpicker.scss | |||
@@ -31,20 +31,20 @@ POSSIBILITY OF SUCH DAMAGE. | |||
31 | 31 | ||
32 | input[type=radio], .gradientpicker .type .radio | 32 | input[type=radio], .gradientpicker .type .radio |
33 | { | 33 | { |
34 | width: 10px; | 34 | width: 10px; |
35 | height: 10px; | 35 | height: 10px; |
36 | margin: 2px; | 36 | margin: 2px; |
37 | display: block; | 37 | display: block; |
38 | float: left; | 38 | float: left; |
39 | border-radius: 5px; | 39 | border-radius: 5px; |
40 | border: 1px solid #222; | 40 | border: 1px solid #222; |
41 | background: -webkit-linear-gradient(top, #666666 0%,#333333 100%); | 41 | background: -webkit-linear-gradient(top, #666666 0%,#333333 100%); |
42 | } | 42 | } |
43 | 43 | ||
44 | input[type=radio]:checked, .radio:checked, .gradientpicker .type .radio:checked | 44 | input[type=radio]:checked, .radio:checked, .gradientpicker .type .radio:checked |
45 | { | 45 | { |
46 | border: 1px solid #000; | 46 | border: 1px solid #000; |
47 | background: -webkit-radial-gradient(center, circle cover, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 15%, rgba(204,204,204,1) 30%, rgba(204,204,204,0.01) 31%), -webkit-linear-gradient(top, #666666 0%,#333333 100%); | 47 | background: -webkit-radial-gradient(center, circle cover, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 15%, rgba(204,204,204,1) 30%, rgba(204,204,204,0.01) 31%), -webkit-linear-gradient(top, #666666 0%,#333333 100%); |
48 | } | 48 | } |
49 | 49 | ||
50 | .gradientpicker | 50 | .gradientpicker |
@@ -63,113 +63,113 @@ input[type=radio]:checked, .radio:checked, .gradientpicker .type .radio:checked | |||
63 | 63 | ||
64 | .gradientpicker .type label | 64 | .gradientpicker .type label |
65 | { | 65 | { |
66 | display: block; | 66 | display: block; |
67 | float: left; | 67 | float: left; |
68 | margin: 0px 0px 0px 1px; | 68 | margin: 0px 0px 0px 1px; |
69 | } | 69 | } |
70 | 70 | ||
71 | .gradientpicker .type :nth-child(3) | 71 | .gradientpicker .type :nth-child(3) |
72 | { | 72 | { |
73 | margin-left: 10px; | 73 | margin-left: 10px; |
74 | } | 74 | } |
75 | 75 | ||
76 | 76 | ||
77 | 77 | ||
78 | .gradientpicker .type, .gradientpicker .cp_gp_slider | 78 | .gradientpicker .type, .gradientpicker .cp_gp_slider |
79 | { | 79 | { |
80 | overflow: visible; | 80 | overflow: visible; |
81 | } | 81 | } |
82 | 82 | ||
83 | .gradientpicker .cp_gp_slider | 83 | .gradientpicker .cp_gp_slider |
84 | { | 84 | { |
85 | float: left; | 85 | float: left; |
86 | clear: both; | 86 | clear: both; |
87 | } | 87 | } |
88 | 88 | ||
89 | .gradientpicker .cp_gp_slider .track_container | 89 | .gradientpicker .cp_gp_slider .track_container |
90 | { | 90 | { |
91 | width: 187px; | 91 | width: 187px; |
92 | height: 20px; | 92 | height: 20px; |
93 | margin: 6px 0px 0px 6px; | 93 | margin: 6px 0px 0px 6px; |
94 | border: 1px solid #333; | 94 | border: 1px solid #333; |
95 | background: url(../../../../images/colorpanel/transparent.png) repeat; | 95 | background: url(../../../../images/colorpanel/transparent.png) repeat; |
96 | float: left; | 96 | float: left; |
97 | clear: both; | 97 | clear: both; |
98 | } | 98 | } |
99 | 99 | ||
100 | .gradientpicker .cp_gp_slider .track | 100 | .gradientpicker .cp_gp_slider .track |
101 | { | 101 | { |
102 | width: 187px; | 102 | width: 187px; |
103 | height: 20px; | 103 | height: 20px; |
104 | cursor: crosshair; | 104 | cursor: crosshair; |
105 | } | 105 | } |
106 | 106 | ||
107 | .gradientpicker .cp_gp_slider .cover | 107 | .gradientpicker .cp_gp_slider .cover |
108 | { | 108 | { |
109 | overflow: hidden; | 109 | overflow: hidden; |
110 | width: 202px; | 110 | width: 202px; |
111 | height: 22px; | 111 | height: 22px; |
112 | float: left; | 112 | float: left; |
113 | position: absolute; | 113 | position: absolute; |
114 | bottom: 12px; | 114 | bottom: 12px; |
115 | z-index: 20; | 115 | z-index: 20; |
116 | display: none; | 116 | display: none; |
117 | } | 117 | } |
118 | 118 | ||
119 | .gradientpicker .cp_gp_slider .chips | 119 | .gradientpicker .cp_gp_slider .chips |
120 | { | 120 | { |
121 | overflow: hidden; | 121 | overflow: hidden; |
122 | width: 202px; | 122 | width: 202px; |
123 | height: 22px; | 123 | height: 22px; |
124 | float: left; | 124 | float: left; |
125 | clear: both; | 125 | clear: both; |
126 | position: relative; | 126 | position: relative; |
127 | z-index: 1; | 127 | z-index: 1; |
128 | } | 128 | } |
129 | 129 | ||
130 | .gradientpicker .cp_gp_slider .chips div | 130 | .gradientpicker .cp_gp_slider .chips div |
131 | { | 131 | { |
132 | width: 14px; | 132 | width: 14px; |
133 | position: absolute; | 133 | position: absolute; |
134 | top: 3px; | 134 | top: 3px; |
135 | cursor: pointer; | 135 | cursor: pointer; |
136 | } | 136 | } |
137 | 137 | ||
138 | .gradientpicker .cp_gp_slider .chips span | 138 | .gradientpicker .cp_gp_slider .chips span |
139 | { | 139 | { |
140 | display: block; | 140 | display: block; |
141 | width: 8px; | 141 | width: 8px; |
142 | height: 8px; | 142 | height: 8px; |
143 | background: #333; | 143 | background: #333; |
144 | margin: 0px 0px -4px 3px; | 144 | margin: 0px 0px -4px 3px; |
145 | -webkit-transform: rotate(45deg); | 145 | -webkit-transform: rotate(45deg); |
146 | float: left; | 146 | float: left; |
147 | position: relative; | 147 | position: relative; |
148 | cursor: pointer; | 148 | cursor: pointer; |
149 | } | 149 | } |
150 | 150 | ||
151 | .gradientpicker .cp_gp_slider .chips button | 151 | .gradientpicker .cp_gp_slider .chips button |
152 | { | 152 | { |
153 | display: block; | 153 | display: block; |
154 | width: 14px; | 154 | width: 14px; |
155 | height: 14px; | 155 | height: 14px; |
156 | border: 1px solid #333; | 156 | border: 1px solid #333; |
157 | padding: 0; | 157 | padding: 0; |
158 | margin: 0; | 158 | margin: 0; |
159 | background: #FFF; | 159 | background: #FFF; |
160 | float: left; | 160 | float: left; |
161 | position: relative; | 161 | position: relative; |
162 | cursor: pointer; | 162 | cursor: pointer; |
163 | } | 163 | } |
164 | 164 | ||
165 | .gradientpicker .cp_gp_slider .chips div div | 165 | .gradientpicker .cp_gp_slider .chips div div |
166 | { | 166 | { |
167 | display: block; | 167 | display: block; |
168 | width: 14px; | 168 | width: 14px; |
169 | height: 14px; | 169 | height: 14px; |
170 | float: left; | 170 | float: left; |
171 | top: 0px; | 171 | top: 0px; |
172 | position: relative; | 172 | position: relative; |
173 | cursor: pointer; | 173 | cursor: pointer; |
174 | background: url(../../../../images/colorpanel/transparent.png) repeat; | 174 | background: url(../. |