Commit 9fdf4a14 authored by xiabin's avatar xiabin

修改css

parent f72668b1
...@@ -14,7 +14,6 @@ class AppAsset extends AssetBundle ...@@ -14,7 +14,6 @@ class AppAsset extends AssetBundle
public $baseUrl = '@web/assets'; public $baseUrl = '@web/assets';
public $css = [ public $css = [
'css/style.css'
]; ];
public $js = [ public $js = [
......
...@@ -11,14 +11,22 @@ use frontend\assets\AppAsset; ...@@ -11,14 +11,22 @@ use frontend\assets\AppAsset;
use common\widgets\Alert; use common\widgets\Alert;
AppAsset::register($this); AppAsset::register($this);
AppAsset::addCss($this, '@web/assets/css/site.css'); AppAsset::addCss($this, '@web/assets/css/login_css.css');
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html>
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<head> <title>注册/登录</title>
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="">
<meta name="keywords" content="">
<!-- Use latest IE randering angine and switch on chrome Frame if available -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?=AppAsset::getStaticUrl('img/favicon.ico')?>">
<?= Html::csrfMetaTags() ?> <?= Html::csrfMetaTags() ?>
<title><?= Html::encode($this->title) ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head() ?> <?php $this->head() ?>
...@@ -26,56 +34,22 @@ AppAsset::addCss($this, '@web/assets/css/site.css'); ...@@ -26,56 +34,22 @@ AppAsset::addCss($this, '@web/assets/css/site.css');
<body> <body>
<?php $this->beginBody() ?> <?php $this->beginBody() ?>
<div class="wrap"> <nav class="navbar navbar-main navbar-static-top">
<?php <div class="logo pull-left">云涯 YunYa</div>
NavBar::begin([ <ul class="nav navbar-nav pull-right yun-login-btn">
'brandLabel' => 'My Company', <li><a href="#">登录</a></li>
'brandUrl' => Yii::$app->homeUrl, <li class="active"><a href="#">注册</a></li>
'options' => [ </ul>
'class' => 'navbar-inverse navbar-fixed-top', </nav>
],
]);
$menuItems = [
['label' => 'Home', 'url' => ['/site/index']],
['label' => 'About', 'url' => ['/site/about']],
['label' => 'Contact', 'url' => ['/site/contact']],
];
if (Yii::$app->user->isGuest) {
$menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
$menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
} else {
$menuItems[] = '<li>'
. Html::beginForm(['/site/logout'], 'post')
. Html::submitButton(
'Logout (' . Yii::$app->user->identity->username . ')',
['class' => 'btn btn-link']
)
. Html::endForm()
. '</li>';
}
echo Nav::widget([
'options' => ['class' => 'navbar-nav navbar-right'],
'items' => $menuItems,
]);
NavBar::end();
?>
<div class="container">
<?= Breadcrumbs::widget([ <div class="container">
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]) ?>
<?= Alert::widget() ?>
<?= $content ?> <?= $content ?>
</div>
</div> </div>
<footer class="footer">
<div class="container">
<p class="pull-left">&copy; My Company <?= date('Y') ?></p>
<p class="pull-right"><?= Yii::powered() ?></p>
</div>
</footer>
<?php $this->endBody() ?> <?php $this->endBody() ?>
</body> </body>
......
...@@ -7,7 +7,7 @@ use frontend\assets\AppAsset; ...@@ -7,7 +7,7 @@ use frontend\assets\AppAsset;
/* @var $content string */ /* @var $content string */
AppAsset::register($this); AppAsset::register($this);
AppAsset::addCss($this, '@web/assets/css/style.css');
$js = <<<JS $js = <<<JS
$(function() { $(function() {
var Accordion = function(el, multiple) { var Accordion = function(el, multiple) {
...@@ -39,20 +39,20 @@ $this->registerJs($js, View::POS_END); ...@@ -39,20 +39,20 @@ $this->registerJs($js, View::POS_END);
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?=Yii::$app->language?>"> <html lang="<?= Yii::$app->language ?>">
<head> <head>
<meta charset="<?=Yii::$app->charset?>"> <meta charset="<?= Yii::$app->charset ?>">
<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>
<?=Html::csrfMetaTags()?> <?= Html::csrfMetaTags() ?>
<?php $this->head() ?> <?php $this->head() ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<div class="tp-sidebar"> <div class="tp-sidebar">
<div class="logo"><a href="/"><img src="<?=Yii::$app->assetManager->baseUrl?>/img/logo.png"></a></div> <div class="logo"><a href="/"><img src="<?= Yii::$app->assetManager->baseUrl ?>/img/logo.png"></a></div>
<div class="side-menu"> <div class="side-menu">
<!-- Contenedor --> <!-- Contenedor -->
<ul id="accordion" class="accordion"> <ul id="accordion" class="accordion">
...@@ -76,7 +76,8 @@ $this->registerJs($js, View::POS_END); ...@@ -76,7 +76,8 @@ $this->registerJs($js, View::POS_END);
<li><a href="#">会员列表</a></li> <li><a href="#">会员列表</a></li>
</ul> </ul>
</li> </li>
<li><div class="link"><i class="icon-bell"></i>知识有价<i class="icon-navigate_next"></i></div> <li>
<div class="link"><i class="icon-bell"></i>知识有价<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="#">购买记录</a></li> <li><a href="#">购买记录</a></li>
</ul> </ul>
...@@ -88,12 +89,12 @@ $this->registerJs($js, View::POS_END); ...@@ -88,12 +89,12 @@ $this->registerJs($js, View::POS_END);
<div class="auto-main"> <div class="auto-main">
<div class="tp-head navbar-fixed-top clearfix"> <div class="tp-head navbar-fixed-top clearfix">
<div class="menu-btn fl"><a href="#"><i class="icon-menu"></i></a></div> <div class="menu-btn fl"><a href="#"><i class="icon-menu"></i></a></div>
<div class="avatar fr"><a href="#"><img src="<?=Yii::$app->assetManager->baseUrl?>/img/avatar.jpg"></a></div> <div class="avatar fr"><a href="#"><img src="<?= Yii::$app->assetManager->baseUrl ?>/img/avatar.jpg"></a></div>
</div> </div>
<div class="tp-main"> <div class="tp-main">
<div class="container"> <div class="container">
<?=$content?> <?= $content ?>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -2,52 +2,78 @@ ...@@ -2,52 +2,78 @@
/* @var $this yii\web\View */ /* @var $this yii\web\View */
$this->title = 'My Yii Application'; $this->title = '云崖';
?> ?>
<div class="site-index"> <div class="z-m-center">
<h3>云涯</h3>
<p>欢迎来到最课堂,专注在线直播</p>
<div class="jumbotron"> <div id="myTab" class="tab-a">
<h1>Congratulations!</h1> <ul>
<li><a href="#login" data-toggle="tab">登录</a></li>
<li class="active"><a href="#register" data-toggle="tab">注册</a></li>
</ul>
</div>
<p class="lead">You have successfully created your Yii-powered application.</p> <div class="tab-content" id="myTabContent">
<p><a class="btn btn-lg btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p> <div class="tab-pane fade" id="login">
<div class="reg-box">
<div class="phone input-wrapper">
<input type="text" class="" placeholder="手机号码" required="" autofocus="">
<span class="tips">手机号或者密码错误</span>
</div>
<div class="password input-wrapper last-wrapper">
<input type="password" class="" placeholder="密码" required="">
</div>
</div> </div>
<div class="body-content"> <div class="checkbox part-wap">
<label>
<input type="checkbox" value="remember-me"> 记住密码
</label>
<a href="#">忘记密码?</a>
</div>
<div class="row"> <div class="foot-reg-btn">
<div class="col-lg-4"> <button class="btn btn-log" type="submit">登录</button>
<h2>Heading</h2> </div>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <div class="div-line">或</div>
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
fugiat nulla pariatur.</p>
<p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p> <div class="foot-reg-btn">
<button class="btn btn-reg" type="submit">微信登录</button>
</div>
</div> </div>
<div class="col-lg-4">
<h2>Heading</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <div class="tab-pane fade in active" id="register">
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip <div class="reg-box">
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu <div class="phone input-wrapper">
fugiat nulla pariatur.</p> <input type="text" class="" placeholder="手机号码" required="" autofocus="">
<span class="tips">手机号或者密码错误</span>
</div>
<p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p> <div class="v-code input-wrapper">
<input type="text" class="" placeholder="验证码" required="">
<button class="btn btn-get-vcode">获取验证码</button>
<span class="tips tip-vcode">验证码错误</span>
</div> </div>
<div class="col-lg-4">
<h2>Heading</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <div class="password input-wrapper">
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip <input type="password" class="" placeholder="输入密码" required="">
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu </div>
fugiat nulla pariatur.</p>
<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p> <div class="check-password input-wrapper last-wrapper">
<input type="password" class="" placeholder="再次输入密码" required="">
</div>
</div>
<div class="foot-reg-btn">
<button class="btn btn-reg" type="submit">注册</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@charset "utf-8";
body {
font-family: "Microsoft YaHei","Helvitica Neue", Helvitica, Arial, "Hiragino Sans GB", "Arial Regular", "Microsoft JhengHei", sans-serif;
background-color: #f7f8fa;
}
a,a:hover,a:link {
text-decoration: none;
}
.navbar-main {
background-color: #fff;
box-shadow: 0 0 30px rgba(0,0,0,.05);
}
.logo {
line-height: 50px;
margin-left: 30px;
}
.yun-login-btn {
margin-right: 30px;
}
.yun-login-btn li a {
color: #333;
}
.yun-login-btn li:last-child a{
background-color: #34bf49;
color: #fff;
}
.z-m-center {
text-align: center;
}
.z-m-center > p {
font-size: 12px;
padding: 0 0 20px;
color: #999;
}
.tab-a ul,li ,
.tab-find ul,li{
list-style: none;
margin: 0;
padding: 0;
}
.tab-a li,
.tab-find li{
display: inline-block;
margin-right: 25px;
}
.tab-a li:last-child,
.tab-find li:last-child {
margin-right: 0;
}
.tab-a a {
display: inline-block;
color: #333;
height: 60px;
line-height: 60px;
padding: 0 5px;
border-bottom: 2px solid transparent;
}
.tab-a li.active a {
border-bottom: 2px solid #2a6496;
}
.tab-find {
margin-top: 20px;
}
.tab-find a {
display: inline-block;
width: 50px;
height: 50px;
text-align: center;
line-height: 50px;
background-color: #fff;
border-radius: 100%;
}
.tab-find li.active a {
background-color: #4285f4;
color: #fff;
}
.tab-pane {
margin-top: 40px;
}
.form-register {
width: 300px;
display: inline-block;
border: 1px solid #d5d5d5;
border-radius: 3px;
background-color: #fff;
}
.reg-box {
width: 300px;
display: inline-block;
border: 1px solid #d5d5d5;
border-radius: 3px;
background: #fff;
}
.input-wrapper {
position: relative;
border: 0;
border-radius: 0;
box-shadow: none;
}
.input-wrapper input {
width: 100%;
height: 50px;
line-height: 50px;
border: none;
border-bottom: 1px solid #f3f3f3;
text-indent: 10px;
font-size: 14px;
background-color: transparent;
outline: none;
}
.last-wrapper input {
border-bottom: none;
}
.input-wrapper span.tips {
display: inline-block;
height: 50px;
line-height: 50px;
position: absolute;
right: 0;
top: 0;
padding: 0 10px;
color: #f03434;
font-size: 12px;
}
.input-wrapper span.tip-vcode {
right: 85px;
}
.btn-get-vcode {
position: absolute;
top: 0;
right: 0;
background-color: transparent;
height: 50px;
border-radius: 0;
border: none;
border-left: 1px solid #f3f3f3;
outline: none;
font-size: 12px;
color: #2a6496;
}
.foot-reg-btn {
margin-top: 20px;
}
.btn-reg {
width: 300px;
height: 44px;
line-height: 44px;
padding: 0;
background-color: #34bf49;
color: #fff;
}
.btn-reg:hover {
background-color: #31b445;
color: #fff;
}
.btn-log {
width: 300px;
height: 44px;
line-height: 44px;
padding: 0;
background-color: #4285f4;
color: #fff;
}
.btn-log:hover {
background-color: #3f7de4;
color: #fff;
}
.part-wap {
width: 300px;
margin: 20px auto 0;
text-align: left;
}
.part-wap a {
float: right;
}
.div-line {
margin-top: 20px;
color: #999;
font-size: 12px;
}
.sucess-box span {
display: inline-block;
height: 50px;
width: 50px;
border-radius: 100%;
background-color: #34bf49;
line-height: 50px;
text-align: center;
font-size: 24px;
color: #fff;
}
.sucess-box p {
line-height: 30px;
font-size: 12px;
color: #34bf49;
padding-bottom: 20px;
}
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
*/ */
layer.msg('玩命提示中'); layer.msg('玩命提示中');
var token = $('#avatar-uploader').attr('token'); var token = $('#avatar-uploader').attr('token');
require.ensure('../single-lib/plupload/plupload.full.min.js', function () { require.ensure('../libs/plupload/plupload.full.min.js', function () {
require('script!../single-lib/plupload/plupload.full.min.js'); require('script!../libs/plupload/plupload.full.min.js');
var uploader = new plupload.Uploader({ var uploader = new plupload.Uploader({
runtimes: 'html5,flash,html4', runtimes: 'html5,flash,html4',
browse_button: 'avatar-uploader', browse_button: 'avatar-uploader',
......
...@@ -10,7 +10,7 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin"); ...@@ -10,7 +10,7 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin");
var entry = { var entry = {
vendor: ["jquery", "vue", js_dir + "/utils/layer"], vendor: ["jquery", "vue", js_dir + "/utils/layer"],
site: [css_dir + '/site.css'], login_css: [css_dir + '/login.css'],
style: [css_dir + '/reset.css', css_dir + '/style.css'], style: [css_dir + '/reset.css', css_dir + '/style.css'],
signup: [js_dir + '/site/signup.js'], signup: [js_dir + '/site/signup.js'],
login: [js_dir + '/site/login.js'], login: [js_dir + '/site/login.js'],
......
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