From e74abeedd6e7a091283578a2d9b5ce68bb96a500 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Wed, 25 Dec 2013 20:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=85=E6=A0=BC=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/grid.css             | 16 ++++++-------
 admin/index.php                |  2 +-
 admin/manage-comments.php      |  2 +-
 admin/manage-medias.php        |  2 +-
 admin/manage-metas.php         |  2 +-
 admin/manage-pages.php         |  2 +-
 admin/manage-posts.php         |  2 +-
 admin/manage-users.php         |  2 +-
 admin/media.php                |  2 +-
 admin/options-discussion.php   |  2 +-
 admin/options-general.php      |  2 +-
 admin/options-permalink.php    |  2 +-
 admin/options-plugin.php       |  2 +-
 admin/options-reading.php      |  2 +-
 admin/options-theme.php        |  2 +-
 admin/plugins.php              |  2 +-
 admin/profile.php              |  2 +-
 admin/scss/grid.scss           |  8 +++----
 admin/theme-editor.php         |  2 +-
 admin/themes.php               |  2 +-
 admin/upgrade.php              |  2 +-
 admin/user.php                 |  2 +-
 admin/welcome.php              |  2 +-
 admin/write-page.php           |  2 +-
 admin/write-post.php           |  2 +-
 install.php                    |  2 +-
 usr/themes/default/footer.php  |  2 +-
 usr/themes/default/grid.css    | 44 +++++++++++++++++++---------------
 usr/themes/default/header.php  |  6 ++---
 var/Widget/Options/General.php |  4 ++--
 30 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/admin/css/grid.css b/admin/css/grid.css
index 3e1abfa3..e8c959cd 100644
--- a/admin/css/grid.css
+++ b/admin/css/grid.css
@@ -4,7 +4,7 @@
  * Version: 1.2.8
  * Update: 2013.11.25
  */
-.container, .colgroup [class*="col-"] {
+.container, .row [class*="col-"] {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box; }
@@ -15,18 +15,18 @@
   padding-left: 10px;
   padding-right: 10px; }
 
