diff options
author | Armen Kesablyan | 2012-06-20 15:04:25 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:04:25 -0700 |
commit | fc818d31de267d2b77fda3b3029ad38d48698be8 (patch) | |
tree | 122ebf54d3378578c1ded4d786ba3940d4a911d2 /node_modules/montage/ui/bluemoon | |
parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-fc818d31de267d2b77fda3b3029ad38d48698be8.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'node_modules/montage/ui/bluemoon')
14 files changed, 413 insertions, 71 deletions
diff --git a/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html b/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html index e56d0bab..e721f6b5 100644 --- a/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html +++ b/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html | |||
@@ -5,21 +5,19 @@ | |||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" type="text/css" href="button-group.css"> | 10 | <link rel="stylesheet" href="button-group.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "ui/bluemoon/button-group.reel", | 14 | "prototype": "ui/bluemoon/button-group.reel", |
15 | "properties": { | 15 | "properties": { |
16 | |||
17 | } | 16 | } |
18 | } | 17 | } |
19 | } | 18 | } |
20 | </script> | 19 | </script> |
21 | 20 | </head> | |
22 | </head> | ||
23 | <body> | 21 | <body> |
24 | </body> | 22 | </body> |
25 | </html> | 23 | </html> \ No newline at end of file |
diff --git a/node_modules/montage/ui/bluemoon/button.reel/button.html b/node_modules/montage/ui/bluemoon/button.reel/button.html index 4ec77f61..ef7f4d5c 100644 --- a/node_modules/montage/ui/bluemoon/button.reel/button.html +++ b/node_modules/montage/ui/bluemoon/button.reel/button.html | |||
@@ -6,20 +6,18 @@ | |||
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" type="text/css" href="button.css"> | 10 | <link rel="stylesheet" href="button.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "ui/bluemoon/button.reel", | 14 | "prototype": "ui/bluemoon/button.reel", |
15 | "properties": { | 15 | "properties": { |
16 | |||
17 | } | 16 | } |
18 | } | 17 | } |
19 | } | 18 | } |
20 | </script> | 19 | </script> |
21 | |||
22 | </head> | 20 | </head> |
23 | <body> | 21 | <body> |
24 | </body> | 22 | </body> |
25 | </html> | 23 | </html> \ No newline at end of file |
diff --git a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html index 9bbec1b7..9c54ec94 100644 --- a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html +++ b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.html | |||
@@ -6,9 +6,9 @@ | |||
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" type="text/css" href="checkbox.css"> | 10 | <link rel="stylesheet" href="checkbox.css"> |
11 | </head> | 11 | </head> |
12 | <body> | 12 | <body> |
13 | </body> | 13 | </body> |
14 | </html> | 14 | </html> \ No newline at end of file |
diff --git a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js index 58e5154d..eec8a476 100644 --- a/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js +++ b/node_modules/montage/ui/bluemoon/checkbox.reel/checkbox.js | |||
@@ -4,17 +4,17 @@ | |||
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 | @module "montage/ui/bluemoon/checkbox.reel" | 7 | @module "montage/ui/bluemoon/input-checkbox.reel" |
8 | @requires montage/core/core | 8 | @requires montage/core/core |
9 | @requires montage/ui/component | 9 | @requires montage/ui/component |
10 | */ | 10 | */ |
11 | var Montage = require("montage").Montage, | 11 | var Montage = require("montage").Montage, |
12 | Component = require("ui/component").Component; | 12 | Component = require("ui/component").Component; |
13 | /** | 13 | /** |
14 | @class module:"montage/ui/bluemoon/checkbox.reel".Checkbox | 14 | @class module:"montage/ui/bluemoon/input-checkbox.reel".Checkbox |
15 | @extends module:montage/ui/component.Component | 15 | @extends module:montage/ui/component.Component |
16 | */ | 16 | */ |
17 | exports.Checkbox = Montage.create(Component,/** @lends "module:montage/ui/bluemoon/checkbox.reel".Checkbox# */ { | 17 | exports.Checkbox = Montage.create(Component,/** @lends "module:montage/ui/bluemoon/input-checkbox.reel".Checkbox# */ { |
18 | // Configuration | 18 | // Configuration |
19 | /** | 19 | /** |
20 | The distance (squared) beyond which a touch will be considered. | 20 | The distance (squared) beyond which a touch will be considered. |
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.css b/node_modules/montage/ui/bluemoon/progress.reel/progress.css index cf9e6543..3887fab3 100644 --- a/node_modules/montage/ui/bluemoon/progress.reel/progress.css +++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.css | |||
@@ -10,18 +10,18 @@ | |||
10 | overflow: hidden; | 10 | overflow: hidden; |
11 | background: #ccc url(rule.png); | 11 | background: #ccc url(rule.png); |
12 | -webkit-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px; | 12 | -webkit-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px; |
13 | -moz-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px; | ||
14 | box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px; | ||
13 | } | 15 | } |
14 | 16 | ||
15 | .montage-progress .bar { | 17 | .montage-progress .bar { |
16 | height: 7px; | 18 | height: 7px; |
17 | border-radius: inherit; | 19 | border-radius: inherit; |
18 | 20 | background: #0cbeff; | |
19 | background-repeat: no-repeat; | ||
20 | background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, | ||
21 | color-stop(12%, #35c9ff), color-stop(12%, #0cbeff), | ||
22 | color-stop(85%, #0aa5dd), color-stop(85%, #0996c9) ); | ||
23 | 21 | ||
24 | -webkit-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9); | 22 | -webkit-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9); |
23 | -moz-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9); | ||
24 | transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9); | ||
25 | } | 25 | } |
26 | 26 | ||
27 | .montage-progress.dark { | 27 | .montage-progress.dark { |
@@ -29,23 +29,6 @@ | |||
29 | color-stop(0%, #303030), color-stop(100%, #3f3f3f) ); | 29 | color-stop(0%, #303030), color-stop(100%, #3f3f3f) ); |
30 | 30 | ||
31 | -webkit-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px; | 31 | -webkit-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px; |
32 | } | 32 | -moz-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px; |
33 | 33 | box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px; | |
34 | @-webkit-keyframes montage-progress-scroll { | 34 | } \ No newline at end of file |
35 | from { | ||
36 | background-position: 0px top; | ||
37 | } | ||
38 | to { | ||
39 | background-position: -8px top; | ||
40 | } | ||
41 | } | ||
42 | |||
43 | .montage-progress .bar.scrolling { | ||
44 | background-image: url("scroll.png"); | ||
45 | background-repeat: repeat-x; | ||
46 | background-position: 10px top; | ||
47 | -webkit-animation-name: montage-progress-scroll; | ||
48 | -webkit-animation-duration: 1s; | ||
49 | -webkit-animation-timing-function: linear; | ||
50 | -webkit-animation-iteration-count: infinite; | ||
51 | } | ||
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.html b/node_modules/montage/ui/bluemoon/progress.reel/progress.html index a3835fe6..81e82b1a 100644 --- a/node_modules/montage/ui/bluemoon/progress.reel/progress.html +++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.html | |||
@@ -6,8 +6,8 @@ | |||
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <title></title> |