From ee73a638ba8e20def202ec7cade2c24177d36c5a Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Sat, 21 Dec 2013 09:58:26 +0800
Subject: [PATCH 1/5] fixed #142
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

尼玛，写反了。。。
---
 var/Typecho/Validate.php       | 3 ++-
 var/Widget/Options/General.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/var/Typecho/Validate.php b/var/Typecho/Validate.php
index f186c0d9..f5e8fab0 100644
--- a/var/Typecho/Validate.php
+++ b/var/Typecho/Validate.php
@@ -110,7 +110,8 @@ class Typecho_Validate
         // Cycle through the rules and test for errors
         foreach ($rules as $key => $rules) {
             $this->_key = $key;
-            $data[$key] = (0 == strlen($data[$key])) ? NULL : $data[$key];
+            $data[$key] = (is_array($data[$key]) ? 0 == count($data[$key])
+                : 0 == strlen($data[$key])) ? NULL : $data[$key];
 
             foreach ($rules as $params) {
                 $method = $params[0];
diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php
index 66c69705..5d0bced3 100644
--- a/var/Widget/Options/General.php
+++ b/var/Widget/Options/General.php
@@ -148,7 +148,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
         }
 
         $settings = $this->request->from('title', 'siteUrl', 'description', 'keywords', 'allowRegister', 'timezone', 'attachmentTypes');
-        $settings['siteUrl'] = rtrim('/', $settings['siteUrl']);
+        $settings['siteUrl'] = rtrim($settings['siteUrl'], '/');
 
         $attachmentTypes = array();
         if ($this->isEnableByCheckbox($settings['attachmentTypes'], '@image@')) {

From e93ac75aedc3a6de6ce82350ee128fbf6fcc0941 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Sat, 21 Dec 2013 12:02:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=87=8F=E5=B0=91=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=B9=E5=90=8E=E5=8F=B0=E7=9A=84=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usr/themes/default/grid.css   | 563 ++++++++++++++++++++++++++++++++++
 usr/themes/default/header.php |   8 +-
 2 files changed, 567 insertions(+), 4 deletions(-)
 create mode 100644 usr/themes/default/grid.css

diff --git a/usr/themes/default/grid.css b/usr/themes/default/grid.css
new file mode 100644
index 00000000..c7a31053
--- /dev/null
+++ b/usr/themes/default/grid.css
@@ -0,0 +1,563 @@
+/*
+ * Bento Grid System
+ * Source: https://github.com/fenbox/bento
+ * Version: 1.2.7
+ * Update: 2013.11.15
+ */
+.colgroup [class*="col-"] {
+  float: left;
+  min-height: 1px;
+  padding-right: 10px;
+  padding-left: 10px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box; }
+
+.colgroup [class*="push-"],
+.colgroup [class*="pull-"] {
+  position: relative; }
+
+/*
+ * Mobile and up
+ */
+.col-mb-1 {
+  width: 8.33333%; }
+
+.col-mb-2 {
+  width: 16.66667%; }
+
+.col-mb-3 {
+  width: 25%; }
+
+.col-mb-4 {
+  width: 33.33333%; }
+
+.col-mb-5 {
+  width: 41.66667%; }
+
+.col-mb-6 {
+  width: 50%; }
+
+.col-mb-7 {
+  width: 58.33333%; }
+
+.col-mb-8 {
+  width: 66.66667%; }
+
+.col-mb-9 {
+  width: 75%; }
+
+.col-mb-10 {
+  width: 83.33333%; }
+
+.col-mb-11 {
+  width: 91.66667%; }
+
+.col-mb-12 {
+  width: 100%; }
+
+/*
+ * Tablet and up
+ */
+@media (min-width: 768px) {
+  .container {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 728px; }
+
+  .col-tb-1 {
+    width: 8.33333%; }
+
+  .col-tb-2 {
+    width: 16.66667%; }
+
+  .col-tb-3 {
+    width: 25%; }
+
+  .col-tb-4 {
+    width: 33.33333%; }
+
+  .col-tb-5 {
+    width: 41.66667%; }
+
+  .col-tb-6 {
+    width: 50%; }
+
+  .col-tb-7 {
+    width: 58.33333%; }
+
+  .col-tb-8 {
+    width: 66.66667%; }
+
+  .col-tb-9 {
+    width: 75%; }
+
+  .col-tb-10 {
+    width: 83.33333%; }
+
+  .col-tb-11 {
+    width: 91.66667%; }
+
+  .col-tb-12 {
+    width: 100%; }
+
+  .col-tb-offset-0 {
+    margin-left: 0%; }
+
+  .col-tb-offset-1 {
+    margin-left: 8.33333%; }
+
+  .col-tb-offset-2 {
+    margin-left: 16.66667%; }
+
+  .col-tb-offset-3 {
+    margin-left: 25%; }
+
+  .col-tb-offset-4 {
+    margin-left: 33.33333%; }
+
+  .col-tb-offset-5 {
+    margin-left: 41.66667%; }
+
+  .col-tb-offset-6 {
+    margin-left: 50%; }
+
+  .col-tb-offset-7 {
+    margin-left: 58.33333%; }
+
+  .col-tb-offset-8 {
+    margin-left: 66.66667%; }
+
+  .col-tb-offset-9 {
+    margin-left: 75%; }
+
+  .col-tb-offset-10 {
+    margin-left: 83.33333%; }
+
+  .col-tb-offset-11 {
+    margin-left: 91.66667%; }
+
+  .col-tb-offset-12 {
+    margin-left: 100%; }
+
+  .col-tb-pull-0 {
+    right: 0%; }
+
+  .col-tb-pull-1 {
+    right: 8.33333%; }
+
+  .col-tb-pull-2 {
+    right: 16.66667%; }
+
+  .col-tb-pull-3 {
+    right: 25%; }
+
+  .col-tb-pull-4 {
+    right: 33.33333%; }
+
+  .col-tb-pull-5 {
+    right: 41.66667%; }
+
+  .col-tb-pull-6 {
+    right: 50%; }
+
+  .col-tb-pull-7 {
+    right: 58.33333%; }
+
+  .col-tb-pull-8 {
+    right: 66.66667%; }
+
+  .col-tb-pull-9 {
+    right: 75%; }
+
+  .col-tb-pull-10 {
+    right: 83.33333%; }
+
+  .col-tb-pull-11 {
+    right: 91.66667%; }
+
+  .col-tb-pull-12 {
+    right: 100%; }
+
+  .col-tb-push-0 {
+    left: 0%; }
+
+  .col-tb-push-1 {
+    left: 8.33333%; }
+
+  .col-tb-push-2 {
+    left: 16.66667%; }
+
+  .col-tb-push-3 {
+    left: 25%; }
+
+  .col-tb-push-4 {
+    left: 33.33333%; }
+
+  .col-tb-push-5 {
+    left: 41.66667%; }
+
+  .col-tb-push-6 {
+    left: 50%; }
+
+  .col-tb-push-7 {
+    left: 58.33333%; }
+
+  .col-tb-push-8 {
+    left: 66.66667%; }
+
+  .col-tb-push-9 {
+    left: 75%; }
+
+  .col-tb-push-10 {
+    left: 83.33333%; }
+
+  .col-tb-push-11 {
+    left: 91.66667%; }
+
+  .col-tb-push-12 {
+    left: 100%; }
+
+  .colgroup {
+    margin-right: -10px;
+    margin-left: -10px; } }
+/*
+ * Desktop and up
+ */
+@media (min-width: 992px) {
+  .container {
+    max-width: 952px; }
+
+  .col-1 {
+    width: 8.33333%; }
+
+  .col-2 {
+    width: 16.66667%; }
+
+  .col-3 {
+    width: 25%; }
+
+  .col-4 {
+    width: 33.33333%; }
+
+  .col-5 {
+    width: 41.66667%; }
+
+  .col-6 {
+    width: 50%; }
+
+  .col-7 {
+    width: 58.33333%; }
+
+  .col-8 {
+    width: 66.66667%; }
+
+  .col-9 {
+    width: 75%; }
+
+  .col-10 {
+    width: 83.33333%; }
+
+  .col-11 {
+    width: 91.66667%; }
+
+  .col-12 {
+    width: 100%; }
+
+  .col-offset-0 {
+    margin-left: 0%; }
+
+  .col-offset-1 {
+    margin-left: 8.33333%; }
+
+  .col-offset-2 {
+    margin-left: 16.66667%; }
+
+  .col-offset-3 {
+    margin-left: 25%; }
+
+  .col-offset-4 {
+    margin-left: 33.33333%; }
+
+  .col-offset-5 {
+    margin-left: 41.66667%; }
+
+  .col-offset-6 {
+    margin-left: 50%; }
+
+  .col-offset-7 {
+    margin-left: 58.33333%; }
+
+  .col-offset-8 {
+    margin-left: 66.66667%; }
+
+  .col-offset-9 {
+    margin-left: 75%; }
+
+  .col-offset-10 {
+    margin-left: 83.33333%; }
+
+  .col-offset-11 {
+    margin-left: 91.66667%; }
+
+  .col-offset-12 {
+    margin-left: 100%; }
+
+  .col-pull-0 {
+    right: 0%; }
+
+  .col-pull-1 {
+    right: 8.33333%; }
+
+  .col-pull-2 {
+    right: 16.66667%; }
+
+  .col-pull-3 {
+    right: 25%; }
+
+  .col-pull-4 {
+    right: 33.33333%; }
+
+  .col-pull-5 {
+    right: 41.66667%; }
+
+  .col-pull-6 {
+    right: 50%; }
+
+  .col-pull-7 {
+    right: 58.33333%; }
+
+  .col-pull-8 {
+    right: 66.66667%; }
+
+  .col-pull-9 {
+    right: 75%; }
+
+  .col-pull-10 {
+    right: 83.33333%; }
+
+  .col-pull-11 {
+    right: 91.66667%; }
+
+  .col-pull-12 {
+    right: 100%; }
+
+  .col-push-0 {
+    left: 0%; }
+
+  .col-push-1 {
+    left: 8.33333%; }
+
+  .col-push-2 {
+    left: 16.66667%; }
+
+  .col-push-3 {
+    left: 25%; }
+
+  .col-push-4 {
+    left: 33.33333%; }
+
+  .col-push-5 {
+    left: 41.66667%; }
+
+  .col-push-6 {
+    left: 50%; }
+
+  .col-push-7 {
+    left: 58.33333%; }
+
+  .col-push-8 {
+    left: 66.66667%; }
+
+  .col-push-9 {
+    left: 75%; }
+
+  .col-push-10 {
+    left: 83.33333%; }
+
+  .col-push-11 {
+    left: 91.66667%; }
+
+  .col-push-12 {
+    left: 100%; } }
+/*
+ * Widescreen and up
+ */
+@media (min-width: 1200px) {
+  .container {
+    max-width: 1160px; }
+
+  .col-wd-1 {
+    width: 8.33333%; }
+
+  .col-wd-2 {
+    width: 16.66667%; }
+
+  .col-wd-3 {
+    width: 25%; }
+
+  .col-wd-4 {
+    width: 33.33333%; }
+
+  .col-wd-5 {
+    width: 41.66667%; }
+
+  .col-wd-6 {
+    width: 50%; }
+
+  .col-wd-7 {
+    width: 58.33333%; }
+
+  .col-wd-8 {
+    width: 66.66667%; }
+
+  .col-wd-9 {
+    width: 75%; }
+
+  .col-wd-10 {
+    width: 83.33333%; }
+
+  .col-wd-11 {
+    width: 91.66667%; }
+
+  .col-wd-12 {
+    width: 100%; }
+
+  .col-wd-offset-0 {
+    margin-left: 0%; }
+
+  .col-wd-offset-1 {
+    margin-left: 8.33333%; }
+
+  .col-wd-offset-2 {
+    margin-left: 16.66667%; }
+
+  .col-wd-offset-3 {
+    margin-left: 25%; }
+
+  .col-wd-offset-4 {
+    margin-left: 33.33333%; }
+
+  .col-wd-offset-5 {
+    margin-left: 41.66667%; }
+
+  .col-wd-offset-6 {
+    margin-left: 50%; }
+
+  .col-wd-offset-7 {
+    margin-left: 58.33333%; }
+
+  .col-wd-offset-8 {
+    margin-left: 66.66667%; }
+
+  .col-wd-offset-9 {
+    margin-left: 75%; }
+
+  .col-wd-offset-10 {
+    margin-left: 83.33333%; }
+
+  .col-wd-offset-11 {
+    margin-left: 91.66667%; }
+
+  .col-wd-offset-12 {
+    margin-left: 100%; }
+
+  .col-wd-pull-0 {
+    right: 0%; }
+
+  .col-wd-pull-1 {
+    right: 8.33333%; }
+
+  .col-wd-pull-2 {
+    right: 16.66667%; }
+
+  .col-wd-pull-3 {
+    right: 25%; }
+
+  .col-wd-pull-4 {
+    right: 33.33333%; }
+
+  .col-wd-pull-5 {
+    right: 41.66667%; }
+
+  .col-wd-pull-6 {
+    right: 50%; }
+
+  .col-wd-pull-7 {
+    right: 58.33333%; }
+
+  .col-wd-pull-8 {
+    right: 66.66667%; }
+
+  .col-wd-pull-9 {
+    right: 75%; }
+
+  .col-wd-pull-10 {
+    right: 83.33333%; }
+
+  .col-wd-pull-11 {
+    right: 91.66667%; }
+
+  .col-wd-pull-12 {
+    right: 100%; }
+
+  .col-wd-push-0 {
+    left: 0%; }
+
+  .col-wd-push-1 {
+    left: 8.33333%; }
+
+  .col-wd-push-2 {
+    left: 16.66667%; }
+
+  .col-wd-push-3 {
+    left: 25%; }
+
+  .col-wd-push-4 {
+    left: 33.33333%; }
+
+  .col-wd-push-5 {
+    left: 41.66667%; }
+
+  .col-wd-push-6 {
+    left: 50%; }
+
+  .col-wd-push-7 {
+    left: 58.33333%; }
+
+  .col-wd-push-8 {
+    left: 66.66667%; }
+
+  .col-wd-push-9 {
+    left: 75%; }
+
+  .col-wd-push-10 {
+    left: 83.33333%; }
+
+  .col-wd-push-11 {
+    left: 91.66667%; }
+
+  .col-wd-push-12 {
+    left: 100%; } }
+/*
+ * Responsive kit
+ */
+@media (max-width: 767px) {
+  .kit-hidden-mb {
+    display: none; } }
+@media (max-width: 991px) {
+  .kit-hidden-tb {
+    display: none; } }
+@media (max-width: 1199px) {
+  .kit-hidden {
+    display: none; } }
+/*
+ * Clearfix
+ */
+.clearfix, .colgroup {
+  zoom: 1; }
+  .clearfix:before, .colgroup:before, .clearfix:after, .colgroup:after {
+    content: " ";
+    display: table; }
+  .clearfix:after, .colgroup:after {
+    clear: both; }
diff --git a/usr/themes/default/header.php b/usr/themes/default/header.php
index eef16326..a0c67cf7 100644
--- a/usr/themes/default/header.php
+++ b/usr/themes/default/header.php
@@ -13,13 +13,13 @@
         ), '', ' - '); ?><?php $this->options->title(); ?></title>
 
     <!-- 使用url函数转换相关路径 -->
