diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html')
| -rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index c62b2b23..1d74fab4 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |||
| @@ -38,13 +38,13 @@ | |||
| 38 | </script> | 38 | </script> |
| 39 | </head> | 39 | </head> |
| 40 | <body> | 40 | <body> |
| 41 | <div id="css_panel" class="css_panel"> | 41 | <div data-montage-id="css_panel" class="css_panel"> |
| 42 | <!-- Stylesheet list subsection --> | 42 | <!-- Stylesheet list subsection --> |
| 43 | <h2 id="nj-css-sheets-header" class="nj-section-header"> | 43 | <h2 id="nj-css-sheets-header" class="nj-section-header"> |
| 44 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> | 44 | <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> |
| 45 | Stylesheets <span id="nj-current-doc-name"></span> | 45 | Stylesheets <span id="nj-current-doc-name"></span> |
| 46 | </h2> | 46 | </h2> |
| 47 | <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"> |
| 48 | <ul id="nj-sheet-list"></ul> | 48 | <ul id="nj-sheet-list"></ul> |
| 49 | </div> | 49 | </div> |
| 50 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | 50 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> |
| @@ -59,7 +59,7 @@ | |||
| 59 | <span id="nj-num-items">0</span> elements selected | 59 | <span id="nj-num-items">0</span> elements selected |
| 60 | </span> | 60 | </span> |
| 61 | </h2> | 61 | </h2> |
| 62 | <div id="nj-computed-sub-panel"></div> | 62 | <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div> |
| 63 | <div id="nj-section-styles" class="nj-sub-panel"> | 63 | <div id="nj-section-styles" class="nj-sub-panel"> |
| 64 | <!-- <ul id="nj-css-rule-list"></ul> --> | 64 | <!-- <ul id="nj-css-rule-list"></ul> --> |
| 65 | </div> | 65 | </div> |