diff options
Diffstat (limited to 'js/components/ui')
9 files changed, 28 insertions, 40 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.css b/js/components/ui/color-chip.reel/color-chip.css index da75c41e..7c7135a2 100755 --- a/js/components/ui/color-chip.reel/color-chip.css +++ b/js/components/ui/color-chip.reel/color-chip.css | |||
@@ -19,13 +19,3 @@ | |||
19 | padding: 0; | 19 | padding: 0; |
20 | background: none; | 20 | background: none; |
21 | } | 21 | } |
22 | |||
23 | .colortoolbar .chipContainer { | ||
24 | margin: 1px 1px 1px 1px !important; | ||
25 | width: 40px !important; | ||
26 | height: 20px !important; | ||
27 | border: 0; | ||
28 | padding: 0; | ||
29 | background-image: url(../../../../images/colorpanel/transparent.png) !important; | ||
30 | background-repeat: repeat !important; | ||
31 | } \ 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/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html index f2406566..2ad5885a 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.html +++ b/js/components/ui/icon-list-basic/icon.reel/icon.html | |||
@@ -22,9 +22,9 @@ | |||
22 | </script> | 22 | </script> |
23 | </head> | 23 | </head> |
24 | <body> | 24 | <body> |
25 | <div id="icon" class="icon"> | 25 | <div data-montage-id="icon" class="icon"> |
26 | <div><img id="iconImg" class="iconImg" src="" /></div> | 26 | <div><img data-montage-id="iconImg" class="iconImg" src="" /></div> |
27 | <div id="iconLabel" class="iconLabel"></div> | 27 | <div data-montage-id="iconLabel" class="iconLabel"></div> |
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/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html index 35260527..05d3ea7d 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | |||
@@ -55,9 +55,9 @@ | |||
55 | </script> | 55 | </script> |
56 | </head> | 56 | </head> |
57 | <body> | 57 | <body> |
58 | <div id="list" class="list"> | 58 | <div data-montage-id="list" class="list"> |
59 | <div id="iconsView"> | 59 | <div data-montage-id="iconsView"> |
60 | <div id="icon"></div> | 60 | <div data-montage-id="icon"></div> |
61 | </div> | 61 | </div> |
62 | </div> | 62 | </div> |
63 | </body> | 63 | </body> |
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/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html index f0c51fcc..1144b563 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.html +++ b/js/components/ui/tree-basic/tree.reel/tree.html | |||
@@ -65,9 +65,9 @@ | |||
65 | </script> | 65 | </script> |
66 | </head> | 66 | </head> |
67 | <body> | 67 | <body> |
68 | <div id="atree" class="atree"> | 68 | <div data-montage-id="atree" class="atree"> |
69 | <ul id="treeView" style="display:block;"> | 69 | <ul data-montage-id="treeView" style="display:block;"> |
70 | <li id="treeItem"></li> | 70 | <li data-montage-id="treeItem"></li> |
71 | </ul> | 71 | </ul> |
72 | </div> | 72 | </div> |
73 | </body> | 73 | </body> |
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html index 9b8cb1ea..c5cdc533 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html | |||
@@ -23,12 +23,12 @@ | |||
23 | </script> | 23 | </script> |
24 | </head> | 24 | </head> |
25 | <body> | 25 | <body> |
26 | <li id="atreeItem" class="atreeItem"> | 26 | <li data-montage-id="atreeItem" class="atreeItem"> |
27 | <span id="treeArrow" class="treeArrow hidden">▶</span> | 27 | <span data-montage-id="treeArrow" class="treeArrow hidden">▶</span> |
28 | <div class="atreeItemContent atreeItemImgContainer" > | 28 | <div class="atreeItemContent atreeItemImgContainer" > |
29 | <img id="atreeItemImg" class="atreeItemImg" src="" /> | 29 | <img data-montage-id="atreeItemImg" class="atreeItemImg" src="" /> |
30 | </div> | 30 | </div> |
31 | <span id="name" class="atreeItemContent name"></span> | 31 | <span data-montage-id="name" class="atreeItemContent name"></span> |
32 | </li> | 32 | </li> |
33 | </body> | 33 | </body> |
34 | </html> \ No newline at end of file | 34 | </html> \ No newline at end of file |