Commit ced5b843 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent 32440620
......@@ -10,7 +10,8 @@ $this->title = '讲师管理';
<img src="<?=\common\models\User::getAvatarUrl($row['avatar'])?>">
<h3><?=$row['name']?></h3>
<p><?=$row['intro']?></p>
<a href="<?=\yii\helpers\Url::to(['teacher-manager/edit', 'id'=>$row['id']])?>"><i class="icon-mode_edit"></i></a>
<a class="edit" href="<?=\yii\helpers\Url::to(['teacher-manager/edit', 'id'=>$row['id']])?>"><i class="icon-mode_edit"></i></a>
<a href="#" class="delete"><i class="icon-trash"></i></a>
</div>
</div>
<?php } ?>
......
......@@ -157,6 +157,15 @@ a:link,a:active,a:visited {
.avatar > a {
display: block;
margin-top: 15px;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
}
.avatar > a:hover {
-webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg);
-o-transform: rotate(360deg);
transform: rotate(360deg);
}
.avatar > a > img {
height: 30px;
......@@ -226,7 +235,7 @@ a:link,a:active,a:visited {
width: 30px;
height: 30px;
text-align: center;
line-height: 30px;
line-height: 33px;
font-size: 16px;
background-color: rgba(0,0,0,.3);
color: #fff;
......@@ -388,8 +397,6 @@ a:link,a:active,a:visited {
}
.teacher-box > a {
position: absolute;
right: 15px;
top: 15px;
opacity: 0;
height: 30px;
width: 30px;
......@@ -407,6 +414,17 @@ a:link,a:active,a:visited {
.teacher-box > a:hover {
background-color:#2a6496;
}
.teacher-box > a.edit {
top: 15px;
right: 15px;
}
.teacher-box > a.delete {
top: 60px;
right: 15px;
}
.teacher-box > p {
font-size: 12px;
color: #999;
......@@ -424,10 +442,6 @@ a:link,a:active,a:visited {
}
.teacher-box:hover > img {
margin-top: 50px;
-webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg);
-o-transform: rotate(360deg);
transform: rotate(360deg);
}
.teacher-box:hover > p {
......@@ -441,9 +455,6 @@ a:link,a:active,a:visited {
height: 300px;
color: #999;
border-radius: 3px;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
}
.teacher-box .add-teacher a:hover {
text-decoration: none;
......@@ -974,7 +985,8 @@ textarea.input-r-control {
line-height: 22px;
}
.video-list-cnt .teacher b{
color: red;
color: #f7b940;
font-weight: normal;
}
.video-img-box .outline {
position: absolute;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment