Merge branch 'prod' of http://118.89.119.129:3000/yangchaojie/Blog into prod

templates/management/article/edit_article.html

@@ -278,11 +278,14 @@
                     }, {
                         name: '翩翩体-简',
                         value: 'Hanzipen SC'
+                    },
+                      {
+                        name: 'Noto',
+                        value: 'Noto Serif SC'
                     },
                     'Arial',
                     'Tahoma',
-                    'Verdana',
-                    'Noto Serif SC'
+                    'Verdana'
                 ]
             },
             uploadImage: {

templates/management/article/new_article.html

@@ -262,10 +262,13 @@
                         name: '翩翩体-简',
                         value: 'Hanzipen SC'
                     },
+                    {
+                        name: 'Noto',
+                        value: 'Noto Serif SC'
+                    },
                     'Arial',
                     'Tahoma',
-                    'Verdana',
-                    'Noto Serif SC'
+                    'Verdana'
                 ]
             },
             uploadImage: {