From 09852e9b9b8e64f003bed5aa57630d8b42c8ac95 Mon Sep 17 00:00:00 2001 From: François Frisch Date: Sat, 17 Mar 2012 19:28:30 -0700 Subject: Integrating picasa carousel and youtube channel --- .../ui/youtube-channel.reel/youtube-channel.html | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 node_modules/montage/ui/youtube-channel.reel/youtube-channel.html (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.html') diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html new file mode 100644 index 00000000..b3858ec9 --- /dev/null +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html @@ -0,0 +1,34 @@ + + + + + + + + +
+
+
+ + -- cgit v1.2.3 From 6b1467535198f6b85bd2bf045d2c354b812616c2 Mon Sep 17 00:00:00 2001 From: François Frisch Date: Sat, 17 Mar 2012 20:03:18 -0700 Subject: Youtube video is droppable still getting errors with the carousel Signed-off-by: Valerio Virgillito --- node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.html') diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html index b3858ec9..184ac360 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html @@ -10,14 +10,14 @@ +
-
+ + + + +
+
+
-- cgit v1.2.3 From ab7c54f28151e5ae485881ec53ba22718ff4b449 Mon Sep 17 00:00:00 2001 From: Stuart Knightley Date: Tue, 20 Mar 2012 09:32:21 -0700 Subject: Change Youtube channel transition to avoid rendering bug --- .../montage/ui/youtube-channel.reel/youtube-channel.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.html') diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html index 50286c22..a405fc7c 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html @@ -58,9 +58,15 @@ height: 90px; width: 120px; background-color: #000; + opacity: 1; + + -webkit-transition: opacity 0.5s ease-in-out; + } + .montage-youtube-channel.show img { + opacity: 0; } - .montage-youtube-channel-popup { + .montage-youtube-channel .montage-youtube-channel-popup { width: 640px; border: 5px solid #000; border-radius: 5px; @@ -74,13 +80,11 @@ z-index: 9000; - -webkit-transform: scale3d(0, 0, 1); opacity: 0; - -webkit-transition: all 0.5s ease-in-out; visibility: hidden; + -webkit-transition: all 0.5s ease-in-out; } - .montage-youtube-channel-popup.show { - -webkit-transform: scale3d(1, 1, 1); + .montage-youtube-channel.show .montage-youtube-channel-popup { opacity: 1; visibility: visible; } -- cgit v1.2.3 From 2830adc43a5f08dcfb4ff59361faa8b49562f91d Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 20 Mar 2012 15:15:33 -0700 Subject: Removing the youtube channel video black background Signed-off-by: Valerio Virgillito --- node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | 1 - 1 file changed, 1 deletion(-) (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.html') diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html index a405fc7c..96d823a5 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html @@ -70,7 +70,6 @@ width: 640px; border: 5px solid #000; border-radius: 5px; - background: #000; position: fixed; top: 50%; -- cgit v1.2.3 From 7edc0c123f9157d48543b09f5a9d7bb496e14f44 Mon Sep 17 00:00:00 2001 From: Stuart Knightley Date: Wed, 21 Mar 2012 14:16:55 -0700 Subject: Make Youtube video fill the full page Includes Chrome and Canary code paths for rendering bug fixes --- .../ui/youtube-channel.reel/youtube-channel.html | 46 ++++++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.html') diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html index 96d823a5..f40ccadb 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html @@ -33,6 +33,12 @@ "element": {"#": "imageC"} } }, + "button": { + "prototype": "montage/ui/button.reel", + "properties": { + "element": {"#": "close"} + } + }, "owner": { "module": "montage/ui/youtube-channel.reel", @@ -51,6 +57,7 @@ @@ -96,6 +115,7 @@
+
-- cgit v1.2.3 From 0243eed41eddd5bde3a7ce0c6e2ae7313457b19b Mon Sep 17 00:00:00 2001 From: Stuart Knightley Date: Wed, 21 Mar 2012 14:27:43 -0700 Subject: Add scale animation back to youtube channel Masks animation error on Canary. Also looks cool. --- node_modules/montage/ui/youtube-channel.reel/youtube-channel.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'node_modules/montage/ui/youtube-channel.reel/youtube-channel.html') diff --git a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html index f40ccadb..848322e0 100644 --- a/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage/ui/youtube-channel.reel/youtube-channel.html @@ -84,11 +84,13 @@ opacity: 0; visibility: hidden; + -webkit-transform: scale3d(0, 0, 1); -webkit-transition: all 0.5s ease-in-out; } .montage-youtube-channel-popup.show { opacity: 1; visibility: visible; + -webkit-transform: scale3d(1, 1, 1); } .montage-youtube-channel-close { -- cgit v1.2.3