From 7db67107e4f440267ec55086cf43dc236cc5355a Mon Sep 17 00:00:00 2001
From: life <lealife@outlook.com>
Date: Wed, 11 Nov 2015 14:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E5=AD=97=E4=BD=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Leanote/editor/EditorAssets/editor.css | 54 +++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/Leanote/editor/EditorAssets/editor.css b/Leanote/editor/EditorAssets/editor.css
index 4d70386..3fc811a 100755
--- a/Leanote/editor/EditorAssets/editor.css
+++ b/Leanote/editor/EditorAssets/editor.css
@@ -1,3 +1,52 @@
+@font-face {
+	font-family: 'OpenSans';
+	src: local("OpenSans");
+	font-weight: normal;
+	font-style: normal;
+}
+@font-face {
+	font-family: 'OpenSans';
+	src: local("OpenSans-Italic");
+	font-weight: normal;
+	font-style: italic;
+}
+@font-face {
+	font-family: 'OpenSans';
+	src: local("OpenSans-Bold");
+	font-weight: bold;
+	font-style: normal;
+}
+@font-face {
+	font-family: 'OpenSans';
+	src: local("OpenSans-BoldItalic");
+	font-weight: bold;
+	font-style: italic;
+}
+@font-face {
+	font-family: 'Merriweather';
+	src: local("Merriweather Light");
+	font-weight: normal;
+	font-style: normal;
+}
+@font-face {
+	font-family: 'Merriweather';
+	src: local("Merriweather-Italic");
+	font-weight: normal;
+	font-style: italic;
+}
+@font-face {
+	font-family: 'Merriweather';
+	src: local("Merriweather-Bold");
+	font-weight: bold;
+	font-style: normal;
+}
+@font-face {
+	font-family: 'Merriweather';
+	src: local("Merriweather-BoldItalic");
+	font-weight: bold;
+	font-style: italic;
+}
+
 * {
     outline: 0px solid transparent;
     -webkit-tap-highlight-color: rgba(0,0,0,0);
@@ -11,7 +60,8 @@ html {
 
 html, body {
     margin:0;
-    /*font-family:OpenSans, sans-serif;*/
+	font-family: OpenSans, 'Source Sans Pro', 'Lucida Grande', sans-serif;
+	font-weight: normal;
     font-size:1em;
     color:#2D2D2D;
 }
@@ -348,7 +398,7 @@ div.field[placeholderText][contenteditable=true]:empty:focus:before {
 }
 
 #zss_field_title, #zss_field_title p {
-    font-family:'Merriweather', serif;
+    font-family:'Merriweather', sans-serif;
     font-weight: bold;
     font-size: 18px;
     margin-bottom: 0px;