diff options
| author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
| commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
| tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |
| parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html')
| -rwxr-xr-x | js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index db630934..98b2b61d 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> | 53 | <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> |
| 54 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> | 54 | <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a> |
| 55 | </div> | 55 | </div> |
| 56 | <div id="subPanelResizer" class="resizer"></div> | 56 | <div data-montage-id="subPanelResizer" class="resizer"></div> |
| 57 | <!-- Style Rule list subsection --> | 57 | <!-- Style Rule list subsection --> |
| 58 | <h2 id="nj-css-styles-header" class="nj-section-header"> | 58 | <h2 id="nj-css-styles-header" class="nj-section-header"> |
| 59 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> | 59 | <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div> |