diff options
author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/ui/popup/confirm.reel/confirm.css | |
parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'node_modules/montage/ui/popup/confirm.reel/confirm.css')
-rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.css b/node_modules/montage/ui/popup/confirm.reel/confirm.css index 8d326cce..959cf719 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.css +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.css | |||
@@ -3,7 +3,7 @@ | |||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<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. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .montage-confirm-dialog { | 7 | .montage-confirm-dialog { |
8 | min-width: 300px; | 8 | min-width: 300px; |
9 | } | 9 | } |