aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-30 16:11:58 -0700
committerValerio Virgillito2012-04-30 16:11:58 -0700
commit30bf02869c93072cdb3a3a8b50cf943917f3b026 (patch)
tree1c62cb494c2b8da398a7a635a94f3064f40d596c
parentb8dc3c42715274e61b34dc3c65e023078123f2e2 (diff)
parent6b67b498b3b1eec82e7bb7f34261e2c390506616 (diff)
downloadninja-30bf02869c93072cdb3a3a8b50cf943917f3b026.tar.gz
Merge pull request #183 from mqg734/data-id
Updating id to data-montage-id.
Diffstat
-rwxr-xr-xjs/components/checkbox.reel/checkbox.html2
-rwxr-xr-xjs/components/combobox.reel/combobox.html2
-rwxr-xr-xjs/components/hottext.reel/hottext.html2
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.html2
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html12
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html6
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html6
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.css43
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html14
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css15
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html26
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html30
13 files changed, 76 insertions, 92 deletions
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html
index a03d72fb..ded91fc2 100755
--- a/js/components/checkbox.reel/checkbox.html
+++ b/js/components/checkbox.reel/checkbox.html
@@ -18,6 +18,6 @@
18 </script> 18 </script>
19</head> 19</head>
20<body> 20<body>
21 <input id="ch_comp" class="nj-skinned" type="checkbox"> 21 <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox">
22</body> 22</body>
23</html> \ No newline at end of file 23</html> \ No newline at end of file
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index a68dd37f..81920005 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -18,6 +18,6 @@
18 </script> 18 </script>
19</head> 19</head>
20<body> 20<body>
21 <select id="cb_comp" class="nj-skinned" /> 21 <select data-montage-id="cb_comp" class="nj-skinned" />
22</body> 22</body>
23</html> \ No newline at end of file 23</html> \ No newline at end of file
diff --git a/js/components/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html
index 314d4ca3..c759354e 100755
--- a/js/components/hottext.reel/hottext.html
+++ b/js/components/hottext.reel/hottext.html
@@ -23,6 +23,6 @@
23 23
24</head> 24</head>
25<body> 25<body>
26 <input id="hottext"/> 26 <input data-montage-id="hottext" class="hottext"/>
27</body> 27</body>
28</html> \ No newline at end of file 28</html> \ No newline at end of file
diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html
index 3f946f9b..ec10f975 100755
--- a/js/components/hottextunit.reel/hottextunit.html
+++ b/js/components/hottextunit.reel/hottextunit.html
@@ -22,6 +22,6 @@
22 22
23</head> 23</head>
24<body> 24<body>
25 <div id="hottextunit" class="hottextunit"></div> 25 <div data-montage-id="hottextunit" class="hottextunit"></div>
26</body> 26</body>
27</html> \ No newline at end of file 27</html> \ No newline at end of file
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html
index 8f10092d..647f7e79 100755
--- a/js/components/ui/color-chip.reel/color-chip.html
+++ b/js/components/ui/color-chip.reel/color-chip.html
@@ -23,13 +23,11 @@
23</head> 23</head>
24<body> 24<body>
25 <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> 25 <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class -->
26 <div id="colorChipContainer" class="colortoolbar"> 26 <div data-montage-id="colorChipContainer" class="colortoolbar">
27 27 <div data-montage-id="chipIcon"></div>
28 <div id="chipIcon"></div> 28 <div class="chipContainer">
29 29 <button data-montage-id="chipButton"></button>
30 <div class="chipContainer"><button id="chipButton"></button></div> 30 </div>
31
32 </div> 31 </div>
33
34</body> 32</body>
35</html> \ No newline at end of file 33</html> \ No newline at end of file
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index 0c3c465e..735f970c 100755
--- a/js/components/ui/file-input.reel/file-input.html
+++ b/js/components/ui/file-input.reel/file-input.html
@@ -22,9 +22,9 @@
22 </script> 22 </script>
23</head> 23</head>
24<body> 24<body>
25 <div id="fileInput" class="fileInput"> 25 <div data-montage-id="fileInput" class="fileInput">
26 <input id="fileInputTextField" class="file-path nj-skinned" type="text" /> 26 <input data-montage-id="fileInputTextField" class="file-path nj-skinned" type="text" />
27 <input id="fileInputControl" class="browse-button" type="file" /> 27 <input data-montage-id="fileInputControl" class="browse-button" type="file" />
28 </div> 28 </div>
29</body> 29</body>
30</html> \ No newline at end of file 30</html> \ No newline at end of file
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index 4cdb4e69..ba85c089 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.html
@@ -65,9 +65,9 @@
65 </script> 65 </script>
66</head> 66</head>
67<body> 67<body>
68 <div id="inputRow" class="inputRow" style="-webkit-user-select: none;"> 68 <div data-montage-id="inputRow" class="inputRow" style="-webkit-user-select: none;">
69 <div id="inputList"> 69 <div data-montage-id="inputList">
70 <div id="inputPair"></div> 70 <div data-montage-id="inputPair"></div>
71 </div> 71 </div>
72 </div> 72 </div>
73</body> 73</body>
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html
index d85cb0e3..0535ea5f 100755
--- a/js/components/ui/property-control.reel/property-control.html
+++ b/js/components/ui/property-control.reel/property-control.html
@@ -28,10 +28,10 @@
28 </script> 28 </script>
29</head> 29</head>
30<body> 30<body>
31 <div id="propControl" class="propControl"> 31 <div data-montage-id="propControl" class="propControl">
32 <div id="propLabel" class="prop-label"></div> 32 <div data-montage-id="propLabel" class="prop-label"></div>
33 <div id="propController" class="prop-controller"> 33 <div data-montage-id="propController" class="prop-controller">
34 <div id="subDummy"></div> 34 <div data-montage-id="subDummy"></div>
35 </div> 35 </div>
36 </div> 36 </div>
37</body> 37</body>
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index fe88ebf6..bed3acfe 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -5,43 +5,34 @@
5 </copyright> */ 5 </copyright> */
6 6
7.materials_library_panel hr { 7.materials_library_panel hr {
8 float: left; 8 float: left;
9 clear: both; 9 clear: both;
10 width: 100%; 10 width: 100%;
11 display: block; 11 display: block;
12 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); 12 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));
13 border: none; 13 border: none;
14 height: 2px; 14 height: 2px;
15 margin: 4px 0px 4px 0px; 15 margin: 4px 0 4px 0;
16} 16}
17 17
18 18
19#ml_buttons { 19.ml_buttons {
20 clear:both; 20 clear:both;
21 float: left; 21 float: left;
22 margin: 0px -4px 0px 4px; 22 margin: 0 -4px 0 4px;
23 width: 97%; 23 width: 97%;
24} 24}
25 25
26#ml_buttons .nj-skinned{ 26.ml_buttons .nj-skinned {
27 height: 22px; 27 height: 22px;
28 overflow: hidden; 28 overflow: hidden;
29 display: block; 29 display: block;
30 cursor: pointer; 30 cursor: pointer;
31 margin: 0px 1px; 31 margin: 0 1px;
32}
33
34#ml_add_btn {
35 float: left;
36 width: 60px;
37}
38
39#ml_copy_btn {
40 float: left; 32 float: left;
41 width: 60px; 33 width: 60px;
42} 34}
43 35
44#ml_delete_btn { 36.ml_buttons .nj-skinned:last-child {
45 float: right; 37 float: right;
46 width: 60px;
47} \ No newline at end of file 38} \ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 741ff6aa..7fc48a55 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -88,15 +88,15 @@
88 </head>