fix conflict

2015-03-31 16:56:26 +08:00
parent 5fae5dd10e
commit f959694b0f
18 changed files with 34 additions and 139 deletions
--- a/app/views/note/note.html
+++ b/app/views/note/note.html
@ -713,7 +713,7 @@ function log(o) {
 			
 			<!-- 插入图片 -->
 			<div class="modal fade modal-insert-image">
-			    <div class="modal-dialog"  style="width: 840px">
+			    <div class="modal-dialog"  style="width: 840px;max-width:100%;">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <button type="button" class="close" data-dismiss="modal"
@ -928,4 +928,4 @@ window.require = {
 <script src="/js/require.js"></script>
 </script>
 </body>
-</html>
+</html>