diff options
author | Jon Reid | 2012-06-25 11:07:33 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /node_modules/montage-google/picasa-carousel.reel/image.reel/image.html | |
parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel/image.reel/image.html')
-rw-r--r-- | node_modules/montage-google/picasa-carousel.reel/image.reel/image.html | 3 |
1 files changed, 1 insertions, 2 deletions
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 368bd059..050c0643 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 | |||
@@ -9,7 +9,7 @@ | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "owner": { | 11 | "owner": { |
12 | "prototype": "montage-google/picasa-carousel.reel/image.reel", | 12 | "prototype": "picasa-carousel.reel/image.reel", |
13 | "properties": { | 13 | "properties": { |
14 | "element": {"#": "Image"} | 14 | "element": {"#": "Image"} |
15 | } | 15 | } |
@@ -26,7 +26,6 @@ | |||
26 | margin-left: -105px; | 26 | margin-left: -105px; |
27 | width: 206px; | 27 | width: 206px; |
28 | height: 140px; | 28 | height: 140px; |
29 | border-radius: 4px; | ||
30 | border: 2px solid #888; | 29 | border: 2px solid #888; |
31 | background-repeat: no-repeat; | 30 | background-repeat: no-repeat; |
32 | background-position: center center; | 31 | background-position: center center; |