diff options
| author | Jose Antonio Marquez | 2012-02-29 15:15:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-29 15:15:51 -0800 |
| commit | b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (patch) | |
| tree | 5978eb8742df65de0e0b98454bfc04c2b4cac6e7 /js/components/layout/bread-crumb-button.reel/bread-crumb-button.html | |
| parent | 3a25881b3a463e4f695be2f663f141710ba1d1c1 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/components/layout/bread-crumb-button.reel/bread-crumb-button.html')
| -rwxr-xr-x | js/components/layout/bread-crumb-button.reel/bread-crumb-button.html | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html deleted file mode 100755 index b3fdb0b6..00000000 --- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | <!DOCTYPE HTML> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 10 | |||
| 11 | <link rel="stylesheet" type="text/css" href="bread-crumb-button.css"> | ||
| 12 | |||
| 13 | <script type="text/montage-serialization"> | ||
| 14 | { | ||
| 15 | "owner": { | ||
| 16 | "module": "js/components/layout/bread-crumb-button.reel", | ||
| 17 | "name": "BreadcrumbButton", | ||
| 18 | "properties": { | ||
| 19 | "element": {"#": "breadcrumbbuttonBackground"}, | ||
| 20 | "button": {"#": "breadCrumbButton"} | ||
| 21 | } | ||
| 22 | } | ||
| 23 | } | ||
| 24 | </script> | ||
| 25 | |||
| 26 | |||
| 27 | </head> | ||
| 28 | |||
| 29 | <body> | ||
| 30 | <div id="breadcrumbbuttonBackground" class="breadcrumbbuttonBackground"> | ||
| 31 | <div id="breadCrumbButton" class="breadcrumbtoolBarButton"></div> | ||
| 32 | </div> | ||
| 33 | </body> | ||
| 34 | |||
| 35 | </html> | ||
| 36 | |||