aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/rect-properties.reel/rect-properties.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/tools-properties/rect-properties.reel/rect-properties.html
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.html')
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html14
1 files changed, 6 insertions, 8 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index 01f2b1da..42746caa 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -74,18 +74,16 @@
74 </head> 74 </head>
75 75
76 <body> 76 <body>
77 <div data-montage-id="rectProperties" class="rectProperties"> 77 <div data-montage-id="rectProperties" class="rectProperties toolOptionsFloatChildren">
78 <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>--> 78 <button data-montage-id="lockButton" id="lockButton" class="unlock"></button>
79 <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button>
80 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div> 79 <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
81 <div data-montage-id="TLRadiusControl" class="label"></div> 80 <div data-montage-id="TLRadiusControl" class=""></div>
82 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div> 81 <div id="TRRadiusLabel" class="unselectable subToolButton cornerRadius topRight"></div>
83 <div data-montage-id="TRRadiusControl" class="label"></div> 82 <div data-montage-id="TRRadiusControl" class=""></div>
84 <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div> 83 <div id="BLRadiusLabel" class="unselectable subToolButton cornerRadius bottomLeft"></div>
85 <div data-montage-id="BLRadiusControl" class="label"></div> 84 <div data-montage-id="BLRadiusControl" class=""></div>
86 <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div> 85 <div id="BRRadiusLabel" class="unselectable subToolButton cornerRadius bottomRight"></div>
87 <div data-montage-id="BRRadiusControl" class="label"></div> 86 <div data-montage-id="BRRadiusControl" class=""></div>
88 </div> 87 </div>
89 </body> 88 </body>
90
91</html> \ No newline at end of file 89</html> \ No newline at end of file