-    <link rel="stylesheet" href="<?php $this->options->adminUrl('css/normalize.css'); ?>">
-    <link rel="stylesheet" href="<?php $this->options->adminUrl('css/grid.css'); ?>">
+    <link rel="stylesheet" href="http://cdn.staticfile.org/normalize/2.1.3/normalize.min.css">
+    <link rel="stylesheet" href="<?php $this->options->themeUrl('grid.css'); ?>">
     <link rel="stylesheet" href="<?php $this->options->themeUrl('style.css'); ?>">
 
     <!--[if lt IE 9]>
-    <script src="<?php $this->options->adminUrl('js/html5shiv.js'); ?>"></script>
-    <script src="<?php $this->options->adminUrl('js/respond.js'); ?>"></script>
+    <script src="http://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="http://cdn.staticfile.org/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
 
     <!-- 通过自有函数输出HTML头部信息 -->

From c0930d3f312b661bec744f1024335d388df6b2f2 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Mon, 23 Dec 2013 20:18:46 +0800
Subject: [PATCH 3/5] fixed #144

---
 var/Typecho/I18n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var/Typecho/I18n.php b/var/Typecho/I18n.php
index dbbdd11a..e50e7b92 100644
--- a/var/Typecho/I18n.php
+++ b/var/Typecho/I18n.php
@@ -153,7 +153,7 @@ class Typecho_I18n
         /** 如果是一个星期 */
         if ($between > 0 && $between < 604800) {
             $day = floor($between / 86400);
-            return str_replace('%d', $day, _n('一天前', '%天前', $day));
+            return str_replace('%d', $day, _n('一天前', '%d天前', $day));
         }
 
         /** 如果是 */

