update header style

This commit is contained in:
jack 2018-02-05 16:23:40 +08:00
parent 6cb631aa4d
commit 64f458422a
3 changed files with 13 additions and 12 deletions

View File

@ -232,22 +232,22 @@
<div class="swiper-container cooperation"> <div class="swiper-container cooperation">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div class="swiper-slide"> <div class="swiper-slide">
<div class="col-md-3">
<img src="/static-sanji/images/cooperator/cooperator34.png"><p>中国科学院西北生态环境资源研究院</p>
<img src="/static-sanji/images/cooperator/cooperator35.jpg"><p>中国科学院遥感与数字地球研究所</p>
</div>
<div class="col-md-3"> <div class="col-md-3">
<img src="/static-sanji/images/cooperator/cooperator32.jpg"><p>中国科学院青藏高原研究所</p> <img src="/static-sanji/images/cooperator/cooperator32.jpg"><p>中国科学院青藏高原研究所</p>
<img src="/static-sanji/images/cooperator/cooperator26.jpg"><p>中国科学院大气物理研究所</p>
</div>
<div class="col-md-3">
<img src="/static-sanji/images/cooperator/cooperator28.jpg"><p>中国科学院地理科学与资源研究所</p>
<img src="/static-sanji/images/cooperator/cooperator25.png"><p>中国科学院测量与地球物理研究所</p> <img src="/static-sanji/images/cooperator/cooperator25.png"><p>中国科学院测量与地球物理研究所</p>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<img src="/static-sanji/images/cooperator/cooperator30.jpg"><p>中国科学院东北地理与农业生态研究所</p> <img src="/static-sanji/images/cooperator/cooperator34.png"><p>中国科学院西北生态环境资源研究院</p>
<img src="/static-sanji/images/cooperator/cooperator28.jpg"><p>中国科学院地理科学与资源研究所</p>
</div>
<div class="col-md-3">
<img src="/static-sanji/images/cooperator/cooperator35.jpg"><p>中国科学院遥感与数字地球研究所</p>
<img src="/static-sanji/images/cooperator/cooperator29.jpg"><p>中国科学院地质与地球物理研究所</p> <img src="/static-sanji/images/cooperator/cooperator29.jpg"><p>中国科学院地质与地球物理研究所</p>
</div> </div>
<div class="col-md-3">
<img src="/static-sanji/images/cooperator/cooperator26.jpg"><p>中国科学院大气物理研究所</p>
<img src="/static-sanji/images/cooperator/cooperator30.jpg"><p>中国科学院东北地理与农业生态研究所</p>
</div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
<div class="col-md-3"> <div class="col-md-3">

View File

@ -30,9 +30,9 @@
if($auth->hasIdentity()) if($auth->hasIdentity())
{ {
$user = $auth->getIdentity(); $user = $auth->getIdentity();
echo '<a href="/account"><i class="icon-user"></i>'.$user->username.'</a> '; echo '<li class="pull-right"><a href="/account">'.$user->username.'</a></li>';
if ($user->usertype=="administrator") echo '<a href="/admin"><i class="icon-cog"></i>后台</a> '; if ($user->usertype=="administrator") echo '<li class="pull-right"><a href="/admin"><i class="icon-cog"></i>后台</a></li>';
echo '<a href="/data/order"><i class="icon-shopping-cart"></i>数据篮</a> <a href="/account/logout">注销</a>'; echo '<li class="pull-right"><a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮</a></li><li class="pull-right"><a href="/account/logout">注销</a></li>';
} else { } else {
echo '<li class="user pull-right"><a href="/account/login"></a></li>'; echo '<li class="user pull-right"><a href="/account/login"></a></li>';
} ?> } ?>

View File

@ -42,6 +42,7 @@ ul,li,p,h1,h2,h3,h4,h5,h6{
.navbar-nav>li>a{ .navbar-nav>li>a{
padding-top: 10px !important; padding-top: 10px !important;
padding-bottom: 10px !important; padding-bottom: 10px !important;
border: 1px solid white;
} }
.search a{ .search a{
width:30px; width:30px;