调整栅格结构

ahnan4arch · Oct 12, 2013 · 4d51721 · 4d51721
1 parent bc87873
commit 4d51721
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 60 deletions.
diff --git a/admin/css/style.css b/admin/css/style.css
@@ -316,7 +316,7 @@ button.primary:active, button.primary.active {
  */
 .typecho-option {
     list-style: none;
-    margin: 1.5em 0;
+    margin: 1em 0;
     padding: 0;
 }
 
@@ -1108,9 +1108,11 @@ a.operate-reply {
 }
 
 .typecho-list-table tr td .hidden-by-mouse, ul.typecho-list-notable li .hidden-by-mouse {
+    visibility: hidden;
 }
 
 .typecho-list-table tr:hover td .hidden-by-mouse, ul.typecho-list-notable li:hover .hidden-by-mouse {
+    visibility: visible;
 }
 
 .deactivate tbody, tr.deactivate td {
@@ -1137,8 +1139,6 @@ a.operate-reply {
 
 .comment-action a, .comment-action span { margin-right: 4px; }
 
-.comment-action { visibility: hidden; }
-.typecho-list-table tr:hover .comment-action { visibility: visible; }
 
 /* 下拉操作按钮 */
 /*.typecho-list-table tr:hover .drop-action { display: block; }
@@ -1401,7 +1401,6 @@ ul.typecho-list-notable li .loading {
 }
 
 .typecho-page-main .typecho-mini-panel {
-    background: #DEE4C5;
 }
 
 .typecho-page-main .typecho-option label.typecho-label {
@@ -1415,12 +1414,9 @@ ul.typecho-list-notable li .loading {
 }
 
 .typecho-page-main .typecho-mini-panel .typecho-option {
-    border: none;
-    padding: 0 10px;
 }
 
 .typecho-page-main .typecho-mini-panel .typecho-option li {
-    padding-left: 0;
 }
 
 .typecho-page-main .typecho-option input.text {
@@ -1478,40 +1474,24 @@ ul.typecho-list-notable li .loading {
 }
 
 .typecho-page-main .typecho-content-panel ul.typecho-option {
-    border: none;
 }
 
 .typecho-page-main .typecho-content-panel ul.typecho-option-focus li {
-    margin: 10px 0 0 0;
 }
 
 .typecho-page-main .typecho-content-panel .typecho-option li {
-    padding-left: 110px;
 }
 
 .typecho-page-main .typecho-content-panel .typecho-option-submit li {
-    padding-top: 15px;
 }
 
 .typecho-page-main .typecho-content-panel h3 {
-    font-size: 18px;
-    padding: 10px 0;
-    margin: 20px 0;
-    color: #e47e00;
-    border-bottom: 1px solid #E8EDD6;
 }
 
 .typecho-page-main .typecho-content-panel h4 cite {
-    color: #777;
-    font-style: normal;
-    font-size: 13px;
-    font-weight: normal;
-    margin-left: 5px;
 }
 
 .typecho-page-main .typecho-content-panel h4 img {
-    margin-right: 10px;
-	margin-top: 10px;
 }
 
 /**
@@ -1910,15 +1890,9 @@ ul.autocompleter-choices span.autocompleter-queried {
 }
 
 .typecho-page-main .typecho-mini-panel .tag-selection {
-    margin: 10px;
-    font-size: 13px;
 }
 
 .typecho-page-main .typecho-mini-panel .tag-selection a {
-    margin: 0 5px 5px 0;
-    display: block;
-    float: left;
-    white-space:nowrap;
 }
 
 .typecho-attachment-photo-box .description {

diff --git a/admin/index.php b/admin/index.php
@@ -9,7 +9,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-3 typecho-dashboard-nav">
+            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav">
                 <p class="intro"><?php _e('欢迎使用 Typecho, 您可以使用下面的链接开始您的 Blog 之旅:'); ?></p>
 
                 <div class="intro-link">
@@ -59,7 +59,7 @@
                 </div>
             </div>
 
-            <div class="col-6 typecho-dashboard-main">
+            <div class="col-mb-12 col-tb-6 typecho-dashboard-main">
                 <div class="section">
                     <h3><?php _e('最近发表的文章'); ?></h3>
                     <?php Typecho_Widget::widget('Widget_Contents_Post_Recent', 'pageSize=5')->to($posts); ?>
@@ -89,7 +89,7 @@
                 </div>
             </div>
 
-            <div class="col-3 typecho-dashboard-nav prefix">
+            <div class="col-mb-12 col-tb-3 typecho-dashboard-nav prefix">
                 <?php $version = Typecho_Cookie::get('__typecho_check_version'); ?>
                 <?php if ($version && $version['available']): ?>
                 <div class="update-check typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">

diff --git a/admin/manage-comments.php b/admin/manage-comments.php
@@ -10,7 +10,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 typecho-list">
+            <div class="col-mb-12 typecho-list">
                 <ul class="typecho-option-tabs clearfix">
                     <li<?php if(!isset($request->status) || 'approved' == $request->get('status')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-comments.php'
                     . (isset($request->cid) ? '?cid=' . $request->cid : '')); ?>"><?php _e('已通过'); ?></a></li>
@@ -121,7 +121,7 @@
                                 <div class="comment-content">
                                     <?php $comments->content(); ?>
                                 </div>
-                                <div class="comment-action">
+                                <div class="comment-action hidden-by-mouse">
                                     <?php if('approved' == $comments->status): ?>
                                     <span class="weak"><?php _e('通过'); ?></span>
                                     <?php else: ?>

diff --git a/admin/manage-medias.php b/admin/manage-medias.php
@@ -11,7 +11,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12">
+            <div class="col-mb-12">
 
                 <div class="typecho-list-operate clearfix">
                 <form method="get">

diff --git a/admin/manage-metas.php b/admin/manage-metas.php
@@ -8,12 +8,14 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main manage-metas">
-                <div class="col-8 suffix">
+                <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>
                         <li<?php if('tag' == $request->get('type')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-metas.php?type=tag'); ?>"><?php _e('标签'); ?></a></li>
                     </ul>
-
+                </div>
+
+                <div class="col-mb-12 col-tb-8">
                     <?php if(!isset($request->type) || 'category' == $request->get('type')): ?>
                     <?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($categories); ?>
                     <form method="post" name="manage_categories" class="operate-form">
@@ -37,11 +39,11 @@
                     <table class="typecho-list-table">
                         <colgroup>
                             <col width="20"/>
-                            <col width="230"/>
-                            <col width="30"/>
-                            <col width="170"/>
-                            <col width="50"/>
-                            <col width="65"/>
+                            <col width="30%"/>
+                            <col width="20"/>
+                            <col width="30%"/>
+                            <col width=""/>
+                            <col width="15%"/>
                         </colgroup>
                         <thead>
                             <tr>
@@ -67,7 +69,7 @@
                                 <?php if ($options->defaultCategory == $categories->mid): ?>
                                 <span class="balloon right"><?php _e('默认'); ?></span>
                                 <?php else: ?>
-                                <a class="balloon-button hidden-by-mouse" href="<?php $options->index('/action/metas-category-edit?do=default&mid=' . $categories->mid); ?>"><?php _e('默认'); ?></a>
+                                <a class="hidden-by-mouse" href="<?php $options->index('/action/metas-category-edit?do=default&mid=' . $categories->mid); ?>" title="<?php _e('设为默认'); ?>"><?php _e('默认'); ?></a>
                                 <?php endif; ?>
                                 </td>
                                 <td><a class="balloon-button left size-<?php echo Typecho_Common::splitByCount($categories->count, 1, 10, 20, 50, 100); ?>" href="<?php $options->adminUrl('manage-posts.php?category=' . $categories->mid); ?>"><?php $categories->count(); ?></a></td>
@@ -116,7 +118,7 @@
                     <?php endif; ?>
 
                 </div>
-                <div class="col-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
+                <div class="col-mb-12 col-tb-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
                     <?php if(!isset($request->type) || 'category' == $request->get('type')): ?>
                         <?php Typecho_Widget::widget('Widget_Metas_Category_Edit')->form()->render(); ?>
                     <?php else: ?>

diff --git a/admin/manage-pages.php b/admin/manage-pages.php
@@ -9,7 +9,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 typecho-list">
+            <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                 <form method="get">
                     <div class="operate">

diff --git a/admin/manage-posts.php b/admin/manage-posts.php
@@ -9,7 +9,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 typecho-list">
+            <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                 <form method="get">
                     <div class="operate">

diff --git a/admin/manage-users.php b/admin/manage-users.php
@@ -7,7 +7,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 typecho-list">
+            <div class="col-mb-12 typecho-list">
                 <div class="typecho-list-operate clearfix">
                 <form method="get">
                     <div class="operate">

diff --git a/admin/media.php b/admin/media.php
@@ -10,7 +10,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-8 suffix">
+            <div class="col-mb-8">
                 <div class="typecho-attachment-photo-box">
                     <?php if ($attachment->attachment->isImage): ?>
                     <img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" />
@@ -27,7 +27,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
+            <div class="col-mb-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
                 <?php $attachment->form()->render(); ?>
             </div>
         </div>

diff --git a/admin/page-title.php b/admin/page-title.php
@@ -7,7 +7,7 @@
 </div>
 <?php endif; ?>
 <div class="col-group">
-    <div class="typecho-page-title col-12 col-mb-12">
+    <div class="typecho-page-title col-mb-12">
         <h2><?php echo $menu->title; ?><?php 
         if (!empty($menu->addLink)) {
             echo "<a href=\"{$menu->addLink}\">" . _t("新增") . "</a>";

diff --git a/admin/plugins.php b/admin/plugins.php
@@ -7,7 +7,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 typecho-list">
+            <div class="col-mb-12 typecho-list">
                 <?php Typecho_Widget::widget('Widget_Plugins_List_Activated')->to($activatedPlugins); ?>
                 <?php if ($activatedPlugins->have()): ?>
                 <!--<h4 class="typecho-list-table-title"><?php _e('启用的插件'); ?></h4>-->

diff --git a/admin/profile.php b/admin/profile.php
@@ -10,7 +10,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-8 suffix typecho-content-panel">
+            <div class="col-mb-12 col-tb-7 typecho-content-panel">
                 <h4>
                 <?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=50&r=X' .
                 '&d=" alt="' . $user->screenName . '" width="50" height="50" />'; ?>
@@ -31,7 +31,7 @@
                 <h3 id="change-password"><?php _e('设置密码'); ?></h3>
                 <?php Typecho_Widget::widget('Widget_Users_Profile')->passwordForm()->render(); ?>
             </div>
-            <div class="col-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
+            <div class="col-mb-12 col-tb-5 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
                 <?php Typecho_Widget::widget('Widget_Users_Profile')->profileForm()->render(); ?>
             </div>
         </div>

diff --git a/admin/theme-editor.php b/admin/theme-editor.php
@@ -10,7 +10,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 col-mb-12">
+            <div class="col-mb-12">
                 <ul class="typecho-option-tabs clearfix">
                     <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
                     <li class="current"><a href="<?php $options->adminUrl('theme-editor.php'); ?>">
@@ -27,7 +27,7 @@
             </div>
 
             <div class="typecho-edit-theme">
-                <div class="col-9 content">
+                <div class="col-mb-9 content">
                     <form method="post" name="theme" id="theme" action="<?php $options->index('/action/themes-edit'); ?>">
                         <textarea name="content" id="content" class="w-100 mono" <?php if(!$files->currentIsWriteable()): ?>readonly<?php endif; ?>><?php echo $files->currentContent(); ?></textarea>
                         <p class="submit">
@@ -41,7 +41,7 @@
                         </p>
                     </form>
                 </div>
-                <ul class="col-3">
+                <ul class="col-mb-3">
                     <li><strong>模板文件</strong></li>
                     <?php while($files->next()): ?>
                     <li<?php if($files->current): ?> class="current"<?php endif; ?>>

diff --git a/admin/themes.php b/admin/themes.php
@@ -8,7 +8,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 col-mb-12">
+            <div class="col-mb-12">
                 <ul class="typecho-option-tabs clearfix">
                     <li class="current"><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>
                     <li><a href="<?php $options->adminUrl('theme-editor.php'); ?>"><?php _e('编辑当前外观'); ?></a></li>

diff --git a/admin/upgrade.php b/admin/upgrade.php
@@ -8,7 +8,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 start-02">
+            <div class="col-mb-12">
                 <div class="message notice typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
                     <form action="<?php echo Typecho_Router::url('do', array('action' => 'upgrade', 'widget' => 'Upgrade'), 
                     Typecho_Common::url('index.php', $options->siteUrl)); ?>" method="post">

diff --git a/admin/user.php b/admin/user.php
@@ -9,7 +9,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 start-02">
+            <div class="col-mb-12">
                 <?php Typecho_Widget::widget('Widget_Users_Edit')->form()->render(); ?>
             </div>
         </div>

diff --git a/admin/welcome.php b/admin/welcome.php
@@ -8,7 +8,7 @@
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-12 start-02">
+            <div class="col-mb-12">
                 <div class="message success typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
                     <form action="<?php $options->adminUrl(); ?>" method="get">
                     <h6><?php _e('欢迎您使用 "%s" 管理后台!', $options->title); ?></h6>