aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/tag-properties.reel/tag-properties.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/tools-properties/tag-properties.reel/tag-properties.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/tools-properties/tag-properties.reel/tag-properties.html')
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html24
1 files changed, 12 insertions, 12 deletions
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index 379c37a0..9dbef6f6 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -19,7 +19,7 @@
19 19
20 "_fillColorCtrl": {"#": "fillColorCtrl"}, 20 "_fillColorCtrl": {"#": "fillColorCtrl"},
21 21
22 "divElement": {"#": "divTool"}, 22 "divElement": {"#": "divTool"},
23 "imageElement": {"#": "imageTool"}, 23 "imageElement": {"#": "imageTool"},
24 "videoElement": {"#": "videoTool"}, 24 "videoElement": {"#": "videoTool"},
25 "canvasElement": {"#": "canvasTool"}, 25 "canvasElement": {"#": "canvasTool"},
@@ -32,35 +32,35 @@
32 } 32 }
33 } 33 }
34 } 34 }
35 </script> 35 </script>
36 36
37 </head> 37 </head>
38 38
39 <body> 39 <body>
40 <div id="tagProperties" class="subToolHolderPanel"> 40 <div data-montage-id="tagProperties" class="subToolHolderPanel">
41 <div id="tagToolContainer" class="tagRadioButtons"> 41 <div id="tagToolContainer" class="tagRadioButtons">
42 <div class="leftLabel colorCtrlIcon FillTool"></div> 42 <div class="leftLabel colorCtrlIcon FillTool"></div>
43 <div data-montage-id="fillColorCtrl" class="leftLabel fillColorCtrl"></div> 43 <div data-montage-id="fillColorCtrl" class="leftLabel fillColorCtrl"></div>
44 <div class="nj-divider divider-vertical">&nbsp;</div> 44 <div class="nj-divider divider-vertical">&nbsp;</div>
45 45
46 <input type="radio" id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/> 46 <input type="radio" data-montage-id="divTool" class="tag-type" title="Div Element" name="TagRadios" checked/>
47 <input type="radio" id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/> 47 <input type="radio" data-montage-id="imageTool" class="tag-type" title="Image Element" name="TagRadios"/>
48 <input type="radio" id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/> 48 <input type="radio" data-montage-id="videoTool" class="tag-type" title="Video Element" name="TagRadios"/>
49 <input type="radio" id="canvasTool" class="tag-type" title="Canvas Element" name="TagRadios"/> 49 <input type="radio" data-montage-id="canvasTool" class="tag-type" title="Canvas Element" name="TagRadios"/>
50 <input type="radio" id="customTool" class="tag-type" title="Custom Element" name="TagRadios"/> 50 <input type="radio" data-montage-id="customTool" class="tag-type" title="Custom Element" name="TagRadios"/>
51 51
52 <div class="nj-divider divider-vertical">&nbsp;</div> 52 <div class="nj-divider divider-vertical">&nbsp;</div>
53 53
54 <div id="classNameContainer" class="leftLabel"> 54 <div id="classNameContainer" class="leftLabel">
55 <label class="label"> Class: 55 <label class="label"> Class:
56 <input id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned"> 56 <input data-montage-id="className" type="text" name="ClassNameTextBox" class="textBox nj-skinned">
57 </label> 57 </label>
58 </div> 58 </div>
59 59
60 <div id="customContainer" class="leftLabel" style="padding-top: 3px;"> 60 <div id="customContainer" class="leftLabel" style="padding-top: 3px;">
61 <label class="label"> Tag Name:</label> 61 <label class="label"> Tag Name:</label>
62 62
63 <select id="customTagCB" class="nj-skinned"> 63 <select data-montage-id="customTagCB" class="nj-skinned">
64 <option>article</option> 64 <option>article</option>
65 <option>aside</option> 65 <option>aside</option>
66 <option>section</option> 66 <option>section</option>
@@ -72,11 +72,11 @@
72 <div id="positionContainer" class="leftLabel" style="padding-top: 3px;"> 72 <div id="positionContainer" class="leftLabel" style="padding-top: 3px;">
73 <label class="label"> Position:</label> 73 <label class="label"> Position:</label>
74 74
75 <select id="positionCB" class="nj-skinned"> 75 <select data-montage-id="positionCB" class="nj-skinned">
76 <option>Static</option>
76 <option>Absolute</option> 77 <option>Absolute</option>
77 <option>Relative</option> 78 <option>Relative</option>
78 <option>Fixed</option> 79 <option>Fixed</option>
79 <option>Static</option>
80 <option>Inherit</option> 80 <option>Inherit</option>
81 </select> 81 </select>
82 82
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 22:20:28 +0000