aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-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/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html')
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html8
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>