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 /node_modules/montage/ui/bluemoon/checkbox.reel | |
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 'node_modules/montage/ui/bluemoon/checkbox.reel')
3 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.css b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.css index 372e66f2..80c2344e 100644 --- a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.css +++ b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.css | |||
@@ -72,7 +72,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
72 | } | 72 | } |
73 | 73 | ||
74 | .montage-checkbox .checkmark{ | 74 | .montage-checkbox .checkmark{ |
75 | -webkit-transition-duration: 360ms; | 75 | -webkit-transition-duration: 360ms; |
76 | } | 76 | } |
77 | 77 | ||
78 | .montage-checkbox input[type=checkbox] { | 78 | .montage-checkbox input[type=checkbox] { |
diff --git a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html index a0833ac8..95839360 100644 --- a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html +++ b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js index 0a5ae0e9..a17f30bf 100644 --- a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js +++ b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js | |||
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | /** | 30 | /** |
31 | @module "montage/ui/bluemoon/input-checkbox.reel" | 31 | @module "montage/ui/bluemoon/input-checkbox.reel" |
32 | @requires montage/core/core | 32 | @requires montage/core/core |
33 | @requires montage/ui/component | 33 | @requires montage/ui/component |
34 | */ | 34 | */ |