aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-bar.reel/document-bar.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/components/layout/document-bar.reel/document-bar.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/components/layout/document-bar.reel/document-bar.html')
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 8dcaf178..760186ba 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -61,11 +61,11 @@
61</head> 61</head>
62 62
63<body> 63<body>
64 <div id="documentBar"> 64 <div data-montage-id="documentBar">
65 <input class="zoomHotText label" id="zoomControlHT"/> 65 <input class="zoomHotText label" data-montage-id="zoomControlHT"/>
66 <span class="design-view disable" id="design">Design View</span> 66 <span class="design-view disable" data-montage-id="design">Design View</span>
67 <span class="code-view disable" id="code">Code View</span> 67 <span class="code-view disable" data-montage-id="code">Code View</span>
68 <div id="disabledCondition" class="panelDisabled"></div> 68 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
69 </div> 69 </div>
70</body> 70</body>
71</html> \ No newline at end of file 71</html> \ No newline at end of file