diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html')
| -rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index 98b2b61d..1d74fab4 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "resizer1": { | 13 | "resizer1": { |
| 14 | "module": "js/panels/Resizer", | 14 | "prototype": "js/panels/Resizer", |
| 15 | "name": "Resizer", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "subPanelResizer"}, | 16 | "element": {"#": "subPanelResizer"}, |
| 18 | "panel": {"#": "nj-section-stylesheets"}, | 17 | "panel": {"#": "nj-section-stylesheets"}, |
| @@ -21,16 +20,14 @@ | |||
| 21 | }, | 20 | }, |
| 22 | 21 | ||
| 23 | "ComputedStyleSubPanel1": { | 22 | "ComputedStyleSubPanel1": { |
| 24 | "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", | 23 | "prototype": "js/panels/CSSPanel/ComputedStyleSubPanel.reel", |
| 25 | "name": "ComputedStyleSubPanel", | ||
| 26 | "properties": { | 24 | "properties": { |
| 27 | "element": {"#": "nj-computed-sub-panel"} | 25 | "element": {"#": "nj-computed-sub-panel"} |
| 28 | } | 26 | } |
| 29 | }, | 27 | }, |
| 30 | 28 | ||
| 31 | "owner": { | 29 | "owner": { |
| 32 | "module": "js/panels/CSSPanel/CSSPanelBase.reel", | 30 | "prototype": "js/panels/CSSPanel/CSSPanelBase.reel", |
| 33 | "name": "CSSPanelBase", | ||
| 34 | "properties": { | 31 | "properties": { |
| 35 | "element": {"#": "css_panel"}, | 32 | "element": {"#": "css_panel"}, |
| 36 | "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"} | 33 | "computedStyleSubPanel": {"@": "ComputedStyleSubPanel1"} |
| @@ -41,13 +38,13 @@ | |||
| 41 | </script> | 38 | </script> |
| 42 | </head> | 39 | </head> |
| 43 | <body> | 40 | <body> |
| 44 | <div id="css_panel" class="css_panel"> | 41 | <div data-montage-id="css_panel" class="css_panel"> |
| 45 | <!-- Stylesheet list subsection --> | 42 | <!-- Stylesheet list subsection --> |
| 46 | <h2 id="nj-css-sheets-header" class="nj-section-header"> | 43 | <h2 id="nj-css-sheets-header" class="nj-section-header"> |
| 47 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> | 44 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> |
| 48 | Stylesheets <span id="nj-current-doc-name"></span> | 45 | Stylesheets <span id="nj-current-doc-name"></span> |
| 49 | </h2> | 46 | </h2> |
| 50 | <div id="nj-section-stylesheets" class="nj-sub-panel"> | 47 | <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel"> |
| 51 | <ul id="nj-sheet-list"></ul> | 48 | <ul id="nj-sheet-list"></ul> |
| 52 | </div> | 49 | </div> |
| 53 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | 50 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> |
| @@ -62,7 +59,7 @@ | |||
| 62 | <span id="nj-num-items">0</span> elements selected | 59 | <span id="nj-num-items">0</span> elements selected |
| 63 | </span> | 60 | </span> |
| 64 | </h2> | 61 | </h2> |
| 65 | <div id="nj-computed-sub-panel"></div> | 62 | <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div> |
| 66 | <div id="nj-section-styles" class="nj-sub-panel"> | 63 | <div id="nj-section-styles" class="nj-sub-panel"> |
| 67 | <!-- <ul id="nj-css-rule-list"></ul> --> | 64 | <!-- <ul id="nj-css-rule-list"></ul> --> |
| 68 | </div> | 65 | </div> |