aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
diff options
context:
space:
mode:
authorhwc4872012-05-31 17:11:08 -0700
committerhwc4872012-05-31 17:11:08 -0700
commit1c445cf5d905f79937998cf2f1115594ea8c1074 (patch)
tree35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
parent335ce503996e3ccbd2909086328d0a31fbd03370 (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/io/system/ninjalibrary.json
Diffstat (limited to 'js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html')
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html12
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>