aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/panels/CSSPanel
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/CSSPanel')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html6
-rwxr-xr-xjs/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html8
2 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index c62b2b23..1d74fab4 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -38,13 +38,13 @@
38 </script> 38 </script>
39 </head> 39 </head>
40<body> 40<body>
41 <div id="css_panel" class="css_panel"> 41 <div data-montage-id="css_panel" class="css_panel">
42 <!-- Stylesheet list subsection --> 42 <!-- Stylesheet list subsection -->
43 <h2 id="nj-css-sheets-header" class="nj-section-header"> 43 <h2 id="nj-css-sheets-header" class="nj-section-header">
44 <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div> 44 <div id="nj-css-sheets-arrow" class="panelDisclosureIcon"></div>
45 Stylesheets <span id="nj-current-doc-name"></span> 45 Stylesheets <span id="nj-current-doc-name"></span>
46 </h2> 46 </h2>
47 <div id="nj-section-stylesheets" class="nj-sub-panel"> 47 <div data-montage-id="nj-section-stylesheets" id="nj-section-stylesheets" class="nj-sub-panel">
48 <ul id="nj-sheet-list"></ul> 48 <ul id="nj-sheet-list"></ul>
49 </div> 49 </div>
50 <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar"> 50 <div id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
@@ -59,7 +59,7 @@
59 <span id="nj-num-items">0</span> elements selected 59 <span id="nj-num-items">0</span> elements selected
60 </span> 60 </span>
61 </h2> 61 </h2>
62 <div id="nj-computed-sub-panel"></div> 62 <div data-montage-id="nj-computed-sub-panel" id="nj-computed-sub-panel"></div>
63 <div id="nj-section-styles" class="nj-sub-panel"> 63 <div id="nj-section-styles" class="nj-sub-panel">
64 <!-- <ul id="nj-css-rule-list"></ul> --> 64 <!-- <ul id="nj-css-rule-list"></ul> -->
65 </div> 65 </div>
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>