From 51dbbffc6d60f05bf4ba0f1e8e6f5aa765a0e424 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Tue, 24 Dec 2013 16:01:37 +0800
Subject: [PATCH 4/5] fixed #143
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

没有将上传路径的定义放到设置中，这是一个不常用的定义，放在config.inc.php里添加一行`define('__TYPECHO_UPLOAD_DIR__', 'xxxx');`即可
增加jpeg支持
---
 var/Widget/Options.php         | 2 +-
 var/Widget/Options/General.php | 2 +-
 var/Widget/Upload.php          | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/var/Widget/Options.php b/var/Widget/Options.php
index 9d6e258a..3264840b 100644
--- a/var/Widget/Options.php
+++ b/var/Widget/Options.php
@@ -319,7 +319,7 @@ class Widget_Options extends Typecho_Widget
         if (NULL != $this->attachmentTypes) {
             $attachmentTypes = str_replace(
                 array('@image@', '@media@', '@doc@'), 
-                array('gif,jpg,png,tiff,bmp', 'mp3,wmv,wma,rmvb,rm,avi,flv',
+                array('gif,jpg,jpeg,png,tiff,bmp', 'mp3,wmv,wma,rmvb,rm,avi,flv',
                     'txt,doc,docx,xls,xlsx,ppt,pptx,zip,rar,pdf'), $this->attachmentTypes);
             
             $attachmentTypesResult = array_unique(array_map('trim', explode(',', $attachmentTypes)));
diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php
index 5d0bced3..13ebef36 100644
--- a/var/Widget/Options/General.php
+++ b/var/Widget/Options/General.php
@@ -116,7 +116,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
         }
         
         $attachmentTypesOptions = array(
-            '@image@'    =>  _t('图片文件') . ' <code>(gif jpg png tiff bmp)</code>',
+            '@image@'    =>  _t('图片文件') . ' <code>(gif jpg jpeg png tiff bmp)</code>',
             '@media@'    =>  _t('多媒体文件') . ' <code>(mp3 wmv wma rmvb rm avi flv)</code>',
             '@doc@'      =>  _t('常用档案文件') . ' <code>(txt doc docx xls xlsx ppt pptx zip rar pdf)</code>',
             '@other@'    =>  _t('其他格式 %s', ' <input type="text" class="w-50 text-s mono" name="attachmentTypesOther" value="' . htmlspecialchars($attachmentTypesOtherValue) . '" />'),
diff --git a/var/Widget/Upload.php b/var/Widget/Upload.php
index 629dfa8a..fbc06058 100644
--- a/var/Widget/Upload.php
+++ b/var/Widget/Upload.php
@@ -19,7 +19,7 @@
 class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface_Do
 {
     //上传文件目录
-    const UPLOAD_PATH = '/usr/uploads';
+    const UPLOAD_DIR = '/usr/uploads';
 
     /**
      * 创建上传路径
@@ -75,8 +75,8 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
 
         $options = Typecho_Widget::widget('Widget_Options');
         $date = new Typecho_Date($options->gmtTime);
-        $path = Typecho_Common::url(self::UPLOAD_PATH, __TYPECHO_ROOT_DIR__)
-            . '/' . $date->year . '/' . $date->month;
+        $path = Typecho_Common::url(defined('__TYPECHO_UPLOAD_DIR__') ? __TYPECHO_UPLOAD_DIR__ : self::UPLOAD_DIR,
+            __TYPECHO_ROOT_DIR__) . '/' . $date->year . '/' . $date->month;
 
         //创建上传目录
         if (!is_dir($path)) {
@@ -112,7 +112,8 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
         //返回相对存储路径
         return array(
             'name' => $file['name'],
-            'path' => self::UPLOAD_PATH . '/' . $date->year . '/' . $date->month . '/' . $fileName,
+            'path' => (defined('__TYPECHO_UPLOAD_DIR__') ? __TYPECHO_UPLOAD_DIR__ : self::UPLOAD_DIR) 
+                . '/' . $date->year . '/' . $date->month . '/' . $fileName,
             'size' => $file['size'],
             'type' => $ext,
             'mime' => Typecho_Common::mimeContentType($path)

From f7eddbaf79d761db32bc22199cae922ae371bde2 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Tue, 24 Dec 2013 16:55:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A2=84=E7=95=99=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                |   1 -
 admin/css/style.css                       |  58 ++++++++++++++--------
 admin/img/icons-2x/icon-arrow-down-2x.png | Bin 271 -> 0 bytes
 admin/img/icons-2x/icon-arrow-up-2x.png   | Bin 250 -> 0 bytes
 admin/img/icons-2x/icon-upload-2x.png     | Bin 0 -> 1089 bytes
 admin/img/icons-s2ebed63329.png           | Bin 941 -> 0 bytes
 admin/img/icons-s93f9ba6074.png           | Bin 0 -> 1283 bytes
 admin/img/icons/icon-caret-down.png       | Bin 193 -> 0 bytes
 admin/img/icons/icon-caret-up.png         | Bin 177 -> 0 bytes
 admin/img/icons/icon-upload.png           | Bin 0 -> 557 bytes
 admin/scss/_buttons.scss                  |   7 +++
 admin/scss/_icons.scss                    |  14 +++---
 admin/scss/_mixin.scss                    |   5 --
 admin/scss/components/_editor.scss        |  18 +++++--
 admin/scss/style.scss                     |   8 ++-
 admin/write-js.php                        |   7 +++
 admin/write-post.php                      |   1 +
 17 files changed, 80 insertions(+), 39 deletions(-)
 delete mode 100644 admin/img/icons-2x/icon-arrow-down-2x.png
 delete mode 100644 admin/img/icons-2x/icon-arrow-up-2x.png
 create mode 100644 admin/img/icons-2x/icon-upload-2x.png
 delete mode 100644 admin/img/icons-s2ebed63329.png
 create mode 100644 admin/img/icons-s93f9ba6074.png
 delete mode 100644 admin/img/icons/icon-caret-down.png
 delete mode 100644 admin/img/icons/icon-caret-up.png
 create mode 100644 admin/img/icons/icon-upload.png
 delete mode 100644 admin/scss/_mixin.scss

diff --git a/.gitignore b/.gitignore
index cd0f9ed8..73f184b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .*.swo
 ._*
 .DS_Store
-/Debug/
 /ImgCache/
 /Backup_rar/
 /Debug/
diff --git a/admin/css/style.css b/admin/css/style.css
index 7e84092d..15a27499 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -209,6 +209,11 @@ button {
     background-color: #c1605e;
     cursor: default; }
 
+.btn-text {
+  background: transparent; }
+  .btn-text:hover, .btn-text:active, .btn-text.active {
+    background: #F3F3F0; }
+
 /* 下拉菜单 */
 .btn-drop {
   position: relative; }
@@ -1022,6 +1027,8 @@ a.operate-reply {
   list-style: none;
   border: 1px solid #D9D9D6;
   padding: 6px 12px;
+  max-height: 240px;
+  overflow: auto;
   background-color: #FFF;
   border-radius: 2px; }
 
@@ -1103,7 +1110,8 @@ a.operate-reply {
 #file-list {
   list-style: none;
   margin: 0 10px;
-  padding: 0; }
+  padding: 0;
+  word-break: break-all; }
   #file-list li {
     padding: 8px 0;
     border-top: 1px dashed #D9D9D6; }
@@ -1118,6 +1126,9 @@ a.operate-reply {
   #file-list .info {
     text-transform: uppercase; }
 
+#btn-fullscreen-upload {
+  visibility: hidden; }
+
 /**
 * 附件管理
 */
@@ -1148,24 +1159,25 @@ a.operate-reply {
 /**
  * icons
  */
-.icon-sprite-hack {
-  background: url('../img/icons-s2ebed63329.png'); }
-
-.i-edit, .i-delete, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow {
+.i-edit, .i-delete, .i-upload, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: url(../img/icons.png) no-repeat; }
-  .i-edit:hover, .i-delete:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover {
+  background: url('../img/icons-s93f9ba6074.png') no-repeat;
+  text-indent: -9999em; }
+  .i-edit:hover, .i-delete:hover, .i-upload:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover {
     filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75);
     opacity: 0.75; }
 
 .i-edit {
-  background-position: 0 -32px; }
+  background-position: 0 -48px; }
 
 .i-delete {
-  background-position: 0 -16px; }
+  background-position: 0 -32px; }
+
+.i-upload {
+  background-position: 0 0; }
 
 .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right {
   display: inline-block;
@@ -1186,35 +1198,35 @@ a.operate-reply {
   border-width: 4px 3px 4px 5px; }
 
 .i-exlink {
-  background-position: 0 0; }
+  background-position: 0 -16px; }
 
 /* 文件类型图标 */
 .mime-office {
-  background-position: 0 -80px; }
+  background-position: 0 -96px; }
 
 .mime-text {
   background-position: 0 -176px; }
 
 .mime-image {
-  background-position: 0 -48px; }
+  background-position: 0 -64px; }
 
 .mime-html {
-  background-position: 0 -96px; }
+  background-position: 0 -112px; }
 
 .mime-archive {
   background-position: 0 -192px; }
 
 .mime-application {
-  background-position: 0 -112px; }
+  background-position: 0 -128px; }
 
 .mime-audio {
-  background-position: 0 -224px; }
+  background-position: 0 -208px; }
 
 .mime-script {
   background-position: 0 -144px; }
 
 .mime-video {
-  background-position: 0 -64px; }
+  background-position: 0 -80px; }
 
 .mime-unknow {
   background-position: 0 -160px; }
