diff options
author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/document/templates | |
parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/document/templates')
-rwxr-xr-x | js/document/templates/html/index.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html index 1bd3da1b..69ac895e 100755 --- a/js/document/templates/html/index.html +++ b/js/document/templates/html/index.html | |||
@@ -54,6 +54,10 @@ | |||
54 | .nj-preset-transition { | 54 | .nj-preset-transition { |
55 | -webkit-transition: all 450ms linear !important; | 55 | -webkit-transition: all 450ms linear !important; |
56 | } | 56 | } |
57 | |||
58 | .nj-element-highlight { | ||
59 | outline: 4px solid #ff0000; | ||
60 | } | ||
57 | </style> | 61 | </style> |
58 | 62 | ||
59 | <script type="text/javascript" data-ninja-template="true"> | 63 | <script type="text/javascript" data-ninja-template="true"> |