diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/io/ui/save-as-dialog.reel | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io/ui/save-as-dialog.reel')
| -rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.css | 6 | ||||
| -rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.html | 2 | ||||
| -rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.css b/js/io/ui/save-as-dialog.reel/save-as-dialog.css index 5953cc45..d1612882 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.css +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.css | |||
| @@ -94,9 +94,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | .saveAsDialog .buttons button { | 96 | .saveAsDialog .buttons button { |
| 97 | float: left; | 97 | float: left; |
| 98 | width: 100px; | 98 | width: 100px; |
| 99 | margin-top: 3px; | 99 | margin-top: 3px; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | .saveAsDialog .okButton{ | 102 | .saveAsDialog .okButton{ |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html index 3cc21997..cbb6113f 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.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. |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js index 276d38b4..38113ed0 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js | |||
| @@ -33,7 +33,7 @@ var Montage = require("montage/core/core").Montage, | |||
| 33 | 33 | ||
| 34 | var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { | 34 | var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { |
| 35 | 35 | ||
| 36 | hasReel: { | 36 | hasReel: { |
| 37 | value: true | 37 | value: true |
| 38 | }, | 38 | }, |
| 39 | 39 | ||