diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/scroll-bars.reel/scroll-bars.html')
-rw-r--r-- | node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html index 93986b5d..81f097fa 100644 --- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html +++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | |||
@@ -10,8 +10,7 @@ | |||
10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
11 | { | 11 | { |
12 | "owner": { | 12 | "owner": { |
13 | "module": "montage/ui/scroll-bars.reel", | 13 | "prototype": "montage/ui/scroll-bars.reel", |
14 | "name": "ScrollBars", | ||
15 | "properties": { | 14 | "properties": { |
16 | "element": { | 15 | "element": { |
17 | "#": "montage-scroll-bars" | 16 | "#": "montage-scroll-bars" |
@@ -103,14 +102,14 @@ | |||
103 | </style> | 102 | </style> |
104 | </head> | 103 | </head> |
105 | <body> | 104 | <body> |
106 | <div id="montage-scroll-bars" class="montage-scroll-bars"> | 105 | <div data-montage-id="montage-scroll-bars" class="montage-scroll-bars"> |
107 | <div id="top" class="top"></div> | 106 | <div data-montage-id="top" class="top"></div> |
108 | <div id="bottom-clip" class="bottom-clip"> | 107 | <div data-montage-id="bottom-clip" class="bottom-clip"> |
109 | <div id="bottom" class="bottom"></div> | 108 | <div data-montage-id="bottom" class="bottom"></div> |
110 | </div> | 109 | </div> |
111 | <div id="left" class="left"></div> | 110 | <div data-montage-id="left" class="left"></div> |
112 | <div id="right-clip" class="right-clip"> | 111 | <div data-montage-id="right-clip" class="right-clip"> |
113 | <div id="right" class="right"></div> | 112 | <div data-montage-id="right" class="right"></div> |
114 | </div> | 113 | </div> |
115 | </div> | 114 | </div> |
116 | </body> | 115 | </body> |