diff options
author | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
commit | 01cf259da7aaa7d70789d9a7c32111d88b477463 (patch) | |
tree | 0bff3395ac681e5f685d2267f7dbc03a8e32bc4a /js/document/templates/montage-html/default_html.css | |
parent | 331ea08655245e3532e48bf160d5f68a04d8723f (diff) | |
parent | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (diff) | |
download | ninja-01cf259da7aaa7d70789d9a7c32111d88b477463.tar.gz |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/templates/montage-html/default_html.css')
-rwxr-xr-x | js/document/templates/montage-html/default_html.css | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css index 1cdd7114..04b21c6f 100755 --- a/js/document/templates/montage-html/default_html.css +++ b/js/document/templates/montage-html/default_html.css | |||
@@ -65,6 +65,10 @@ body | |||
65 | display: none; | 65 | display: none; |
66 | } | 66 | } |
67 | 67 | ||
68 | .elem-red-outline { | 68 | .active-element-outline { |
69 | outline: red solid thin; | 69 | outline: #adff2f solid 2px; |
70 | } | ||
71 | |||
72 | .nj-preset-transition { | ||
73 | -webkit-transition: all 450ms linear !important; | ||
70 | } \ No newline at end of file | 74 | } \ No newline at end of file |