diff options
| author | Nivesh Rajbhandari | 2012-04-04 16:47:51 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-04 16:47:51 -0700 |
| commit | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (patch) | |
| tree | fb45f74ede82a32d686a38e71f2c42c5d2ff9370 /js/document/templates | |
| parent | 488afcf1604df3d611eca5253d57cc5a79ed80c3 (diff) | |
| parent | 8b60a68f0152c609ad94a931472680f313678d8d (diff) | |
| download | ninja-13368ca6ebbc13adeafccd898dfffd7ce37cb28a.tar.gz | |
Merge branch 'refs/heads/WebGLFileIO' into ToolFixes
Conflicts:
assets/canvas-runtime.js
js/controllers/elements/shapes-controller.js
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/geom/line.js
js/mediators/element-mediator.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/templates')
| -rwxr-xr-x | js/document/templates/montage-html/default_html.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css index 6c2b415f..424c5801 100755 --- a/js/document/templates/montage-html/default_html.css +++ b/js/document/templates/montage-html/default_html.css | |||
| @@ -70,8 +70,8 @@ body | |||
| 70 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | 70 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | .elem-red-outline { | 73 | .active-element-outline { |
| 74 | outline: red solid thin; | 74 | outline: #adff2f solid 2px; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | .nj-preset-transition { | 77 | .nj-preset-transition { |