aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage-google
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage-google
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-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-google')
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html2
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.js4
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html2
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js2
-rw-r--r--node_modules/montage-google/map.reel/map.html12
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/image.reel/image.html8
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.css2
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html2
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.html2
-rw-r--r--node_modules/montage-google/youtube-player.reel/youtube-player.html2
10 files changed, 19 insertions, 19 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
index 32f8b0b8..2785d56b 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.js b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.js
index bd69276b..d92c6b4b 100644
--- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.js
+++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.js
@@ -38,8 +38,8 @@ exports.FeedEntry = Montage.create(Component, {
38 return this._entry; 38 return this._entry;
39 }, 39 },
40 set: function(value) { 40 set: function(value) {
41 this._entry = value; 41 this._entry = value;
42 } 42 }
43 } 43 }
44 44
45}); 45});
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
index 096a085d..2d4e5204 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
index 6f0c1cc6..00218b1f 100644
--- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
+++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js
@@ -206,7 +206,7 @@ exports.FeedReader = Montage.create(Component, {
206 206
207 } 207 }
208 }, 208 },
209 209
210 serializeProperties: { 210 serializeProperties: {
211 value: function(serializer) { 211 value: function(serializer) {
212 serializer.set("element", this.element); 212 serializer.set("element", this.element);
diff --git a/node_modules/montage-google/map.reel/map.html b/node_modules/montage-google/map.reel/map.html
index 9eec63e5..325e70b1 100644
--- a/node_modules/montage-google/map.reel/map.html
+++ b/node_modules/montage-google/map.reel/map.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -37,13 +37,13 @@ POSSIBILITY OF SUCH DAMAGE.
37 37
38 <script type="text/montage-serialization"> 38 <script type="text/montage-serialization">
39 { 39 {
40 40
41 "owner": { 41 "owner": {
42 "prototype": "map.reel", 42 "prototype": "map.reel",
43 "properties": { 43 "properties": {
44 "element": {"#": "map-container"}, 44 "element": {"#": "map-container"},
45 "mapEl": {"#": "map"} 45 "mapEl": {"#": "map"}
46 } 46 }
47 } 47 }
48 } 48 }
49 </script> 49 </script>
@@ -61,9 +61,9 @@ POSSIBILITY OF SUCH DAMAGE.
61 61
62</head> 62</head>
63<body> 63<body>
64 64
65 <div data-montage-id="map-container"> 65 <div data-montage-id="map-container">
66 <div data-montage-id="map" id="map" class="montage-google-map">MAP</div> 66 <div data-montage-id="map" id="map" class="montage-google-map">MAP</div>
67 </div> 67 </div>
68 68
69</body> 69</body>
diff --git a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
index 56fd0d1c..473f8fcb 100644
--- a/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
+++ b/node_modules/montage-google/picasa-carousel.reel/image.reel/image.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -51,9 +51,9 @@ POSSIBILITY OF SUCH DAMAGE.
51 width: 206px; 51 width: 206px;
52 height: 140px; 52 height: 140px;
53 border: 2px solid #888; 53 border: 2px solid #888;
54 background-repeat: no-repeat; 54 background-repeat: no-repeat;
55 background-position: center center; 55 background-position: center center;
56 background-size: cover; 56 background-size: cover;
57 opacity: 0.999; 57 opacity: 0.999;
58 } 58 }
59</style> 59</style>
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
index 2b6df08d..d158fe4b 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.css
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
32.montage-google-picasa-carousel { 32.montage-google-picasa-carousel {
33 width: 100%; 33 width: 100%;
34 height: 100%; 34 height: 100%;
35 -webkit-transform-style: preserve-3d; 35 -webkit-transform-style: preserve-3d;
36} 36}
37 37
38.montage-google-picasa-carousel .flow { 38.montage-google-picasa-carousel .flow {
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index e2faf9d8..80827382 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
index f5a74b8c..7342f3e8 100644
--- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
+++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
diff --git a/node_modules/montage-google/youtube-player.reel/youtube-player.html b/node_modules/montage-google/youtube-player.reel/youtube-player.html
index 9d51e73f..098279c6 100644
--- a/node_modules/montage-google/youtube-player.reel/youtube-player.html
+++ b/node_modules/montage-google/youtube-player.reel/youtube-player.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 17:00:25 +0000