aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:10:03 -0700
committerValerio Virgillito2012-04-26 17:10:03 -0700
commit6c1aa27b7753bc9007514859b42160fae265740d (patch)
treef9a01321bafbc8baf91b0d8b0f6c43ddf5453c5d /js/document/templates
parent7968f3a9cf56392c914d6bd44cc90145b6d807a3 (diff)
parenta0ba2437965f486667d07bba60c031a11d778e6a (diff)
downloadninja-6c1aa27b7753bc9007514859b42160fae265740d.tar.gz
Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja-internal into serialization
Diffstat (limited to 'js/document/templates')
-rwxr-xr-xjs/document/templates/montage-web/default_html.css2
-rwxr-xr-xjs/document/templates/montage-web/index.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
index db069d4e..08e39f22 100755
--- a/js/document/templates/montage-web/default_html.css
+++ b/js/document/templates/montage-web/default_html.css
@@ -11,7 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
11} 11}
12 12
13.active-element-outline { 13.active-element-outline {
14 outline: #adff2f solid 2px; 14 outline: #adff2f solid 2px;
15} 15}
16 16
17.nj-preset-transition { 17.nj-preset-transition {
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 53d14847..630794a4 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -41,7 +41,7 @@
41 41
42 <body> 42 <body>
43 43
44 <div>IPSUM</div> 44 <!--<div>IPSUM</div>-->
45 45
46 </body> 46 </body>
47 47