aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/scroller.reel/scroller.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-12 15:26:10 -0700
committerPushkar Joshi2012-03-12 15:26:10 -0700
commit46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch)
tree38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/scroller.reel/scroller.html
parent7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/scroller.reel/scroller.html')
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html
index 34e4bc0a..656db110 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.html
+++ b/node_modules/montage/ui/scroller.reel/scroller.html
@@ -100,6 +100,7 @@
100 } 100 }
101 .montage-scroller .content { 101 .montage-scroller .content {
102 float: left; 102 float: left;
103 width: 100%;
103 } 104 }
104 </style> 105 </style>
105</head> 106</head>