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/Materials/materials-popup.reel/materials-popup.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/Materials/materials-popup.reel/materials-popup.css')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index d53cb795..03ea13cd 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css | |||
| @@ -130,8 +130,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 130 | 130 | ||
| 131 | .mp_properties_list > .mp_property > .colortoolbar | 131 | .mp_properties_list > .mp_property > .colortoolbar |
| 132 | { | 132 | { |
| 133 | width: 27px !important; | 133 | width: 27px !important; |
| 134 | height: 27px !important; | 134 | height: 27px !important; |
| 135 | overflow:hidden !important; | 135 | overflow:hidden !important; |
| 136 | margin-top: -6px; | 136 | margin-top: -6px; |
| 137 | } | 137 | } |
| @@ -177,4 +177,4 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 177 | .materials_popup .mp_reset_btn { | 177 | .materials_popup .mp_reset_btn { |
| 178 | float: right; | 178 | float: right; |
| 179 | margin-right: 8px; | 179 | margin-right: 8px; |
| 180 | } \ No newline at end of file | 180 | } |