diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html')
| -rwxr-xr-x | js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index 53c243a8..25196bc6 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | |||
| @@ -26,10 +26,10 @@ | |||
| 26 | 26 | ||
| 27 | </head> | 27 | </head> |
| 28 | <body id="computestylesubpanel" onload=""> | 28 | <body id="computestylesubpanel" onload=""> |
| 29 | <div id="nj-css-panel-computed" class="nj-css-panel-hide"> | 29 | <div data-montage-id="nj-css-panel-computed" class="nj-css-panel-hide"> |
| 30 | <div id="nj-css-filter-panel"> | 30 | <div id="nj-css-filter-panel"> |
| 31 | <input id="nj-css-filter" class="nj-skinned" type="search"> | 31 | <input data-montage-id="nj-css-filter" class="nj-skinned" type="search"> |
| 32 | <select id="nj-css-group-select" class="nj-skinned"> | 32 | <select data-montage-id="nj-css-group-select" class="nj-skinned"> |
| 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 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"></dl> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| 46 | </body> | 46 | </body> |