diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/io/workflow/newProjectNavigator.reel | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/io/workflow/newProjectNavigator.reel')
| -rw-r--r-- | js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css | 32 | ||||
| -rw-r--r-- | js/io/workflow/newProjectNavigator.reel/newProjectNavigator.html | 32 |
2 files changed, 0 insertions, 64 deletions
diff --git a/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css b/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css deleted file mode 100644 index b1f490e3..00000000 --- a/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.css +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | .container{ | ||
| 8 | border: 4px groove #000000; | ||
| 9 | overflow: auto; | ||
| 10 | background-color:#5f5f5f; | ||
| 11 | } | ||
| 12 | |||
| 13 | .left-nav{ | ||
| 14 | float:left; | ||
| 15 | } | ||
| 16 | |||
| 17 | .right-nav{ | ||
| 18 | float:left; | ||
| 19 | width:70%; | ||
| 20 | } | ||
| 21 | |||
| 22 | .right-top{ | ||
| 23 | border: 4px groove #000000; | ||
| 24 | overflow: auto; | ||
| 25 | max-height:150px; | ||
| 26 | } | ||
| 27 | |||
| 28 | .right-bottom{ | ||
| 29 | border: 4px groove #000000; | ||
| 30 | overflow: auto; | ||
| 31 | } | ||
| 32 | |||
diff --git a/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.html b/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.html deleted file mode 100644 index 26cbccee..00000000 --- a/js/io/workflow/newProjectNavigator.reel/newProjectNavigator.html +++ /dev/null | |||
| @@ -1,32 +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 | <link rel="stylesheet" type="text/css" href="newProjectNavigator.css"> | ||
| 11 | <script type="text/montage-serialization"> | ||
| 12 | { | ||
| 13 | "owner" : { | ||
| 14 | "module": "js/io/workflow/newProjectNavigator", | ||
| 15 | "name": "NewProjectNavigator", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#":"newProject"} | ||
| 18 | } | ||
| 19 | } | ||
| 20 | } | ||
| 21 | </script> | ||
| 22 | </head> | ||
| 23 | <body> | ||
| 24 | <div id="newProject"> | ||
| 25 | <div class="container left-nav">left nav</div> | ||
| 26 | <div class="container right-nav"> | ||
| 27 | <div class="right-top">right top</div> | ||
| 28 | <div class="right-bottom">right bottom</div> | ||
| 29 | </div> | ||
| 30 | </div> | ||
| 31 | </body> | ||
| 32 | </html> \ No newline at end of file | ||