fixed responsive with issue typecho#74

update grid system
cikai · Nov 18, 2013 · 3873bff · 3873bff
1 parent f86646b
commit 3873bff
Show file tree

Hide file tree

Showing 32 changed files with 56 additions and 54 deletions.
diff --git a/admin/css/grid.css b/admin/css/grid.css
@@ -1,10 +1,10 @@
 /*
  * Bento Grid System
  * Source: https://github.com/fenbox/bento
- * Version: 1.2.5
- * Update: 2013.11.02
+ * Version: 1.2.7
+ * Update: 2013.11.15
  */
-.col-group [class*="col-"] {
+.colgroup [class*="col-"] {
   float: left;
   min-height: 1px;
   padding-right: 10px;
@@ -13,8 +13,8 @@
   -moz-box-sizing: border-box;
   box-sizing: border-box; }
 
-.col-group [class*="push-"],
-.col-group [class*="pull-"] {
+.colgroup [class*="push-"],
+.colgroup [class*="pull-"] {
   position: relative; }
 
 /*
@@ -218,13 +218,9 @@
   .col-tb-push-12 {
     left: 100%; }
 
-  .col-group {
+  .colgroup {
     margin-right: -10px;
     margin-left: -10px; } }
-.col-group .col-group {
-  margin-right: -10px;
-  margin-left: -10px; }
-
 /*
  * Desktop and up
  */
@@ -558,10 +554,10 @@
 /*
  * Clearfix
  */
-.clearfix, .col-group {
+.clearfix, .colgroup {
   zoom: 1; }
-  .clearfix:before, .col-group:before, .clearfix:after, .col-group:after {
+  .clearfix:before, .colgroup:before, .clearfix:after, .colgroup:after {
     content: " ";
     display: table; }
-  .clearfix:after, .col-group:after {
+  .clearfix:after, .colgroup:after {
     clear: both; }
diff --git a/admin/css/style.css b/admin/css/style.css
@@ -530,6 +530,9 @@ button {
 .typecho-install .typecho-install-body input {
   width: 100%; }
 
+.typecho-install-body .typecho-option li {
+  margin: 1em 0; }
+
 /**
 * 欢迎界面
 */

diff --git a/admin/index.php b/admin/index.php
@@ -8,7 +8,7 @@
 <div class="main">
     <div class="container typecho-dashboard">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup typecho-page-main">
             <div class="col-mb-12 col-tb-3 typecho-dashboard-nav" role="main">
                 <p class="intro"><?php _e('欢迎使用 Typecho, 您可以使用下面的链接开始您的 Blog 之旅:'); ?></p>
 

diff --git a/admin/manage-comments.php b/admin/manage-comments.php
@@ -10,7 +10,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="main">
+        <div class="colgroup typecho-page-main" role="main">
             <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'

diff --git a/admin/manage-medias.php b/admin/manage-medias.php
@@ -10,7 +10,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="main">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main manage-metas">
+        <div class="colgroup 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
@@ -8,7 +8,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="main">
+        <div class="colgroup 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
@@ -8,7 +8,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="main">
+        <div class="colgroup 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
@@ -6,7 +6,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="main">
+        <div class="colgroup 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
@@ -9,7 +9,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup typecho-page-main">
             <div class="col-mb-12">
                 <ul class="typecho-option-tabs clearfix">
                     <li><a href="<?php $options->adminUrl('themes.php'); ?>"><?php _e('可以使用的外观'); ?></a></li>

diff --git a/admin/page-title.php b/admin/page-title.php
@@ -1,5 +1,5 @@
 <?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<div class="col-group">
+<div class="colgroup">
     <div class="typecho-page-title col-mb-12">
         <h2><?php echo $menu->title; ?><?php 
         if (!empty($menu->addLink)) {

diff --git a/admin/plugins.php b/admin/plugins.php
@@ -6,7 +6,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup typecho-page-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
@@ -9,7 +9,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup 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="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=220&r=X' .
                 '&d=" alt="' . $user->screenName . '" />'; ?></a></p>

diff --git a/admin/scss/grid.scss b/admin/scss/grid.scss
@@ -1,8 +1,8 @@
 /*
  * Bento Grid System
  * Source: https://github.com/fenbox/bento
- * Version: 1.2.5
- * Update: 2013.11.02
+ * Version: 1.2.7
+ * Update: 2013.11.15
  */
 
 //
@@ -19,11 +19,11 @@ $screen-desktop: 992px;
 $screen-wide: 1200px;
 
 // Column group
-.col-group {
+.colgroup {
   @extend .clearfix;
 }
 
-.col-group [class*="col-"] {
+.colgroup [class*="col-"] {
   float: left;
   min-height: 1px;
   padding-right: $gutter-width / 2;
@@ -33,8 +33,8 @@ $screen-wide: 1200px;
   box-sizing: border-box;
 }
 
-.col-group [class*="push-"],
-.col-group [class*="pull-"] {
+.colgroup [class*="push-"],
+.colgroup [class*="pull-"] {
   position: relative;
 }
 
@@ -91,17 +91,12 @@ $screen-wide: 1200px;
   }
 
   // Groups
-  .col-group {
+  .colgroup {
     margin-right: $gutter-width / -2;
     margin-left: $gutter-width / -2;
   }
 }
 
-.col-group .col-group {
-  margin-right: $gutter-width / -2;
-  margin-left: $gutter-width / -2;
-}
-
 
 /*
  * Desktop and up

diff --git a/admin/scss/style.scss b/admin/scss/style.scss
@@ -223,6 +223,9 @@ a.button:hover, a.balloon-button:hover {
 .typecho-install .typecho-install-body input {
   width: 100%;
 }
+.typecho-install-body .typecho-option li {
+  margin: 1em 0;
+}
 
 
 /**

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

diff --git a/admin/themes.php b/admin/themes.php
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup typecho-page-main">
             <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>

diff --git a/admin/upgrade.php b/admin/upgrade.php
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup typecho-page-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
@@ -8,7 +8,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main">
+        <div class="colgroup typecho-page-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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main typecho-post-area" role="form">
+        <div class="colgroup 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
@@ -7,7 +7,7 @@
 <div class="main">
     <div class="body container">
         <?php include 'page-title.php'; ?>
-        <div class="col-group typecho-page-main typecho-post-area" role="form">
+        <div class="colgroup 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
@@ -184,7 +184,7 @@ function _u()
     </ol>
 </div>
 <div class="container">
-    <div class="col-group">
+    <div class="colgroup">
         <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
@@ -1,6 +1,6 @@
 
 
-        </div><!-- end .col-group -->
+        </div><!-- end .colgroup -->
     </div>
 </div><!-- end #body -->
 

diff --git a/usr/themes/default/header.php b/usr/themes/default/header.php
@@ -27,7 +27,7 @@
 
 <header id="header" class="clearfix">
     <div class="container">
-        <div class="col-group">
+        <div class="colgroup">
             <div class="site-name col-mb-12 col-9">
                 <a id="logo" href="<?php $this->options->siteUrl(); ?>">
                     <?php if ($this->options->logoUrl): ?>
@@ -52,12 +52,12 @@
                     <?php endwhile; ?>
                 </nav>
             </div>
-        </div><!-- end .col-group -->
+        </div><!-- end .colgroup -->
     </div>
 </header><!-- end #header -->
 <div id="body">
     <div class="container">
-        <div class="col-group">
+        <div class="colgroup">
 
 
 
diff --git a/usr/themes/default/style.css b/usr/themes/default/style.css
@@ -386,6 +386,11 @@ img.alignright {
   body {
     font-size: 81.25%;
   }
+  #nav-menu a {
+    float: none;
+    display: inline-block;
+    margin: 0 -2px;
+  }
 }
 
 @media (max-width: 768px) {