diff options
| author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
| commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
| tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/popup/alert.reel/alert.css | |
| parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz | |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/alert.reel/alert.css')
| -rwxr-xr-x | node_modules/montage/ui/popup/alert.reel/alert.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.css b/node_modules/montage/ui/popup/alert.reel/alert.css index 6dee8b6a..70df5033 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.css +++ b/node_modules/montage/ui/popup/alert.reel/alert.css | |||
| @@ -3,21 +3,21 @@ | |||
| 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-alert-dialog { | 7 | .montage-alert-dialog { |
| 8 | min-width: 300px; | 8 | min-width: 300px; |
| 9 | } | 9 | } |
| 10 | .montage-alert-dialog .montage-alert-content { | 10 | .montage-alert-dialog .montage-alert-content { |
| 11 | font-size: 1.3em; | 11 | font-size: 1.3em; |
| 12 | padding: 15px; | 12 | padding: 15px; |
| 13 | 13 | ||
| 14 | } | 14 | } |
| 15 | .montage-alert-dialog .montage-alert-actions { | 15 | .montage-alert-dialog .montage-alert-actions { |
| 16 | float: right; | 16 | float: right; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | /* | 19 | /* |
| 20 | 20 | ||
| 21 | .montage-alert-dialog { | 21 | .montage-alert-dialog { |
| 22 | font-family: "AG Buch BQ Regular", "AG Buch BQ", Helvetica, Arial, sans-serif; | 22 | font-family: "AG Buch BQ Regular", "AG Buch BQ", Helvetica, Arial, sans-serif; |
| 23 | background-color: #333; | 23 | background-color: #333; |