diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/tools-properties/ink-bottle-properties.reel | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | 2 | ||||
| -rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css index 6c57ede7..33074d73 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.css | |||
| @@ -30,5 +30,5 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | .inkBottleOptions select.nj-skinned { | 32 | .inkBottleOptions select.nj-skinned { |
| 33 | margin-top: 2px; | 33 | margin-top: 2px; |
| 34 | } | 34 | } |
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index f6100282..2d7e4404 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -166,7 +166,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 166 | } | 166 | } |
| 167 | } | 167 | } |
| 168 | </script> | 168 | </script> |
| 169 | 169 | ||
| 170 | </head> | 170 | </head> |
| 171 | 171 | ||
| 172 | <body> | 172 | <body> |