aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-07 11:18:11 -0700
committerNivesh Rajbhandari2012-05-07 11:18:11 -0700
commite377a8dc0b0e34905782ed867acb5fe725ae0131 (patch)
tree6931311aabd7a4e366df195a168d437f1d0d8465 /js/components/layout
parent8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html8
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html10
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html6
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html6
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html10
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html36
11 files changed, 45 insertions, 47 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 7e14157e..ae3e2022 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -78,11 +78,11 @@
78 </head> 78 </head>
79 <body> 79 <body>
80 80
81 <section id="breadcrumbTrail" class="breadcrumbTrail"> 81 <section data-montage-id="breadcrumbTrail" class="breadcrumbTrail">
82 <div id="breadcrumb_container"> 82 <div data-montage-id="breadcrumb_container">
83 <button id="breadcrumb_button" class="nj-skinned"></button> 83 <button data-montage-id="breadcrumb_button" class="nj-skinned"></button>
84 </div> 84 </div>
85 <div id="disabledCondition" class="panelDisabled"></div> 85 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
86 </section> 86 </section>
87 87
88 </body> 88 </body>
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
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 451d9cc4..679ebb62 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -23,9 +23,9 @@
23 </script> 23 </script>
24 </head> 24 </head>
25 <body> 25 <body>
26 <li id="documentEntry" class="documentEntry"> 26 <li data-montage-id="documentEntry" class="documentEntry">
27 <div id="isActive"></div> 27 <div data-montage-id="isActive"></div>
28 <span id="name"></span> 28 <span data-montage-id="name"></span>
29 <img src="js/components/layout/document-entry.reel/close_button.gif"> 29 <img src="js/components/layout/document-entry.reel/close_button.gif">
30 </li> 30 </li>
31 </body> 31 </body>
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 1516a8ce..4aed23d9 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -69,9 +69,9 @@
69 </head> 69 </head>
70 70
71 <body> 71 <body>
72 <div id="openDocumentsTabComponent" class="documentsTab"> 72 <div data-montage-id="openDocumentsTabComponent" class="documentsTab">
73 <ul id="openDocuments" class="openDocuments"> 73 <ul data-montage-id="openDocuments" class="openDocuments">
74 <li id="document"></li> 74 <li data-montage-id="document"></li>
75 </ul> 75 </ul>
76 </div> 76 </div>
77 </body> 77 </body>
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
index 15d4955c..b6c9f856 100755
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ b/js/components/layout/stage-mode.reel/stage-mode.html
@@ -24,9 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="stageMode" class="stageMode"> 27 <div data-montage-id="stageMode" class="stageMode"></div>
28
29 </div>
30 </body> 28 </body>
31 29
32</html> 30</html>
diff --git a/js/components/layout/subtool-button.reel/subtool-button.css b/js/components/layout/subtool-button.reel/subtool-button.css
index cda505b0..b98941d9 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.css
+++ b/js/components/layout/subtool-button.reel/subtool-button.css
@@ -12,11 +12,11 @@
12 background: #B2B2B2; 12 background: #B2B2B2;
13} 13}
14 14
15#toolBarButton { 15.toolBarButton {
16 border: 3px; 16 border: 3px;
17 float: left; 17 float: left;
18} 18}
19 19
20#toolBarButton:hover { 20.toolBarButton:hover {
21 opacity: 1; 21 opacity: 1;
22} 22}
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 501193d3..30f75d8c 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.html
@@ -24,7 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="toolButton" class="toolbutton"></div> 27 <div data-montage-id="toolButton" class="toolbutton"></div>
28 </body> 28 </body>
29 29
30</html> 30</html>
diff --git a/js/components/layout/tool-button.reel/tool-button.css b/js/components/layout/tool-button.reel/tool-button.css
index 46152424..f9d23f35 100755
--- a/js/components/layout/tool-button.reel/tool-button.css
+++ b/js/components/layout/tool-button.reel/tool-button.css
@@ -14,11 +14,11 @@
14 background: #B2B2B2; 14 background: #B2B2B2;
15} 15}
16 16
17#toolBarButton { 17.toolBarButton {
18 border: 3px; 18 border: 3px;
19 float: left; 19 float: left;
20} 20}
21 21
22#toolBarButton:hover { 22.toolBarButton:hover {
23 opacity: 1; 23 opacity: 1;
24} 24}
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 3980b92c..84a6d34e 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -25,7 +25,7 @@
25 </head> 25 </head>
26 26
27 <body> 27 <body>
28 <div id="toolBarButton"></div> 28 <div data-montage-id="toolBarButton" class="toolBarButton"></div>
29 </body> 29 </body>
30 30
31</html> 31</html>
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index acee20b2..9aa05e5d 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -162,16 +162,16 @@
162 </head> 162 </head>
163 163
164 <body> 164 <body>
165 <div id="toolsList" class="toolsList"> 165 <div data-montage-id="toolsList" class="toolsList">
166 <div id="toolscontainer" class="toolscontainer"> 166 <div data-montage-id="toolscontainer" class="toolscontainer">
167 <div id="toolbutton" class="toolbutton"></div> 167 <div data-montage-id="toolbutton" class="toolbutton"></div>
168 <div id="groupLine"> 168 <div data-montage-id="groupLine">
169 <hr /> 169 <hr />
170 </div> 170 </div>
171 </div> 171 </div>
172 <!-- TODO: Remove and add as a component --> 172 <!-- TODO: Remove and add as a component -->
173 <div id="colortoolbar"></div> 173 <div id="colortoolbar"></div>
174 <div id="disabledCondition" class="panelDisabled"></div> 174 <div data-montage-id="disabledCondition" class="panelDisabled"></div>
175 </div> 175 </div>
176 176
177 </body> 177 </body>
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..10309ec4 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -171,24 +171,24 @@
171 </head> 171 </head>
172 172
173 <body> 173 <body>