diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html')
| -rwxr-xr-x | js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index 25196bc6..cf5bbbdd 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |||
| @@ -25,11 +25,11 @@ | |||
| 25 | </script> | 25 | </script> |
| 26 | 26 | ||
| 27 | </head> | 27 | </head> |
| 28 | <body id="computestylesubpanel" onload=""> | 28 | <body> |
| 29 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide"> | 29 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-computed"> |
| 30 | <div id="nj-css-filter-panel"> | 30 | <div data-montage-id="nj-css-filter-panel" class="nj-css-filter-panel"> |
| 31 | <input data-montage-id="nj-css-filter" class="nj-skinned" type="search"> | 31 | <input data-montage-id="nj-css-filter" class="nj-skinned nj-css-filter-input" type="search"> |
| 32 | <select data-montage-id="nj-css-group-select" class="nj-skinned"> | 32 | <select data-montage-id="nj-css-group-select" class="nj-skinned nj-css-group-select"> |
| 33 | <option value="all">All</option> | 33 | <option value="all">All</option> |
| 34 | <option value="summary" selected>Summary</option> | 34 | <option value="summary" selected>Summary</option> |
| 35 | <option value="background">Background</option> | 35 | <option value="background">Background</option> |
| @@ -40,7 +40,7 @@ | |||
| 40 | </select> | 40 | </select> |
| 41 | </div> | 41 | </div> |
| 42 | <div class="nj-sub-panel"> | 42 | <div class="nj-sub-panel"> |
| 43 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list"></dl> | 43 | <dl data-montage-id="nj-css-computed-list" class="nj-css-style-list nj-css-computed-list"></dl> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| 46 | </body> | 46 | </body> |