@@ -1350,7 +1362,7 @@ a.operate-reply {
     background: #F3F3F0;
     font-size: .92857em; }
   #wmd-preview code {
-    color: #B94A48; }
+    color: #C13; }
   #wmd-preview pre {
     padding: 1em; }
     #wmd-preview pre code {
@@ -1417,18 +1429,24 @@ a.operate-reply {
   margin: 0;
   padding: 10px 20px;
   border-bottom: 1px solid #F3F3F0; }
+.fullscreen #tab-files {
+  position: absolute;
+  top: 52px;
+  right: 20px;
+  width: 280px;
+  z-index: 1001; }
 .fullscreen .wmd-edittab,
 .fullscreen .typecho-post-option,
 .fullscreen .title,
 .fullscreen .url-slug,
 .fullscreen .typecho-page-title,
 .fullscreen .typecho-head-nav,
-.fullscreen .message,
-.fullscreen #upload-panel {
+.fullscreen .message {
   display: none; }
 .fullscreen .wmd-hidetab {
   display: block; }
-.fullscreen .wmd-visualhide {
+.fullscreen .wmd-visualhide,
+.fullscreen #btn-fullscreen-upload {
   visibility: visible; }
 
 /**
diff --git a/admin/img/icons-2x/icon-arrow-down-2x.png b/admin/img/icons-2x/icon-arrow-down-2x.png
deleted file mode 100644
index 1fefa5a038843067e87c6af832feaaae8b3246be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002iNkl<ZSPAWx
z%?*Pv424V8726SVL0Kpxl+l<Vr{G74ltUB$<iN#|5GeMGAD@NAQc8K;xt@0xM{PIY
z1e|~qcyWU$rSzqoH<#CmZy|(FCw6YLEyy{ql(~-%>BRO++X?@+SpzXf6o(1zS}*NT
z#~Of|Fm80iC0#%-$`=_xRYfaA=<Az^4JcY6La#OefuI#)^d<uk4O*c>Z#FP!g$ljd
z0EB;9p+-Mt0OF<<CiK<7GV@bPWBMG?(r>;NZSPYC+Jmgm;yGX~!0Ft86L11f-~gpm
VQyug34nF_@002ovPDHLkV1nHGY%2f&

diff --git a/admin/img/icons-2x/icon-arrow-up-2x.png b/admin/img/icons-2x/icon-arrow-up-2x.png
deleted file mode 100644
index b7a7e475a142c75c4bd942faa39894010296eb28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002NNkl<ZSPAWv
z!3n@13`J`%PT&-sr(-yc^x|Hfq7!(s20VmNG)W7+L=g1i|Go!twbtd&wf-3n*;c>^
z7y%>jia^eJhy7-lIqfJ;DFyHS3E`!bEyj3hil_;+@S_C=*!`@@*Nx(i9ivyP5Gz3F
z;rDo58Wmy%2t5vmvr2`izyo?(Lac(VV1S;M5UF4j7@(&GL@HPX80cvUwu-3&0eV`3
zrD94zfSwj$shAR=uYP@>68JihzGnrDfDtePH*<zgH_acS2LJ#707*qoM6N<$f;0(Y
AO#lD@

diff --git a/admin/img/icons-2x/icon-upload-2x.png b/admin/img/icons-2x/icon-upload-2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe50c19a9d29c67ac178a055c17fc5676a6ffb0e
GIT binary patch
literal 1089
zcmV-H1it%;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CCNkl<ZSPAWx
zOGs2v7{{AOsZk;oZL)@mEND|ui)Mm?Qb!wu5(Xh6Dq7T{7d;@sg|!IjK?Fq;J*IFc
zNQB@s3KCmb1Z{dyRKyfmkWo4{I!?dua?fz?^<EtbYSV$k_nrUu_<!eluP2+$PWzY5
z`!C6b`+oucKiPtwo}M+t@8TSVJswX0nMJ-wbRn;omzO`EEWZcm$$ZAyySlpOLvV$@
zb)3-z$eTgEHaIwVI2Mbg-2A3o0OUch*ZYu!3*3_GIE6f+udl4E9MW;6Pr3zdZEf=k
z3JU57Sj>z+LB0<?M^5q~@DAi_`W)=5kSoA^LV{dHkE3pvvAs>W0_^cAk{u_(411uA
zv9+et={?bC^s8>~=;&DH^Z9NN7gjjFdn+m`q!3GUEdcV1c<#4&YXcIVCSkn>S=9FS
z_5#1(FNblRY50LG<zRl(9Ub3+?(Xi@I9bRc9Hytu;9d?_gPzE)S65g6qHP2JY1(Fu
zjg9TF`#BbX(+TAW=>UP7`}+E3Lpqo7rA#JM&&ifkK4Gh=sY&8+TRCw)HYr_6%N8*6
zwHTUMHjzeytRfPL^r$g5iOKu!vXxO{+a#W_VZtM9L$Au0TLH-TVC<#m$O-tYlbcEM
zCKrDW=@Ugp?wRQKxylC=W)uLh1>lMTMM6G6z&jmt(wX5Qia+RN6Rf|#e*mFBM1Hp7
zLT6`ZmDoM;czk*=7<>cSLIEKDh&aRvZ;|mt4f0z24L{;zEN!cke@jctjN;<r4G>?|
zcm|TmWWdAhcLLrt14l+jM^{%>RXuY`q+{Im5ZCM;SdodRh}}r+Bi&Ee;aUjS3%YED
zOm>HCLGC>VxSS6;%eMsbyTmGT$yX$p*ks_;c#c0nF7J!c(CegtGIJ~yJy5!vl&6`c
zY{x#&!N;(PkAuyCxYB)^ZHbpEf(jt<OQkzW_Oht3u<$N1uCo-I_=vAl4zRZhXTqhj
z0zVXhT%_q1wXw0$TT)We3>dN)oChKCl^DC3Nd^=~vERK^@k#+KPr1_VG8_({C!p4j
zyN$&+6bhZQ+jS1%mRrz(^GR_8NTaXJ=TC+!==dNJ>#>unF(0Vq9Mq?97++V4srRN*
zsjD~`4}};gqL-rTCfGxjFK?MhBno+~Vvs*n<nRph%wIFU1sLU<-(<@;g428OF~OPH
zGTolf3NYhhNFNgyP{dk}W8^$*91`y58OUyFMp35|B&U6;*#(<Y<8v&xtjtahSAv(;
zI3Gp<09lIIg*XC(ek-O#IGHo~hv-M)+Kn{MkY5Fvz<HMTI)`Hm*JTBmJSeV*O2xWK
zmOo97X8ITMJ>$!GM}FTJ=Rz$113C0BD&roCzsPM+{V(7*%AMfr!x9@Q00000NkvXX
Hu0mjfTzLfp

literal 0
HcmV?d00001

diff --git a/admin/img/icons-s2ebed63329.png b/admin/img/icons-s2ebed63329.png
deleted file mode 100644
index 1a21b00db86f28c16f66170b54408187047fd4ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^0zmwMgBeKLWr|z`Qu70RLR^8gO70|wga+q|sm_&C
zoU5j~R7`fMnC1dxfY3D8(uuB>Q(P;jx>iBZG*_TtH3+#?Om?f9;#M^kjHbB(MZjp%
zq)9W8z&ba#&6_uG^R(UJ>Au6ueaDU+JKfxNdb;oQ0wRx{V6Y1Yb|ZoR|NpmKzjYAk
zMAMQWzhFjoj&L7G2c`NxZ&j~}2?w^_4gKyE(Qx+9=CA)nLsz}}FD5N|<+_pahwJ~7
z8th-bns@Qve+J3iTP+L>OdXysjv*Dd&Q8CbcgsPbE&Z+P#v==hRG3zK?Df$P2yp)N
z&)>l%)Kok-KWa(V!qAOD3zn{X{C3@5_s0^GG#Dnaey)5r|K??h$Jqt;65H5UCo@cG
zjxTKyVCh_M^XjAS^nb7K{uWwr$FD!Uk>yg`fsS)hceZVwbH<NBVp7B180PKm%)C|3
z>x|wQif&rN|KmMl^fr}@R3nZ5b!Q&T<9_DJA()qC;I6^c^30c2sN~3`s5Rd021zTv
z^|wyT2x69zzSwd9c#L`o!{QlhYjR9x70byRP8K_I{=-rCXs&&K_7ojh@%PoUQ%sAu
z#j`uA{J8aOwrWIH|HKXN>tnPMZdzIxm9ZV$+pn9NzQC-mSUUbz>(yhn%Y!~K9bP`o
zlPhus&%$5(F75Dk4mZ(F<Gg-Zt(&dP;Y$7eZ3h?e|2@yk{YP**qsr<9>zy+abyD0v
z2QK=UTlSD?{YOPPi^!%2-*<1HTDs<swYo}d%$_ovbLX^<Z(9E|;=X*~j(xH>v>g1V
z9sRj{+1723tjra&7cGg<WNr4g{bnZLB9u7er$8W6mcxqKttU7ucJ%r5-;#6X4P_~G
z;goq)dGh^huS_#Br!Mcz>KRw-PBc%cdh>0M4QI{wPoL{nIdmNfOkDZxh2PQo$y>5b
ztZX#iTD)aiX{O^?&J}B(oBq7{c2<2vb#&H@y}eu4Gjrrv=qH?8@KmvMV{Egs*8_#~
z+`4mWwdUMy3;GZ-zyGXa-foKx&%Iq2-~W{ucvaRc{pS6eC#O^1^8Yk2Y?##aLQL+c
zRmRg-)7xay?4QnG`KnaNr)EaUT>A_To7>JN5&5?+CQRBZR~0ERjq%ajGneI-|CYED
w{JVYk&*EmgWqet>1v}Xpx7XU0*Z*N(dhhnJv`d~>fQg#H)78&qol`;+0L}fqLjV8(

diff --git a/admin/img/icons-s93f9ba6074.png b/admin/img/icons-s93f9ba6074.png
new file mode 100644
index 0000000000000000000000000000000000000000..91cae2f0025233a3d0f90e3a31d62d749f55bf34
GIT binary patch
literal 1283
zcmeAS@N?(olHy`uVBq!ia0vp^0zmwLgBeKL?icf7U|@6!@Ck7Ra#eCCIV3bVS4?%T
zoZ?(H)um#xOT{!7AOnP^xt30Jt(@XoIn}iaf~L6w1*<{GtzxoU)fBg?sbDnC4JZOe
z4PdYe4A!~1Z3KhOV6b)T)@`1)+qP}n;px7^%YDa=9Xs9Jc6z$+^a3J}op`}6s)F5A
z0{?*^aDF~89CJ#7{DK+TIl_G$9hB<(yj8s>CLGvyH}tzxM8nxXo4@{NVqxPH;}sW?
zmKSBea^1-I!}b5%Vou@FNy!b}{q}z8#jU*)X3tx@Zrh$C$4}qB|LF0{S0BH8{bP|?
z(l>MNyrpZl96NRH;-#y1pTGI^`PaYy47(zIL>L&DnLJ$_Ln>~aopRq>Bv9n|`8W4A
znx=QH6<gUMpve=}dF!r+(v%pJm3zLd<G(b?{-4~@j;a-LULD#U8QNQHMWvz=Irn;`
zP3h>`V0HSP)#X3)s?(2Otec^|=FQJH-)qkAeE!d&_P{^I8*DWK&W~aaG3meNzfwP4
z>EqPJY(H+CIr!$!+ly_=`Rg(sq?>&A>~LF{`(@X<ih7^AyQ_Y0S=;G-HRIW#V_j1H
zSI=xe6caMT@zC|7s~ME9A9<{7F0Gcu8uHn-xBYyV!Zp6_=Jj^X`{ssh&VGHRzH~Oj
zLESBtzupG@t_)z<;eGgOXXqA%n12)3Us&yP#7{?Ok#sV9>mo*#%&MKDjTf1h*X8|O
z_pSdxh|l(G2UfeN9(SxU&CwLv{QgRyzq>+Clb3RwovElfL;4YM#dkCM<_9P5@;Y6?
z-Ee58gX9Zl(|7MTHi*0qkNuS#G?i0LxUkgD_EO4Z&RIQ-A*O$SKmFb8qsW=L?;@L|
z-h?)W>6u#`6ayBD{M?hHJt?#GF?Z1<Bi&C8+hi`6H0Uc_RnKIcclvY?hvv3LhKrvq
z7hSHC5kI+lUzGocoTbwln<pM--YX)}!?M~zS*=2jlc~il=jZ~leBJWshA!TKhexa=
zURBkc=qf$HUut)%{BrL{=UAWR75vluR|xE0C1BioV}G>V>!KN^Q}2czTAJD&$!M6M
z`&GfIIfpCApOwqw)^SF+bWQ8l9oL%vU$(KaiCc3o)zP71#{0xoEl#t)zyJAdBKJCD
z&7y0mRmbaff1CDS`n*w0&z8?i?}%aOCRu-%>-WkmG*y?~xU0#?Uaj>lS8hgvZo#vK
zshJnpW^4%Epm)r!_C;Mw*bdt@Y6i(&3uWGSf82dn^WycUjn&$jt($M(*4(gs(VutR
zd#5jJ-#q=qH6w<@e9xKZ7`tow#JhYyFe6Fh^k>JI^tl;H-<WoaEd6}LvURUq>bH5n
zY;tzj$^6Ybd@l4`zT7dhz~_f+Y-AlaoGuaPDwjV}{@phC)Z@P&cIdxJlV<!m*N$VW
kLOv_ox1B$3SN>s2^yTrsz<fatm<t&^UHx3vIVCg!0Qz{33;+NC

literal 0
HcmV?d00001

diff --git a/admin/img/icons/icon-caret-down.png b/admin/img/icons/icon-caret-down.png
deleted file mode 100644
index 01459bb8b7292bf1354348103b96664baf36f7f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`9iA?ZAr^vngAVc@P~ceO8=m9-
zAvxxR;HwP32dABwI~RTWsNU&lVfo?8l%PIQ>+r6PWz0?9SprTKish$mj$VxVeI;VK
z<GGs$8$;w5)hexNv|@U1E2i9O;vO;iJ%>Q6p|V9xjzyJhaoxY3tD$X+jhiplDRKPj
qwtU^EqQzK#@lOErT8AWQff{~J-BbxvcYUCn7(8A5T-G@yGywq9%|(j<

diff --git a/admin/img/icons/icon-caret-up.png b/admin/img/icons/icon-caret-up.png
deleted file mode 100644
index 69d8bb87c84f69e65b2ba8510706a015b0ade675..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr^wkfByfsXI5?K6gsQ0
z_we0@$jxc3O$Pf4l8%USPgeIAOHEJT&vog~=jZ-!@7%d_{RYn=$qt9J!HrTbjuNMi
zEt9X-ahTitresds!4FK6E<0{hZoYnFPt!wImF3FWY#TRLu^wi9v5VuQVT^+Z^R7Pz
b1`G@@0yLf9&fIkl=mrK)S3j3^P6<r_40T2=

diff --git a/admin/img/icons/icon-upload.png b/admin/img/icons/icon-upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39fc5720cdd283752dc0ad650c29ec6019a619d
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005>Nkl<ZI1#0i
zPe_w-7{_~mjfDeYBMCLoL$HV-@euTGN4K%T*g+VQ&?TX~c<QQ*9lQjYw-Bj|iihcC
zj19Lpy2RdNMCe2|Vh4j#SlHa3%jW0V*l=kf_`vf%f4|Sa_op?R%^TMtbsex^E&nT!
z$z)y;pM{4tP1|iW8Y@1Z@BMj<_V)_OWOCGMwGNRq2Tv0}K^{=xKC&PF;PH57kS*$2
zfsTuSzY{TG0WW2<+1p;P_i?3Cxr=Wbex6RJr;sh`PGA_u6FdUkW7H%a?*W`_r?tQF
zc)Z_cvmH=)mzYPqtpap@iT)Z;U#(Uf4hDnAZOFwhjW#GSMeZD{yu0akyF(Zo@E+;Q
ze!t)7z!HhXK(Scd%H?u9PN%aX{(L_FTPgJr^+lmj_@c4TXN(c5KH$Qqk|Y$1#rhl$
z$468hHcO?_L^vF-N-UL1-LhCL`>2PC&SNOXd2louRd&059lwBubg{)RMj#NVBR+wB
zr09H%az_Fka=Bbf_<9Z~wyx`MIyuNe_()b*B{;+7pP8n)8Hq$1og@y{edioZ6TeJB
zp{Lwo4RcjhtJQg?IK;6|=Rbh{`3Gcoa!w>yFf?6Ip-|{&y<Q)u+FK_1iu?gzO677{
vCi(_&Suot~SN9=ZinxNa=P6$y|3b<c9w^i1eX^e!00000NkvXXu0mjf2o?Yx

literal 0
HcmV?d00001

diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss
index 64dd2eb8..b547754b 100644
--- a/admin/scss/_buttons.scss
+++ b/admin/scss/_buttons.scss
@@ -65,6 +65,13 @@ button {
   color: #FFF;
 }
 
+.btn-text {
+  background: transparent;
+  &:hover, &:active, &.active {
+    background: #F3F3F0;
+  }
+}
+
 /* 下拉菜单 */
 .btn-drop {
   position: relative;
diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss
index 1d146fe5..a04557ca 100644
--- a/admin/scss/_icons.scss
+++ b/admin/scss/_icons.scss
@@ -5,19 +5,13 @@
 $icons: sprite-map("icons/*.png");
 $icons-2x: sprite-map("icons-2x/*.png");
 
-.icon-sprite-hack {
-  background: $icons;
-}
-// .icon-2x-sprite-hack {
-//   background: $icons-2x;
-// }
-
 %i-16 {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: url(../img/icons.png) no-repeat;
+  background: $icons no-repeat;
+  text-indent: -9999em;
   &:hover {
     @include opacity(0.75);
   }
@@ -31,6 +25,10 @@ $icons-2x: sprite-map("icons-2x/*.png");
   @extend %i-16;
   background-position: sprite-position($icons, icon-delete);
 }
+.i-upload {
+  @extend %i-16;
+  background-position: sprite-position($icons, icon-upload);
+}
 
 // 小箭头
 .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right {
diff --git a/admin/scss/_mixin.scss b/admin/scss/_mixin.scss
deleted file mode 100644
index 52924c9a..00000000
--- a/admin/scss/_mixin.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin calc($property, $expression) {
-  #{$property}: -moz-calc(#{$expression});
-  #{$property}: -webkit-calc(#{$expression});
-  #{$property}: calc(#{$expression});
-}
\ No newline at end of file
diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss
index d3947337..01f775b4 100644
--- a/admin/scss/components/_editor.scss
+++ b/admin/scss/components/_editor.scss
@@ -108,7 +108,7 @@
     background: #F3F3F0;
     font-size: .92857em;
   }
-  code { color: #B94A48; }
+  code { color: #C13; }
   pre {
     padding: 1em;
     code {
@@ -183,16 +183,26 @@
     padding: 10px 20px;
     border-bottom: 1px solid #F3F3F0;
   }
+
+  // 全屏附件上传
+  #tab-files {
+    position: absolute;
+    top: 52px;
+    right: 20px;
+    width: 280px;
+    z-index: 1001;
+  }
+
   .wmd-edittab,
   .typecho-post-option,
   .title,
   .url-slug,
   .typecho-page-title,
   .typecho-head-nav,
-  .message,
-  #upload-panel { display: none; }
+  .message { display: none; }
   .wmd-hidetab { display: block; }
-  .wmd-visualhide {
+  .wmd-visualhide,
+  #btn-fullscreen-upload {
     visibility: visible;
   }
 }
\ No newline at end of file
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index a843cca2..71b6d44f 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -10,7 +10,6 @@
 */
 
 @import "compass";
-@import "mixin";
 
 /**
 * Typecho 全局样式
@@ -794,6 +793,8 @@ background: #FFF1A8;
   list-style: none;
   border: 1px solid #D9D9D6;
   padding: 6px 12px;
+  max-height: 240px;
+  overflow: auto;
   background-color: #FFF;
   border-radius: 2px;
 }
@@ -878,6 +879,7 @@ background: #FFF1A8;
   list-style: none;
   margin: 0 10px;
   padding: 0;
+  word-break: break-all;
   li {
     padding: 8px 0;
     border-top: 1px dashed #D9D9D6;
@@ -897,6 +899,10 @@ background: #FFF1A8;
   }
 }
 
+#btn-fullscreen-upload {
+  visibility: hidden;
+}
+
 
 /**
 * 附件管理
diff --git a/admin/write-js.php b/admin/write-js.php
index f7586856..5c5c6246 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -256,6 +256,13 @@ $(document).ready(function() {
 
         return false;
     });
+
+    // 全屏上传按钮控制
+    // $('#btn-fullscreen-upload').click(function() {
+    //     $(this).toggleClass('active');
+    //     $('#tab-files').toggle();
+    //     return false;
+    // });
 });
 </script>
 
diff --git a/admin/write-post.php b/admin/write-post.php
index 50e2b4a6..700524aa 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -46,6 +46,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
 
                     <p class="submit clearfix">
                         <span class="right">
+                            <!-- <button type="button" class="btn-text" id="btn-fullscreen-upload"><i class="i-upload"><?php _e('附件'); ?></i></button> -->
                             <input type="hidden" name="cid" value="<?php $post->cid(); ?>" />
                             <button type="submit" name="do" value="save" id="btn-save"><?php _e('保存草稿'); ?></button>
                             <button type="submit" name="do" value="publish" class="primary" id="btn-submit"><?php _e('发布文章'); ?></button>