aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/logger.js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /node_modules/montage/core/logger.js
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/montage/core/logger.js')
-rwxr-xr-xnode_modules/montage/core/logger.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/logger.js b/node_modules/montage/core/logger.js
index 26094e76..434aa4dd 100755
--- a/node_modules/montage/core/logger.js
+++ b/node_modules/montage/core/logger.js
@@ -408,7 +408,7 @@ LoggerUI = Montage.create(Montage, /** @lends module:montage/core/logger.LoggerU
408 //YUCK!! I wish I could use a reel!!! 408 //YUCK!! I wish I could use a reel!!!
409 var styleTest = "#_montage_logger_inspector {"; 409 var styleTest = "#_montage_logger_inspector {";
410 styleTest += " border: 1px solid rgba(15,15,15,0.4);"; 410 styleTest += " border: 1px solid rgba(15,15,15,0.4);";
411 styleTest += " position: absolute;"; 411 styleTest += " position: fixed;";
412 styleTest += " right: 25px;"; 412 styleTest += " right: 25px;";
413 styleTest += " top: 25px;"; 413 styleTest += " top: 25px;";
414 styleTest += " -webkit-border-radius: 5px;"; 414 styleTest += " -webkit-border-radius: 5px;";