-.colgroup {
+.row {
   margin-right: -10px;
   margin-left: -10px; }
 
-.colgroup [class*="col-"] {
+.row [class*="col-"] {
   float: left;
   min-height: 1px;
   padding-right: 10px;
   padding-left: 10px; }
 
-.colgroup [class*="-push-"],
-.colgroup [class*="-pull-"] {
+.row [class*="-push-"],
+.row [class*="-pull-"] {
   position: relative; }
 
 /*
@@ -560,10 +560,10 @@
 /*
  * Clearfix
  */
-.clearfix, .colgroup {
+.clearfix, .row {
   zoom: 1; }
-  .clearfix:before, .colgroup:before, .clearfix:after, .colgroup:after {
+  .clearfix:before, .row:before, .clearfix:after, .row:after {
     content: " ";
     display: table; }
-  .clearfix:after, .colgroup:after {
+  .clearfix:after, .row:after {
     clear: both; }
diff --git a/admin/index.php b/admin/index.php
index df51ba86..facff7cb 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="container typecho-dashboard">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="row typecho-page-main">
             <div class="col-mb-12 welcome-board" role="main">
                 <p><?php _e('目前有 <em>%s</em> 篇日志, 并有 <em>%s</em> 条关于你的评论在 <em>%s</em> 个分类中.',
                 $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>
diff --git a/admin/manage-comments.php b/admin/manage-comments.php
index 87412606..73583eb9 100644
--- a/admin/manage-comments.php
+++ b/admin/manage-comments.php
@@ -10,7 +10,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="clearfix">
                     <ul class="typecho-option-tabs right">
diff --git a/admin/manage-medias.php b/admin/manage-medias.php
index f11af045..bc8af32f 100644
--- a/admin/manage-medias.php
+++ b/admin/manage-medias.php
@@ -10,7 +10,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
                 
                 <div class="typecho-list-operate clearfix">
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index 4573f1fd..9985b049 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main manage-metas">
+        <div class="row typecho-page-main manage-metas">
                 <div class="col-mb-12">
                     <ul class="typecho-option-tabs clearfix">
                         <li<?php if(!isset($request->type) || 'category' == $request->get('type')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-metas.php'); ?>"><?php _e('分类'); ?></a></li>
diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index 5012a434..bb7f57bc 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                     <form method="get">
diff --git a/admin/manage-posts.php b/admin/manage-posts.php
index d8a88859..3db7cad2 100644
--- a/admin/manage-posts.php
+++ b/admin/manage-posts.php
@@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                     <form method="get">
diff --git a/admin/manage-users.php b/admin/manage-users.php
index ad484d4b..6313b317 100644
--- a/admin/manage-users.php
+++ b/admin/manage-users.php
@@ -6,7 +6,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                     <form method="get">
diff --git a/admin/media.php b/admin/media.php
index 6ef70c5b..4f20b4d9 100644
--- a/admin/media.php
+++ b/admin/media.php
@@ -9,7 +9,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="row typecho-page-main">
             <div class="col-mb-12 col-tb-8" role="main">
                 <?php if ($attachment->attachment->isImage): ?>
                 <p><img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" class="typecho-attachment-photo" /></p>
diff --git a/admin/options-discussion.php b/admin/options-discussion.php
index 4be3ec1c..5468985b 100644
--- a/admin/options-discussion.php
+++ b/admin/options-discussion.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="form">
+        <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
                 <?php Typecho_Widget::widget('Widget_Options_Discussion')->form()->render(); ?>
             </div>
diff --git a/admin/options-general.php b/admin/options-general.php
index e72cdfd3..062018a2 100644
--- a/admin/options-general.php
+++ b/admin/options-general.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="form">
+        <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
                 <?php Typecho_Widget::widget('Widget_Options_General')->form()->render(); ?>
             </div>
diff --git a/admin/options-permalink.php b/admin/options-permalink.php
index 89ce1984..b715d6d5 100644
--- a/admin/options-permalink.php
+++ b/admin/options-permalink.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="form">
+        <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
                 <?php Typecho_Widget::widget('Widget_Options_Permalink')->form()->render(); ?>
             </div>
diff --git a/admin/options-plugin.php b/admin/options-plugin.php
index d932a64e..f74c2493 100644
--- a/admin/options-plugin.php
+++ b/admin/options-plugin.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="form">
+        <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
                 <?php Typecho_Widget::widget('Widget_Plugins_Config')->config()->render(); ?>
             </div>
diff --git a/admin/options-reading.php b/admin/options-reading.php
index 315e05ec..6c871bd2 100644
--- a/admin/options-reading.php
+++ b/admin/options-reading.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="form">
+        <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-8 col-tb-offset-2">
                 <?php Typecho_Widget::widget('Widget_Options_Reading')->form()->render(); ?>
             </div>
diff --git a/admin/options-theme.php b/admin/options-theme.php
index 49827830..1ced74d7 100644
--- a/admin/options-theme.php
+++ b/admin/options-theme.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
                 <ul class="typecho-option-tabs fix-tabs clearfix">
                     <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
diff --git a/admin/plugins.php b/admin/plugins.php
index d7421f9b..eaadad89 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -6,7 +6,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12 typecho-list">
                 <?php Typecho_Widget::widget('Widget_Plugins_List_Activated')->to($activatedPlugins); ?>
                 <?php if ($activatedPlugins->have() || !empty($activatedPlugins->activatedPlugins)): ?>
diff --git a/admin/profile.php b/admin/profile.php
index 9c443d51..54048ef3 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -9,7 +9,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main">
+        <div class="row typecho-page-main">
             <div class="col-mb-12 col-tb-3">
                 <p><a href="http://gravatar.com/emails/" title="<?php _e('在 Gravatar 上修改头像'); ?>"><?php echo '<img class="profile-avatar" src="'
                     . ($request->isSecure() ? 'https://secure' : 'http://www') . '.gravatar.com/avatar/' . md5($user->mail) . '?s=220&r=X' .
diff --git a/admin/scss/grid.scss b/admin/scss/grid.scss
index dec632e2..a9363ba3 100644
--- a/admin/scss/grid.scss
+++ b/admin/scss/grid.scss
@@ -37,13 +37,13 @@ $screen-wide: 1200px;
 }
 
 // Column group
-.colgroup {
+.row {
   margin-right: $gutter-width / -2;
   margin-left: $gutter-width / -2;
   @extend .clearfix;
 }
 
-.colgroup [class*="col-"] {
+.row [class*="col-"] {
   float: left;
   min-height: 1px;
   padding-right: $gutter-width / 2;
@@ -51,8 +51,8 @@ $screen-wide: 1200px;
   @extend %box-sizing;
 }
 
-.colgroup [class*="-push-"],
-.colgroup [class*="-pull-"] {
+.row [class*="-push-"],
+.row [class*="-pull-"] {
   position: relative;
 }
 
diff --git a/admin/theme-editor.php b/admin/theme-editor.php
index 789b9646..587b4f8f 100644
--- a/admin/theme-editor.php
+++ b/admin/theme-editor.php
@@ -9,7 +9,7 @@ Typecho_Widget::widget('Widget_Themes_Files')->to($files);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
                 <ul class="typecho-option-tabs fix-tabs clearfix">
                     <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
diff --git a/admin/themes.php b/admin/themes.php
index 1d5e396f..1b21389b 100644
--- a/admin/themes.php
+++ b/admin/themes.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
                 <ul class="typecho-option-tabs fix-tabs clearfix">
                     <li class="current"><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
diff --git a/admin/upgrade.php b/admin/upgrade.php
index dc20e24b..f9651366 100644
--- a/admin/upgrade.php
+++ b/admin/upgrade.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
                 <div id="typecho-welcome">
                     <form action="<?php echo Typecho_Router::url('do', array('action' => 'upgrade', 'widget' => 'Upgrade'), 
diff --git a/admin/user.php b/admin/user.php
index 227d9e14..f6cb957e 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="form">
+        <div class="row typecho-page-main" role="form">
             <div class="col-mb-12 col-tb-6 col-tb-offset-3">
                 <?php Typecho_Widget::widget('Widget_Users_Edit')->form()->render(); ?>
             </div>
diff --git a/admin/welcome.php b/admin/welcome.php
index f0358064..42111827 100644
--- a/admin/welcome.php
+++ b/admin/welcome.php
@@ -7,7 +7,7 @@ include 'menu.php';
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main" role="main">
+        <div class="row typecho-page-main" role="main">
             <div class="col-mb-12">
                 <div id="typecho-welcome" class="message">
                     <form action="<?php $options->adminUrl(); ?>" method="get">
diff --git a/admin/write-page.php b/admin/write-page.php
index f1314b1f..2c5a8ed4 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -7,7 +7,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main typecho-post-area" role="form">
+        <div class="row typecho-page-main typecho-post-area" role="form">
             <form action="<?php $options->index('/action/contents-page-edit'); ?>" method="post" name="write_page">
                 <div class="col-mb-12 col-tb-9" role="main">
                     <?php if ($page->draft && $page->draft['cid'] != $page->cid): ?>
diff --git a/admin/write-post.php b/admin/write-post.php
index b29fd16c..18912e2d 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -7,7 +7,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="colgroup typecho-page-main typecho-post-area" role="form">
+        <div class="row typecho-page-main typecho-post-area" role="form">
             <form action="<?php $options->index('/action/contents-post-edit'); ?>" method="post" name="write_post">
                 <div class="col-mb-12 col-tb-9" role="main">
                     <?php if ($post->draft && $post->draft['cid'] != $post->cid): ?>
diff --git a/install.php b/install.php
index 1d4497e8..c102a79a 100644
--- a/install.php
+++ b/install.php
@@ -185,7 +185,7 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
     </ol>
 </div>
 <div class="container">
-    <div class="colgroup">
+    <div class="row">
         <div class="col-mb-12 col-tb-8 col-tb-offset-2">
             <div class="column-14 start-06 typecho-install">
             <?php if (isset($_GET['finish'])) : ?>
diff --git a/usr/themes/default/footer.php b/usr/themes/default/footer.php
index 33498370..eb9a9ad1 100644
--- a/usr/themes/default/footer.php
+++ b/usr/themes/default/footer.php
@@ -1,6 +1,6 @@
 
             
-        </div><!-- end .colgroup -->
+        </div><!-- end .row -->
     </div>
 </div><!-- end #body -->
 
diff --git a/usr/themes/default/grid.css b/usr/themes/default/grid.css
index c7a31053..e8c959cd 100644
--- a/usr/themes/default/grid.css
+++ b/usr/themes/default/grid.css
@@ -1,20 +1,32 @@
 /*
  * Bento Grid System
  * Source: https://github.com/fenbox/bento
- * Version: 1.2.7
- * Update: 2013.11.15
+ * Version: 1.2.8
+ * Update: 2013.11.25
  */
-.colgroup [class*="col-"] {
-  float: left;
-  min-height: 1px;
-  padding-right: 10px;
-  padding-left: 10px;
+.container, .row [class*="col-"] {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box; }
 
-.colgroup [class*="push-"],
-.colgroup [class*="pull-"] {
+.container {
+  margin-left: auto;
+  margin-right: auto;
+  padding-left: 10px;
+  padding-right: 10px; }
+
+.row {
+  margin-right: -10px;
+  margin-left: -10px; }
+
+.row [class*="col-"] {
+  float: left;
+  min-height: 1px;
+  padding-right: 10px;
+  padding-left: 10px; }
+
+.row [class*="-push-"],
+.row [class*="-pull-"] {
   position: relative; }
 
 /*
@@ -61,8 +73,6 @@
  */
 @media (min-width: 768px) {
   .container {
-    margin-left: auto;
-    margin-right: auto;
     max-width: 728px; }
 
   .col-tb-1 {
@@ -216,11 +226,7 @@
     left: 91.66667%; }
 
   .col-tb-push-12 {
-    left: 100%; }
-
-  .colgroup {
-    margin-right: -10px;
-    margin-left: -10px; } }
+    left: 100%; } }
 /*
  * Desktop and up
  */
@@ -554,10 +560,10 @@
 /*
  * Clearfix
  */
-.clearfix, .colgroup {
+.clearfix, .row {
   zoom: 1; }
-  .clearfix:before, .colgroup:before, .clearfix:after, .colgroup:after {
+  .clearfix:before, .row:before, .clearfix:after, .row:after {
     content: " ";
     display: table; }
-  .clearfix:after, .colgroup:after {
+  .clearfix:after, .row:after {
     clear: both; }
diff --git a/usr/themes/default/header.php b/usr/themes/default/header.php
index a0c67cf7..00b9b836 100644
--- a/usr/themes/default/header.php
+++ b/usr/themes/default/header.php
@@ -32,7 +32,7 @@
 
 <header id="header" class="clearfix">
     <div class="container">
-        <div class="colgroup">
+        <div class="row">
             <div class="site-name col-mb-12 col-9">
                 <a id="logo" href="<?php $this->options->siteUrl(); ?>">
                     <?php if ($this->options->logoUrl): ?>
@@ -58,12 +58,12 @@
                     <?php endwhile; ?>
                 </nav>
             </div>
-        </div><!-- end .colgroup -->
+        </div><!-- end .row -->
     </div>
 </header><!-- end #header -->
 <div id="body">
     <div class="container">
-        <div class="colgroup">
+        <div class="row">
 
     
     
diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php
index 13ebef36..6722399f 100644
--- a/var/Widget/Options/General.php
+++ b/var/Widget/Options/General.php
@@ -34,7 +34,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
 
         /** 站点名称 */
         $title = new Typecho_Widget_Helper_Form_Element_Text('title', NULL, $this->options->title, _t('站点名称'), _t('站点的名称将显示在网页的标题处.'));
-        $title->input->setAttribute('class', 'w-40');
+        $title->input->setAttribute('class', 'w-100');
         $form->addInput($title->addRule('required', _t('请填写站点名称')));
 
         /** 站点地址 */
@@ -42,7 +42,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
             . ($this->options->originalSiteUrl == $this->options->rootUrl ? 
                 '' : '</p><p class="message notice mono">' . _t('当前地址 <strong>%s</strong> 与上述设定值不一致',
                     $this->options->rootUrl)));
-        $siteUrl->input->setAttribute('class', 'w-60 mono');
+        $siteUrl->input->setAttribute('class', 'w-100 mono');
         $form->addInput($siteUrl->addRule('required', _t('请填写站点地址'))
             ->addRule('url', _t('请填写一个合法的URL地址')));