aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-27 09:10:58 -0700
committerPushkar Joshi2012-03-27 09:10:58 -0700
commit0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
treee778f2b9d5d525aa364360d5996536a0a06379bd /scss/imports
parent753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
Merge branch 'master' into brushtool
Conflicts: js/controllers/elements/shapes-controller.js
Diffstat (limited to 'scss/imports')
-rwxr-xr-xscss/imports/scss/_Tools.scss21
1 files changed, 0 insertions, 21 deletions
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 19ede70a..55c37d02 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -116,27 +116,6 @@
116 margin-left:43px; 116 margin-left:43px;
117} 117}
118 118
119
120.LockToolUp {
121 background-image: url("../images/optionsbar/link.png");
122 background-repeat:no-repeat;
123 width:17px;
124 height:18px;
125
126 margin-right:10px;
127}
128
129.UnLockToolUp {
130 background-image: url("../images/optionsbar/unlinked.png");
131
132 background-repeat:no-repeat;
133 width:17px;
134 height:18px;
135
136 margin-right:10px;
137}
138
139
140.cornerRadius { 119.cornerRadius {
141 background-image: url("../images/optionsbar/rectangle/cornerRadius.png"); 120 background-image: url("../images/optionsbar/rectangle/cornerRadius.png");
142 background-repeat:no-repeat; 121 background-repeat:no-repeat;