diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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> |