aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-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/CSSPanelBase.reel/CSSPanelBase.html')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html6
1 files changed, 3 insertions, 3 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>