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 | |
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')
-rwxr-xr-x | node_modules/montage/ui/popup/alert.reel/alert.css | 8 | ||||
-rwxr-xr-x | node_modules/montage/ui/popup/alert.reel/alert.html | 14 |
2 files changed, 11 insertions, 11 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; |
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.html b/node_modules/montage/ui/popup/alert.reel/alert.html index f71da981..cb4ef751 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.html +++ b/node_modules/montage/ui/popup/alert.reel/alert.html | |||
@@ -65,7 +65,7 @@ | |||
65 | } | 65 | } |
66 | }, | 66 | }, |
67 | "button1": { | 67 | "button1": { |
68 | "module": "montage/ui/button.reel", | 68 | "module": "montage/ui/bluemoon/button.reel", |
69 | "name": "Button", | 69 | "name": "Button", |
70 | "properties": { | 70 | "properties": { |
71 | "identifier": "Ok", | 71 | "identifier": "Ok", |
@@ -98,23 +98,23 @@ | |||
98 | </head> | 98 | </head> |
99 | <body> | 99 | <body> |
100 | <div id="alert-container" class="montage-alert-dialog"> | 100 | <div id="alert-container" class="montage-alert-dialog"> |
101 | 101 | ||
102 | <div class="montage-popup-header"> | 102 | <div class="montage-popup-header"> |
103 | <h3 id="title" class="title"></h3> | 103 | <h3 id="title" class="title"></h3> |
104 | </div> | 104 | </div> |
105 | 105 | ||
106 | <div class="montage-alert-content"> | 106 | <div class="montage-alert-content"> |
107 | <div id="msg" class="msg"></div> | 107 | <div id="msg" class="msg"></div> |
108 | <div id="msg-detail" class="msg-detail"></div> | 108 | <div id="msg-detail" class="msg-detail"></div> |
109 | </div> | 109 | </div> |
110 | 110 | ||
111 | <div class="montage-popup-footer"> | 111 | <div class="montage-popup-footer"> |
112 | <div class="montage-alert-actions"> | 112 | <div class="montage-alert-actions"> |
113 | <div class="submit" id="action-ok">OK</div> | 113 | <button class="submit" id="action-ok">OK</button> |
114 | </div> | 114 | </div> |
115 | <div class="clearfix"></div> | 115 | <div class="clearfix"></div> |
116 | </div> | 116 | </div> |
117 | 117 | ||
118 | </div> | 118 | </div> |
119 | </body> | 119 | </body> |
120 | </html> | 120 | </html> |