Commit e62beecf 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 b769a357
...@@ -54,6 +54,7 @@ $this->registerCss('[v-cloak] {display:none;}'); ...@@ -54,6 +54,7 @@ $this->registerCss('[v-cloak] {display:none;}');
<html lang="<?= \Yii::$app->language ?>"> <html lang="<?= \Yii::$app->language ?>">
<head> <head>
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0, user-scalable=no, width=device-width" name="viewport">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?= $this->title ? Html::encode($this->title) . '-' : '' ?>云涯</title> <title><?= $this->title ? Html::encode($this->title) . '-' : '' ?>云涯</title>
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<div class="tp-head navbar-fixed-top clearfix"> <div class="tp-head navbar-fixed-top clearfix">
<div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div> <div class="menu-btn fl"><a href="javascript:;"><i class="icon-menu"></i></a></div>
<div class="avatar fr"> <div class="avatar fr">
<a href="<?= \yii\helpers\Url::base() . '/user-center/'?>"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a> <a href="<?= \yii\helpers\Url::to(['home/index', 'classId' => Yii::$app->controller->classStatus['id']]) ?>" class="home-btn" target="_blank"><i class="icon-home"></i></a>
<a href="<?= \yii\helpers\Url::base() . '/user-center/'?>" class="u-center"><img src="<?=\common\models\User::getAvatarUrl(Yii::$app->user->identity->avatar) ?>"></a>
<!-- <!--
<ul class="updownmenu"> <ul class="updownmenu">
<li><a href="#">课堂中心</a></li> <li><a href="#">课堂中心</a></li>
......
...@@ -11,11 +11,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -11,11 +11,7 @@ $this->beginContent('@app/views/layouts/center.php');
<div class="tp-sidebar"> <div class="tp-sidebar">
<div class="logo"> <div class="logo">
<?php if (!empty(Yii::$app->controller->classStatus)) { ?> <?php if (!empty(Yii::$app->controller->classStatus)) { ?>
<a href="<?= \yii\helpers\Url::to(['home/index', 'classId' => Yii::$app->controller->classStatus['id']]) ?>" <a href="javascript:;"><?= Yii::$app->controller->classStatus['name'] ?></a>
target="_blank">
<?= Yii::$app->controller->classStatus['name'] ?>
<i class="icon-home"></i>
</a>
<?php } ?> <?php } ?>
</div> </div>
<div class="side-menu"> <div class="side-menu">
......
...@@ -16,6 +16,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -16,6 +16,7 @@ $baseUrl = \yii\helpers\Url::base();
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta name="copyright" content="云涯"> <meta name="copyright" content="云涯">
<meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0, user-scalable=no, width=device-width" name="viewport">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>"> <link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>">
......
...@@ -9,10 +9,10 @@ $this->title = '课程状态'; ...@@ -9,10 +9,10 @@ $this->title = '课程状态';
?> ?>
<div class="examine-box text-center"> <div class="examine-box text-center">
<div class="ico"> <div class="ico">
<i class="icon-image"></i> <i class="icon-alarm"></i>
<span>审核中</span> <span>审核中</span>
</div> </div>
<b>您的课程《<?=$course['name']?>》已提交审核,通过后将收到邮件通知</b> <b>您的课程《<?=$course['name']?>》已提交审核,审核结果将以短信形式通知您</b>
<p>12小时内审核完毕</p> <p>12小时内审核完毕</p>
<a href="/my-course/publish?continue=1&last_id=<?=$course['id']?>" class="btn btn-save">继续发布</a> <a href="/my-course/publish?continue=1&last_id=<?=$course['id']?>" class="btn btn-save">继续发布</a>
</div> </div>
...@@ -15,8 +15,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -15,8 +15,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div class="container"> <div class="container">
<div class="z-m-center"> <div class="z-m-center">
<h3>找回密码</h3> <h3>找回密码</h3>
<p>请按步骤获取密码</p>
<div id="myTab" class="tab-find"> <div id="myTab" class="tab-find">
<ul> <ul>
<li class="active"><a href="javascript:;" data-toggle="tab">1</a></li> <li class="active"><a href="javascript:;" data-toggle="tab">1</a></li>
...@@ -44,7 +42,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -44,7 +42,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
'captchaAction' => 'site/captcha', 'captchaAction' => 'site/captcha',
])->error(FALSE); ?> ])->error(FALSE); ?>
<input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required=""> <input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required="">
<span id="verifyCode" class="tips"><?= $model->getFirstError('verifyCode') ?></span> <span id="verifyCode" class="tips tip-vcode"><?= $model->getFirstError('verifyCode') ?></span>
</div> </div>
</div> </div>
......
...@@ -11,7 +11,6 @@ $this->title = 'Reset password'; ...@@ -11,7 +11,6 @@ $this->title = 'Reset password';
<div class="container"> <div class="container">
<div class="z-m-center"> <div class="z-m-center">
<h3>找回密码</h3> <h3>找回密码</h3>
<p>请按步骤获取密码</p>
<div id="myTab" class="tab-find"> <div id="myTab" class="tab-find">
<ul> <ul>
......
...@@ -13,7 +13,6 @@ $this->title = '密码设置成功'; ...@@ -13,7 +13,6 @@ $this->title = '密码设置成功';
<div class="container"> <div class="container">
<div class="z-m-center"> <div class="z-m-center">
<h3>找回密码</h3> <h3>找回密码</h3>
<p>请按步骤获取密码</p>
<div id="myTab" class="tab-find"> <div id="myTab" class="tab-find">
<ul> <ul>
......
...@@ -18,7 +18,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -18,7 +18,6 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
<div class="container"> <div class="container">
<div class="z-m-center"> <div class="z-m-center">
<h3>找回密码</h3> <h3>找回密码</h3>
<p>请按步骤获取密码</p>
<div id="myTab" class="tab-find"> <div id="myTab" class="tab-find">
<ul> <ul>
...@@ -47,7 +46,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -47,7 +46,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js');
'captchaAction' => 'site/captcha', 'captchaAction' => 'site/captcha',
])->error(FALSE); ?> ])->error(FALSE); ?>
<input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required=""> <input id="verifyCode" name="verifyCode" type="text" placeholder="输入验证码" required="">
<span id="verifyCode" class="tips"><?= $model->getFirstError('verifyCode') ?></span> <span id="verifyCode" class="tips tip-vcode"><?= $model->getFirstError('verifyCode') ?></span>
</div> </div>
</div> </div>
<div class="foot-reg-btn"> <div class="foot-reg-btn">
......
...@@ -6,6 +6,11 @@ body { ...@@ -6,6 +6,11 @@ body {
a,a:hover,a:link { a,a:hover,a:link {
text-decoration: none; text-decoration: none;
} }
.btn {
outline: none!important;
border: none!important;
border-radius: 3px!important;
}
.navbar-main { .navbar-main {
background-color: #fff; background-color: #fff;
...@@ -154,10 +159,10 @@ a,a:hover,a:link { ...@@ -154,10 +159,10 @@ a,a:hover,a:link {
line-height: 50px; line-height: 50px;
border: none; border: none;
border-bottom: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;
text-indent: 10px;
font-size: 14px; font-size: 14px;
background-color: transparent; background-color: transparent;
outline: none; outline: none;
padding: 10px;
} }
.last-wrapper input { .last-wrapper input {
......
...@@ -6,6 +6,11 @@ body { ...@@ -6,6 +6,11 @@ body {
a,a:hover,a:link { a,a:hover,a:link {
text-decoration: none; text-decoration: none;
} }
.btn {
outline: none!important;
border: none!important;
border-radius: 3px!important;
}
.mx900 { .mx900 {
max-width: 900px!important; max-width: 900px!important;
} }
......
...@@ -8,6 +8,11 @@ html { ...@@ -8,6 +8,11 @@ html {
a:link, a:active, a:visited { a:link, a:active, a:visited {
text-decoration: none !important; text-decoration: none !important;
} }
.btn {
outline: none!important;
border: none!important;
border-radius: 3px!important;
}
.auto-main { .auto-main {
padding-left: 225px; padding-left: 225px;
...@@ -214,21 +219,37 @@ a:link, a:active, a:visited { ...@@ -214,21 +219,37 @@ a:link, a:active, a:visited {
} }
.avatar > a { .avatar > a {
display: block; display: inline-block;
margin-top: 15px; margin-top: 15px;
-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;
} }
.avatar > a.home-btn {
height: 30px;
width: 30px;
border-radius: 100%;
background-color: rgba(0,0,0,.55);
color: #fff;
text-align: center;
vertical-align: top;
line-height: 32px;
font-size: 18px;
margin-right: 15px;
}
.avatar > a.home-btn:hover {
background-color: #3f7de4;
color: #fff;
}
.avatar > a:hover { .avatar > a.u-center:hover {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg); -ms-transform: rotate(360deg);
-o-transform: rotate(360deg); -o-transform: rotate(360deg);
transform: rotate(360deg); transform: rotate(360deg);
} }
.avatar > a > img { .avatar > a.u-center > img {
height: 30px; height: 30px;
width: 30px; width: 30px;
border-radius: 100%; border-radius: 100%;
...@@ -1132,7 +1153,7 @@ textarea.input-r-control { ...@@ -1132,7 +1153,7 @@ textarea.input-r-control {
} }
.cls-box-main { .cls-box-main {
margin: 0 10px 40px 10px; margin: 0 0 40px 0;
background-color: #fff; background-color: #fff;
} }
...@@ -1666,7 +1687,10 @@ textarea.input-r-control { ...@@ -1666,7 +1687,10 @@ textarea.input-r-control {
padding-left: 0; padding-left: 0;
} }
.menu-btn { .menu-btn {
padding-left: 30px; padding-left: 15px;
}
.avatar {
padding-right: 15px;
} }
.foot { .foot {
display: none; display: none;
......
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