Commit f6452886 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 1e65a677
...@@ -57,7 +57,7 @@ $this->registerJsFile('http://static.geetest.com/static/tools/gt.js'); ...@@ -57,7 +57,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>
......
...@@ -167,7 +167,7 @@ a,a:hover,a:link { ...@@ -167,7 +167,7 @@ a,a:hover,a:link {
} }
.input-wrapper span.tip-vcode { .input-wrapper span.tip-vcode {
right: 85px; right: 100px;
} }
.btn-get-vcode { .btn-get-vcode {
......
...@@ -83,8 +83,6 @@ a:link,a:active,a:visited { ...@@ -83,8 +83,6 @@ a:link,a:active,a:visited {
.accordion li { .accordion li {
width: 100%; width: 100%;
} }
.accordion .link { .accordion .link {
display: block; display: block;
padding: 15px 15px 5px 10px; padding: 15px 15px 5px 10px;
...@@ -96,23 +94,19 @@ a:link,a:active,a:visited { ...@@ -96,23 +94,19 @@ a:link,a:active,a:visited {
transition: all 0.4s ease; transition: all 0.4s ease;
border-left: 2px solid transparent; border-left: 2px solid transparent;
} }
.accordion li:last-child .link { .accordion li:last-child .link {
border-bottom: 0; border-bottom: 0;
} }
.accordion li i.icon-navigate_next { .accordion li i.icon-navigate_next {
right: 12px; right: 12px;
left: auto; left: auto;
font-size: 16px; font-size: 16px;
} }
.accordion li.open .link { .accordion li.open .link {
background-color: #313a46; background-color: #313a46;
border-left: 2px solid #607ca1; border-left: 2px solid #607ca1;
color: #fff; color: #fff;
} }
.accordion li.open i { .accordion li.open i {
color: #fff; color: #fff;
} }
...@@ -131,7 +125,6 @@ a:link,a:active,a:visited { ...@@ -131,7 +125,6 @@ a:link,a:active,a:visited {
/*display: none;*/ /*display: none;*/
font-size: 14px; font-size: 14px;
} }
.submenu li { .submenu li {
position: relative; position: relative;
width: 100%; width: 100%;
...@@ -154,7 +147,6 @@ a:link,a:active,a:visited { ...@@ -154,7 +147,6 @@ a:link,a:active,a:visited {
border-left: 2px solid #607ca1; border-left: 2px solid #607ca1;
color: #fff; color: #fff;
} }
.submenu a { .submenu a {
display: block; display: block;
text-decoration: none; text-decoration: none;
...@@ -164,7 +156,6 @@ a:link,a:active,a:visited { ...@@ -164,7 +156,6 @@ a:link,a:active,a:visited {
-o-transition: all 0.25s ease; -o-transition: all 0.25s ease;
transition: all 0.25s ease; transition: all 0.25s ease;
} }
.submenu a:hover { .submenu a:hover {
background: #3b4654; background: #3b4654;
color: #FFF; color: #FFF;
...@@ -464,7 +455,7 @@ a:link,a:active,a:visited { ...@@ -464,7 +455,7 @@ a:link,a:active,a:visited {
line-height: 1.8; line-height: 1.8;
text-indent: 2em; text-indent: 2em;
opacity: 0; opacity: 0;
height: 120px; height: 115px;
overflow: hidden; 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;
......
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