diff options
author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/ui/photo-editor.reel/photo-editor.css | |
parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/photo-editor.reel/photo-editor.css')
-rwxr-xr-x | node_modules/montage/ui/photo-editor.reel/photo-editor.css | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/node_modules/montage/ui/photo-editor.reel/photo-editor.css b/node_modules/montage/ui/photo-editor.reel/photo-editor.css deleted file mode 100755 index 6f0cf843..00000000 --- a/node_modules/montage/ui/photo-editor.reel/photo-editor.css +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | .PhotoEditor { | ||
7 | position: absolute; | ||
8 | top: 0; | ||
9 | left: 0; | ||
10 | bottom: 197px; | ||
11 | right: 301px; | ||
12 | display: -webkit-box; | ||
13 | -webkit-box-pack: center; | ||
14 | -webkit-box-align: center; | ||
15 | overflow: hidden; | ||
16 | background-color: #777; | ||
17 | -webkit-user-select: none; | ||
18 | } | ||
19 | |||
20 | .PhotoEditor .image { | ||
21 | position: absolute; | ||
22 | top: -9999px; | ||
23 | left: -9999px; | ||
24 | } | ||
25 | |||
26 | .PhotoEditor canvas { | ||
27 | -webkit-user-select: none; | ||
28 | box-shadow: 0 0 16px rgba(0,0,0,.6); | ||
29 | } | ||
30 | |||
31 | .PhotoEditor.pickingColor { | ||
32 | cursor: none; | ||
33 | -webkit-user-select: none; | ||
34 | } | ||