mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-01-16 20:18:19 +01:00
Code Issues Projects Releases Wiki Activity

fixed responsive with issue #74

Browse Source 
update grid system
This commit is contained in:
fen 2013-11-18 14:57:48 +08:00
parent f86646bce2
commit 3873bff06e
32 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/css/grid.css
View File

@ -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; }

3
admin/css/style.css
View File

@ -530,6 +530,9 @@ button {
.typecho-install .typecho-install-body input {
width: 100%; }
.typecho-install-body .typecho-option li {
margin: 1em 0; }
/**
* 欢迎界面
*/

2
admin/index.php
View File

@ -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="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>

2
admin/manage-comments.php
View File

@ -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="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'

2
admin/manage-medias.php
View File

@ -10,7 +10,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<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">

2
admin/manage-metas.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/manage-pages.php
View File

@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<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">

2
admin/manage-posts.php
View File

@ -8,7 +8,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<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">

2
admin/manage-users.php
View File

@ -6,7 +6,7 @@ include 'menu.php';
<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">

2
admin/media.php
View File

@ -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="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>

2
admin/options-discussion.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/options-general.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/options-permalink.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/options-plugin.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/options-reading.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/options-theme.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/page-title.php
View File

@ -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)) {

2
admin/plugins.php
View File

@ -6,7 +6,7 @@ include 'menu.php';
<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)): ?>

2
admin/profile.php
View File

@ -9,7 +9,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<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>

19
admin/scss/grid.scss
View File

@ -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

3
admin/scss/style.scss
View File

@ -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;
}
/**

2
admin/theme-editor.php
View File

@ -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="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>

2
admin/themes.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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>

2
admin/upgrade.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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'),

2
admin/user.php
View File

@ -8,7 +8,7 @@ include 'menu.php';
<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>

2
admin/welcome.php
View File

@ -7,7 +7,7 @@ include 'menu.php';
<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">

2
admin/write-page.php
View File

@ -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="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): ?>

2
admin/write-post.php
View File

@ -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="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): ?>

2
install.php
View File

@ -184,7 +184,7 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
</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'])) : ?>

2
usr/themes/default/footer.php
View File

@ -1,6 +1,6 @@
</div><!-- end .col-group -->
</div><!-- end .colgroup -->
</div>
</div><!-- end #body -->

6
usr/themes/default/header.php
View File

@ -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">

5
usr/themes/default/style.css
View File

@ -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) {