diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/properties.reel/properties.css | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/properties.css')
-rwxr-xr-x | js/panels/properties.reel/properties.css | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css index 3c6b1a61..67884628 100755 --- a/js/panels/properties.reel/properties.css +++ b/js/panels/properties.reel/properties.css | |||
@@ -121,7 +121,7 @@ padding-right:6px; | |||
121 | .propertiesPanel .fieldRow.twoCol label { | 121 | .propertiesPanel .fieldRow.twoCol label { |
122 | width:74px; | 122 | width:74px; |
123 | display: inline-block; | 123 | display: inline-block; |
124 | 124 | ||
125 | } | 125 | } |
126 | 126 | ||
127 | .propertiesPanel .fieldRow.oneCol label { | 127 | .propertiesPanel .fieldRow.oneCol label { |
@@ -276,10 +276,10 @@ padding-right:6px; | |||
276 | } | 276 | } |
277 | 277 | ||
278 | .propertiesPanel .colortoolbar .chipContainer { | 278 | .propertiesPanel .colortoolbar .chipContainer { |
279 | margin-top: 2px; | 279 | margin-top: 2px; |
280 | background: url(../../../../../images/colorpanel/transparent.png) repeat; | 280 | background: url(../../../../../images/colorpanel/transparent.png) repeat; |
281 | width: 40px; | 281 | width: 40px; |
282 | height: 20px; | 282 | height: 20px; |
283 | } | 283 | } |
284 | 284 | ||
285 | .propertiesPanel .button:active { | 285 | .propertiesPanel .button:active { |