From 66658a1fbb7fde4d057ec706692bfbce3822214a Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Fri, 5 May 2017 11:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8pre=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=87=E5=BF=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/style.css                 | 9 +++++++++
 public/views/dialog-del-note.html    | 4 +---
 public/views/dialog-detail-note.html | 3 +--
 public/views/note.html               | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 9d9ca96..01c7552 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -160,3 +160,12 @@ img.operator {
     margin-bottom:5px;
     font-size: 16px;
 }
+
+.note-content{
+    font: 15px "Lucida Grande", Helvetica, Arial, sans-serif;
+    white-space:pre-wrap;
+    white-space:-moz-pre-wrap;
+    white-space:-pre-wrap;
+    white-space:-o-pre-wrap;
+    word-wrap:break-word;
+}
diff --git a/public/views/dialog-del-note.html b/public/views/dialog-del-note.html
index 512c4a0..1229377 100644
--- a/public/views/dialog-del-note.html
+++ b/public/views/dialog-del-note.html
@@ -1,8 +1,6 @@
 <div class="ngdialog-message">
     <h3>删除提示</h3>
-    <p ng-show="ngDialogId" style="word-break:break-all; word-wrap:break-word;">您确认要删除备忘:<br/><br/>
-        {{ content | characters:600:false  }}
-    </p>
+    <pre ng-show="ngDialogId" class="note-content" style="margin-top:0px;">{{ content | characters:600:false  }}</pre>
     <p>如果删除该备忘，那么再也无法查看到。</p>
 </div>
 <div class="ngdialog-buttons">
diff --git a/public/views/dialog-detail-note.html b/public/views/dialog-detail-note.html
index 28e8448..dd7e46e 100644
--- a/public/views/dialog-detail-note.html
+++ b/public/views/dialog-detail-note.html
@@ -1,7 +1,6 @@
 <div class="ngdialog-message">
     <h3>备忘详情</h3>
-    <p style="word-break:break-all; word-wrap:break-word;">{{ content }}
-    </p>
+    <pre class="note-content" style="margin-top:0px;">{{ content }}</pre>
 </div>
 <div class="ngdialog-buttons">
     <button type="button" class="ngdialog-button ngdialog-button-primary" ng-click="closeThisDialog('button')">确定</button>
diff --git a/public/views/note.html b/public/views/note.html
index aeaff5f..3bf1f2c 100644
--- a/public/views/note.html
+++ b/public/views/note.html
@@ -16,9 +16,9 @@
     <div class="ui divider" ng-show="add"></div>
     <div class="ui five stackable cards">
         <div class="card" ng-repeat="note in notes" id="{{note.id}}">
-            <div class="content" style="max-height:200px;margin-bottom:8px;">
+            <div class="content" style="max-height:200px;margin-bottom:8px;" ng-dblclick="detailNote(note.content)">
                 <div class="description" style="word-break:break-all;width:175px;max-height:184px;line-height:21px; word-wrap:break-word;text-overflow:ellipsis;overflow:hidden;">
-                    {{ note.content }}
+                    <pre class="note-content" style="margin-top:0px;">{{ note.content }}</pre>
                 </div>
             </div>
             <div class="extra content" ng-show="!note.edit" style="height:50px;padding-right:2px;padding-left:8px;">