diff options
author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/tools-properties/rect-properties.reel/rect-properties.css | |
parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
download | ninja-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.css')
-rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css index cbd9dde8..dcb478e7 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.css +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css | |||
@@ -12,11 +12,13 @@ | |||
12 | opacity: 0.7; | 12 | opacity: 0.7; |
13 | width: 17px; | 13 | width: 17px; |
14 | height: 18px; | 14 | height: 18px; |
15 | margin-right: 10px; | 15 | margin-right: 8px; |
16 | margin-left: 8px; | ||
17 | margin-top: 1px; | ||
16 | } | 18 | } |
17 | 19 | ||
18 | .rectProperties .subToolButton { | 20 | .rectProperties .subToolButton { |
19 | float:left; | 21 | margin-right: 7px; |
20 | } | 22 | } |
21 | 23 | ||
22 | .rectProperties .button:hover | 24 | .rectProperties .button:hover |