Commit 4d28d8ff 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 74189245
...@@ -838,4 +838,22 @@ a,a:hover,a:link { ...@@ -838,4 +838,22 @@ a,a:hover,a:link {
border: 1px solid transparent!important; border: 1px solid transparent!important;
} }
/*审核中视频样式*/
.video-main {
height: 500px;
width: 100%;
background-color: #444;
color: #fff;
text-align: center;
}
.video-main i {
display: block;
font-size: 48px;
padding-top: 170px;
}
.video-main p {
font-size: 16px;
margin-top: 40px;
line-height: 1.8;
}
...@@ -6,6 +6,9 @@ body { ...@@ -6,6 +6,9 @@ body {
a,a:hover,a:link { a,a:hover,a:link {
text-decoration: none; text-decoration: none;
} }
.mx900 {
max-width: 900px!important;
}
/*icomoon*/ /*icomoon*/
@font-face { @font-face {
...@@ -303,9 +306,6 @@ a,a:hover,a:link { ...@@ -303,9 +306,6 @@ a,a:hover,a:link {
/* Swiper幻灯 */ /* Swiper幻灯 */
.swiper-container { .swiper-container {
width: 100%;
height: 500px;
} }
.swiper-slide { .swiper-slide {
text-align: center; text-align: center;
...@@ -326,14 +326,17 @@ a,a:hover,a:link { ...@@ -326,14 +326,17 @@ a,a:hover,a:link {
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
} }
.swiper-slide img {
width: 100%;
}
/*视频列表*/ /*视频列表*/
.v-list { .v-list {
margin-top: 20px; margin-top: 20px;
} }
.v-main-box { .v-main-box {
padding-bottom: 10px;
background-color: #fff; background-color: #fff;
height: 300px;
margin-bottom: 20px; margin-bottom: 20px;
-webkit-transition: all 0.4s ease; -webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease; -o-transition: all 0.4s ease;
...@@ -342,12 +345,13 @@ a,a:hover,a:link { ...@@ -342,12 +345,13 @@ a,a:hover,a:link {
.v-screen { .v-screen {
position: relative; position: relative;
width: 100%; width: 100%;
height: 200px;
overflow: hidden; overflow: hidden;
} }
.v-screen a { .v-screen a {
position: relative; position: relative;
display: block; display: block;
height: 150px;
overflow: hidden;
} }
.v-screen > span { .v-screen > span {
...@@ -373,7 +377,7 @@ a,a:hover,a:link { ...@@ -373,7 +377,7 @@ a,a:hover,a:link {
} }
.v-tit { .v-tit {
height: 40px; height: 40px;
line-height: 40px; line-height: 45px;
font-size: 14px; font-size: 14px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -382,6 +386,8 @@ a,a:hover,a:link { ...@@ -382,6 +386,8 @@ a,a:hover,a:link {
.v-teacher-list { .v-teacher-list {
font-size: 12px; font-size: 12px;
color: #666; color: #666;
height: 22px;
line-height: 22px;
} }
.v-tit a { .v-tit a {
color: #333333; color: #333333;
...@@ -410,18 +416,17 @@ a,a:hover,a:link { ...@@ -410,18 +416,17 @@ a,a:hover,a:link {
} }
.v-main-box:hover .play-mask { .v-main-box:hover .play-mask {
display: inline-block; display: inline-block;
line-height: 200px;
} }
.play-mask { .play-mask {
display: none; display: none;
position: absolute; position: absolute;
background-color: rgba(0,0,0,.3); background-color: rgba(0,0,0,.3);
width: 100%; width: 100%;
height: 200px;
left: 0; left: 0;
top: 0; top: 0;
height: 150px;
line-height: 150px;
text-align: center; text-align: center;
line-height: 200px;
font-size: 64px; font-size: 64px;
color: #fff; color: #fff;
-webkit-transition: all 0.4s ease; -webkit-transition: all 0.4s ease;
...@@ -502,12 +507,14 @@ a,a:hover,a:link { ...@@ -502,12 +507,14 @@ a,a:hover,a:link {
background-color: #fff; background-color: #fff;
border: 1px solid #f3f3f3; border: 1px solid #f3f3f3;
border-top: none; border-top: none;
padding-left: 10px;
} }
.video-teacher { .video-teacher {
padding: 10px; padding: 10px;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
width: 60px; width: 60px;
cursor: pointer;
} }
.video-teacher a { .video-teacher a {
color: #333; color: #333;
...@@ -532,7 +539,7 @@ a,a:hover,a:link { ...@@ -532,7 +539,7 @@ a,a:hover,a:link {
.video-sm-info { .video-sm-info {
height: 80px; height: 80px;
line-height: 80px; line-height: 80px;
padding-right: 30px; padding-right: 20px;
} }
.video-sm-info a { .video-sm-info a {
display: inline-block; display: inline-block;
...@@ -553,32 +560,37 @@ a,a:hover,a:link { ...@@ -553,32 +560,37 @@ a,a:hover,a:link {
line-height: 30px; line-height: 30px;
top: 0; top: 0;
left: 0; left: 0;
font-size: 30px; font-size: 24px;
} }
/*video detail*/ /*video detail*/
.warp-box { .warp-box {
background-color: #fff; background-color: #fff;
margin-top: 40px; margin-top: 20px;
padding: 20px 0; padding: 20px 0;
border-top: 1px solid #f3f3f3; border-top: 1px solid #f3f3f3;
} }
.video-description .title {
font-size: 16px;
color: #333;
padding-bottom: 10px;
}
.video-description .text { .video-description .text {
color: #999; color: #999;
} }
.video-description .text img {
max-width: 100%;
height: auto;
border: none;
vertical-align: top;
}
.video-comment { .video-comment {
margin-top: 30px; margin-top: 30px;
} }
.video-description .title,
.video-comment .title { .video-comment .title {
font-size: 16px; font-size: 16px;
color: #333; color: #333;
padding-bottom: 10px; padding-left: 10px;
border-left: 3px solid #3f7de4;
margin-bottom: 20px;
margin-top: 20px;
} }
.video-comment .title small { .video-comment .title small {
font-size: 12px; font-size: 12px;
...@@ -597,29 +609,49 @@ a,a:hover,a:link { ...@@ -597,29 +609,49 @@ a,a:hover,a:link {
} }
.comment-box { .comment-box {
position: relative; position: relative;
padding-left: 60px; margin-bottom: 40px;
margin-top: 20px;
} }
.comment-head img { .comment-head img {
width: 50px; width: 34px;
height: 50px; height: 34px;
border-radius: 100%; border-radius: 100%;
} }
.comment-head { .comment-head {
position: absolute; padding: 10px;
left: 0; }
top: 0; .comment-head span {
padding-right: 10px; display: inline-block;
height: 34px;
line-height: 34px;
} }
.comment-input { .comment-input {
display: block; display: block;
border: 1px solid #e7e7e7;
} }
.comment-input textarea { .comment-input textarea {
height: 50px; height: 80px;
border: none;
box-shadow: none;
border-radius: inherit;
width: 100%;
vertical-align: top;
outline: none;
}
.textarea-box {
padding: 10px;
}
.btn {
outline: none;
}
.comment-foot {
border-top:1px solid #f3f3f3;
} }
.m-t-10 { .m-t-10 {
margin-top: 10px; margin-top: 10px;
} }
.m-r-10 {
margin-right: 10px;
}
.m-l-20 { .m-l-20 {
margin-left: 20px; margin-left: 20px;
} }
...@@ -631,16 +663,20 @@ a,a:hover,a:link { ...@@ -631,16 +663,20 @@ a,a:hover,a:link {
width: 50px; width: 50px;
border-radius: 100%; border-radius: 100%;
} }
.user-i span, .user-i span {
.user-i span small {
font-size: 14px; font-size: 14px;
color: #999; color: #999;
} }
.user-i span small {
font-size:12px;
color: #999;
}
.user-i span small { .user-i span small {
padding-left: 5px; padding-left: 5px;
} }
.user-i p { .user-i p {
padding-top: 5px; padding-top: 5px;
font-size: 14px;
} }
.comment-main-list { .comment-main-list {
margin-bottom: 40px; margin-bottom: 40px;
...@@ -662,6 +698,7 @@ a,a:hover,a:link { ...@@ -662,6 +698,7 @@ a,a:hover,a:link {
max-width: 500px; max-width: 500px;
margin: 0 auto; margin: 0 auto;
color: #666; color: #666;
word-break: break-all;
} }
...@@ -790,3 +827,33 @@ a,a:hover,a:link { ...@@ -790,3 +827,33 @@ a,a:hover,a:link {
z-index: 10 z-index: 10
} }
} }
/*分享样式修改*/
.bd_weixin_popup_head {
font-size: 14px!important;
}
.bd_weixin_popup {
width: 260px!important;
height: 300px!important;
border: 1px solid transparent!important;
}
.video-main {
height: 500px;
width: 100%;
background-color: #444;
color: #fff;
text-align: center;
}
.video-main i {
display: block;
font-size: 48px;
padding-top: 170px;
}
.video-main p {
font-size: 16px;
margin-top: 40px;
line-height: 1.8;
}
...@@ -4,7 +4,9 @@ html { ...@@ -4,7 +4,9 @@ html {
background-color: #f3f3f3; background-color: #f3f3f3;
font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif; font-family: "Helvitica Neue",Helvitica,Arial,"Hiragino Sans GB","Microsoft YaHei","Arial Regular","Microsoft JhengHei",sans-serif;
} }
a.active {
text-decoration: none;
}
.auto-main { .auto-main {
padding-left: 225px; padding-left: 225px;
height: 100px; height: 100px;
...@@ -152,11 +154,11 @@ html { ...@@ -152,11 +154,11 @@ html {
padding-right: 30px; padding-right: 30px;
height: 60px; height: 60px;
} }
.avatar a { .avatar > a {
display: block; display: block;
margin-top: 15px; margin-top: 15px;
} }
.avatar a img { .avatar > a > img {
height: 30px; height: 30px;
width: 30px; width: 30px;
border-radius: 100%; border-radius: 100%;
...@@ -169,13 +171,38 @@ html { ...@@ -169,13 +171,38 @@ html {
color: #999; color: #999;
text-align: center; text-align: center;
} }
.updownmenu {
display: none;
width: 120px;
position: absolute;
top:59px;
right: 0;
background-color: #fff;
border: 1px solid #e7e7e7;
text-align: center;
box-shadow: 1px 1px 20px rgba(0,0,0,.1);
}
.updownmenu li a {
display: block;
padding: 0 20px;
height: 44px;
line-height: 44px;
color: #333;
border-bottom: 1px solid #f3f3f3;
}
.updownmenu li a:hover {
background-color: #f3f3f3;
}
.avatar:hover .updownmenu {
display: block;
}
/*main*/ /*main*/
.tp-main { .tp-main {
width: 100%; width: 100%;
margin-top: 90px; margin-top: 90px;
margin-bottom: 90px; padding-bottom: 120px;
} }
.class-name { .class-name {
...@@ -187,6 +214,24 @@ html { ...@@ -187,6 +214,24 @@ html {
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
} }
.edit-class-name input{
display: inline-block;
width: 100px;
text-align: center;
background-color: transparent;
color: #fff;
}
.edit-class-name input:focus {
border-bottom: 1px solid #fff;
}
.edit-class-name button {
background-color: transparent;
border: none;
color: #fff;
}
.nomal-class-name a {
color: #fff;
}
.class-intro { .class-intro {
height: 400px; height: 400px;
border-radius: 3px; border-radius: 3px;
...@@ -218,7 +263,7 @@ html { ...@@ -218,7 +263,7 @@ html {
color: #797979; color: #797979;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
padding-left: 30px; padding: 20px 0 20px 30px;
} }
.class-intro .col-md-4 p { .class-intro .col-md-4 p {
margin-top: 10px; margin-top: 10px;
...@@ -344,6 +389,8 @@ html { ...@@ -344,6 +389,8 @@ html {
line-height: 1.8; line-height: 1.8;
text-indent: 2em; text-indent: 2em;
opacity: 0; opacity: 0;
height: 120px;
overflow: hidden;
-webkit-transition: all 0.4s ease; -webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease; -o-transition: all 0.4s ease;
transition: all 0.4s ease; transition: all 0.4s ease;
...@@ -461,6 +508,22 @@ html { ...@@ -461,6 +508,22 @@ html {
background-color: rgba(0,0,0,.5); background-color: rgba(0,0,0,.5);
z-index: 3; z-index: 3;
} }
.upload-avatar:hover .upload-avatar-mask {
display:block;
}
.upload-avatar-mask {
height: 100px;
display: none;
color: #fff;
background-color: rgba(0, 0, 0, 0.3);
position: absolute;
z-index: 3;
top: 0;
left: 0;
width: 100px;
border-radius: 100%;
line-height: 100px;
}
.edit-info { .edit-info {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
...@@ -513,8 +576,6 @@ html { ...@@ -513,8 +576,6 @@ html {
.teacher-info { .teacher-info {
position: relative; position: relative;
margin: 20px 0; margin: 20px 0;
height: 200px;
border-bottom: 1px solid #e7e7e7;
} }
.teacher-info textarea { .teacher-info textarea {
width: 100%; width: 100%;
...@@ -626,6 +687,7 @@ textarea.input-r-control { ...@@ -626,6 +687,7 @@ textarea.input-r-control {
position: relative; position: relative;
margin-top: 30px; margin-top: 30px;
} }
.cls-part .tit { .cls-part .tit {
font-size: 14px; font-size: 14px;
color: #777; color: #777;
...@@ -633,13 +695,17 @@ textarea.input-r-control { ...@@ -633,13 +695,17 @@ textarea.input-r-control {
} }
.cls-part .tit small { .cls-part .tit small {
font-size: 12px; font-size: 12px;
color: #ccc; color: #999;
margin-left: 5px; margin-left: 5px;
} }
.cls-part .tit span.remind { .cls-part .tit span.remind {
padding-left: 10px; padding-left: 10px;
color: red; color: red;
} }
.cls-part span.required {
color: red;
padding-left: 5px;
}
.rules-set label span { .rules-set label span {
display: inline-block; display: inline-block;
float: left; float: left;
...@@ -756,7 +822,7 @@ textarea.input-r-control { ...@@ -756,7 +822,7 @@ textarea.input-r-control {
} }
.upload-ready .video-loading-text { .upload-ready .video-loading-text {
font-size: 12px; font-size: 12px;
padding-top: 15px; padding-top: 8px;
} }
.upload-ready i { .upload-ready i {
position: absolute; position: absolute;
...@@ -866,11 +932,18 @@ textarea.input-r-control { ...@@ -866,11 +932,18 @@ textarea.input-r-control {
line-height: 1.6; line-height: 1.6;
color: #999; color: #999;
margin-top: 5px; margin-top: 5px;
height: 40px;
overflow: hidden;
} }
.video-list-cnt .teacher { .video-list-cnt .teacher {
font-size: 12px; font-size: 12px;
margin-top: 5px; margin-top: 5px;
color: #666; color: #666;
height: 22px;
line-height: 22px;
}
.video-list-cnt .teacher b{
color: red;
} }
.video-img-box .outline { .video-img-box .outline {
position: absolute; position: absolute;
...@@ -919,6 +992,25 @@ textarea.input-r-control { ...@@ -919,6 +992,25 @@ textarea.input-r-control {
display: inline-block; display: inline-block;
} }
.video-examine-icon {
display: block;
position: absolute;
width: 30px;
height: 30px;
text-align: center;
line-height: 30px;
top: 10px;
left: 10px;
font-size: 14px;
background-color: rgba(0,0,0,.5);
color: #fff;
border-radius: 100%;
}
.video-img-box:hover .video-examine-icon {
background-color: red;
}
.examine-box { .examine-box {
margin-top: 100px; margin-top: 100px;
} }
...@@ -971,6 +1063,7 @@ textarea.input-r-control { ...@@ -971,6 +1063,7 @@ textarea.input-r-control {
font-size: 36px; font-size: 36px;
font-weight: normal; font-weight: normal;
padding-top: 40px; padding-top: 40px;
line-height: 50px;
} }
.reg-vip-box i, .reg-vip-box i,
.money-vip-box i { .money-vip-box i {
...@@ -1107,7 +1200,7 @@ textarea.input-r-control { ...@@ -1107,7 +1200,7 @@ textarea.input-r-control {
.sm-box .price { .sm-box .price {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
color: #f11300; color: #666;
} }
.play-mask { .play-mask {
position: absolute; position: absolute;
...@@ -1167,6 +1260,34 @@ textarea.input-r-control { ...@@ -1167,6 +1260,34 @@ textarea.input-r-control {
color: #999; color: #999;
} }
.loginout {
position: absolute;
display: inline-block;
width: 225px;
height: 50px;
text-align: center;
line-height: 50px;
bottom: 0;
left: 0;
background-color: #313a46;
color: #999;
}
.loginout:hover {
color: #fff;
}
.loginout i {
font-size: 14px;
padding-right: 10px;
}
/*编辑器边框颜色*/
.simditor {
border: 1px solid #f3f3f3!important;
}
.simditor-body {
text-align: left!important;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.tp-sidebar { .tp-sidebar {
......
...@@ -38,11 +38,15 @@ ...@@ -38,11 +38,15 @@
</div> </div>
<div class="video-main"> <div class="video-main">
<embed src='http://player.youku.com/player.php/sid/XMTc1NDM3MjUyNA==/v.swf' allowFullScreen='true' quality='high' width='100%' height='630' align='middle' allowScriptAccess='always' type='application/x-shockwave-flash'></embed> <div class="video-empty" style="height:500px; width: 100%; background-color: #444; color: #fff; text-align: center;">
<i class="icon-clock"></i>
<p>课程审核中,审核通过后大家才可以看到您的课程 <br />
审核结果将以短信形式通知您</p>
</div>
</div> </div>
<div class="video-detail-info"> <div class="video-detail-info">
<div class="video-teacher"> <div class="video-teacher pull-left">
<a href="#" data-toggle="modal" data-target="#myModal2"><img src="img/avatar2.jpg"></a> <a href="#" data-toggle="modal" data-target="#myModal2"><img src="img/avatar2.jpg"></a>
<p><a href="#" data-toggle="modal" data-target="#myModal2">万梓良</a></p> <p><a href="#" data-toggle="modal" data-target="#myModal2">万梓良</a></p>
</div> </div>
...@@ -55,7 +59,7 @@ ...@@ -55,7 +59,7 @@
<p><a href="#" data-toggle="modal" data-target="#myModal2">RandyOrton</a></p> <p><a href="#" data-toggle="modal" data-target="#myModal2">RandyOrton</a></p>
</div> </div>
<div class="video-sm-info pull-left"> <div class="video-sm-info pull-right">
<a href="#"><i class="icon-comment-empty"></i>543</a> <a href="#"><i class="icon-comment-empty"></i>543</a>
<a href="#"><i class="icon-fav-empty"></i>31</a> <a href="#"><i class="icon-fav-empty"></i>31</a>
<a href="#"><i class="icon-zan-empty"></i>97</a> <a href="#"><i class="icon-zan-empty"></i>97</a>
...@@ -81,20 +85,27 @@ ...@@ -81,20 +85,27 @@
<div class="title">评论 <small>607次</small></div> <div class="title">评论 <small>607次</small></div>
</div> </div>
<div class="comment-login">
需要 <a href="#">登录</a> 才能评论
</div>
<div class="comment-box"> <div class="comment-box">
<div class="comment-head">
<img src="img/avatar2.jpg"> <div class="comment-input">
<div class="textarea-box">
<textarea cols="30" rows="10" placeholder="说几句吧,亲..."></textarea>
</div>
<div class="comment-foot clearfix">
<div class="comment-head pull-left">
<img src="http://dev.qdn.pp.cc/avatar/83/96/d3/DLOhbLdU2T.jpg-m.avatar">
</div>
<button class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
</div> </div>
<div class="comment-input clearfix">
<textarea name="" id="" cols="30" rows="10" class="form-control" placeholder="说几句吧,亲..."></textarea>
<button class="btn btn-default pull-right m-t-10">发表评论</button>
</div> </div>
</div> </div>
<div class="comment-main-list clearfix"> <div class="comment-main-list clearfix">
<div class="user-h pull-left"><img src="img/avatar2.jpg"></div> <div class="user-h pull-left"><img src="img/avatar2.jpg"></div>
<div class="user-i"> <div class="user-i">
......
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