mirror of
https://github.com/typecho/typecho.git
synced 2025-03-23 19:40:22 +01:00
Merge branch 'master' of https://github.com/typecho/typecho-replica
Conflicts: admin/page-title.php
This commit is contained in:
commit
f6246e39f5
@ -480,13 +480,6 @@ img.avatar {
|
||||
font-size: 13px;
|
||||
width: 325px;
|
||||
margin-top: 5px;
|
||||
|
||||
-moz-border-radius: 4px;
|
||||
-webkit-border-radius: 4px;
|
||||
-khtml-border-radius: 4px;
|
||||
|
||||
/* hope IE support border radius, God save me! */
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.typecho-mini-panel .typecho-option .message {
|
||||
@ -502,6 +495,13 @@ img.avatar {
|
||||
font-size: 14px;
|
||||
color: #333;
|
||||
margin-bottom: 10px;
|
||||
|
||||
-moz-border-radius: 4px;
|
||||
-webkit-border-radius: 4px;
|
||||
-khtml-border-radius: 4px;
|
||||
|
||||
/* hope IE support border radius, God save me! */
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.message a {
|
||||
@ -565,6 +565,15 @@ img.avatar {
|
||||
font-weight: bold;
|
||||
padding: 3px 10px;
|
||||
display: none;
|
||||
|
||||
-moz-border-radius-topleft: 0;
|
||||
-moz-border-radius-topright: 0;
|
||||
-webkit-border-top-left-radius: 0;
|
||||
-webkit-border-top-right-radius: 0;
|
||||
|
||||
/* hope IE support border radius, God save me! */
|
||||
border-top-left-radius: 0;
|
||||
border-top-right-radius: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
|
||||
<?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
|
||||
<div class="col-group message <?php $notice->noticeType(); ?> popup typecho-radius-bottomleft typecho-radius-bottomright">
|
||||
<div class="col-group message <?php $notice->noticeType(); ?> popup">
|
||||
<ul>
|
||||
<?php $notice->lists(); ?>
|
||||
</ul>
|
||||
|
Loading…
x
Reference in New Issue
Block a user