Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
1e8209de
Commit
1e8209de
authored
Oct 31, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
5a771acc
85b55116
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
9 deletions
+30
-9
main.php
src/frontend/views/layouts/main.php
+1
-1
userCenter.php
src/frontend/views/layouts/userCenter.php
+5
-2
login.css
src/frontend/web/css/login.css
+7
-3
main.css
src/frontend/web/css/main.css
+0
-3
style.css
src/frontend/web/css/style.css
+17
-0
logo.png
src/frontend/web/img/logo.png
+0
-0
logo_white.png
src/frontend/web/img/logo_white.png
+0
-0
No files found.
src/frontend/views/layouts/main.php
View file @
1e8209de
...
@@ -28,7 +28,7 @@ $baseUrl = \yii\helpers\Url::base();
...
@@ -28,7 +28,7 @@ $baseUrl = \yii\helpers\Url::base();
<?php
if
(
Yii
::
$app
->
user
->
isGuest
)
:
?>
<?php
if
(
Yii
::
$app
->
user
->
isGuest
)
:
?>
<div
class=
"navbar-main navbar-static-top clearfix"
>
<div
class=
"navbar-main navbar-static-top clearfix"
>
<div
id=
"main-logo"
class=
"logo pull-left logo-home"
><a
href=
"
<?=
$baseUrl
.
"/user-center/"
?>
"
></a></div>
<div
id=
"main-logo"
class=
"logo pull-left logo-home"
><a
href=
"
<?=
$baseUrl
.
"/user-center/"
?>
"
>
云涯
</a></div>
<!--
<!--
<ul class="c-menu-item pull-left">
<ul class="c-menu-item pull-left">
<li class="active"><a href="#">首页</a></li>
<li class="active"><a href="#">首页</a></li>
...
...
src/frontend/views/layouts/userCenter.php
View file @
1e8209de
...
@@ -11,8 +11,11 @@ $this->beginContent('@app/views/layouts/center.php');
...
@@ -11,8 +11,11 @@ $this->beginContent('@app/views/layouts/center.php');
?>
?>
<div
class=
"tp-sidebar"
>
<div
class=
"tp-sidebar"
>
<div
class=
"logo"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
?>
"
><img
<div
class=
"logo"
>
src=
"
<?=
AppAsset
::
getStaticUrl
(
'img/logo.png'
)
?>
"
></a></div>
<a
href=
"
<?=
\yii\helpers\Url
::
base
()
?>
"
>
<span
class=
"clearfix"
><img
src=
"
<?=
AppAsset
::
getStaticUrl
(
'img/logo.png'
)
?>
"
>
<b>
云涯
</b></span>
</a>
</div>
<div
class=
"side-menu"
>
<div
class=
"side-menu"
>
<!-- 左侧菜单 -->
<!-- 左侧菜单 -->
...
...
src/frontend/web/css/login.css
View file @
1e8209de
...
@@ -20,9 +20,13 @@ a,a:hover,a:link {
...
@@ -20,9 +20,13 @@ a,a:hover,a:link {
}
}
.logo-home
a
{
.logo-home
a
{
display
:
block
;
display
:
block
;
width
:
12
0px
;
width
:
8
0px
;
height
:
60px
;
height
:
60px
;
background
:
url(../img/logo_white.png)
left
top
no-repeat
;
background
:
url(../img/logo_white.png)
left
top
no-repeat
;
font-size
:
14px
;
line-height
:
60px
;
text-indent
:
35px
;
color
:
#107fbd
;
}
}
.yun-login-btn
{
.yun-login-btn
{
margin-right
:
30px
;
margin-right
:
30px
;
...
@@ -125,14 +129,14 @@ a,a:hover,a:link {
...
@@ -125,14 +129,14 @@ a,a:hover,a:link {
}
}
.form-register
{
.form-register
{
width
:
30
0px
;
width
:
29
0px
;
display
:
inline-block
;
display
:
inline-block
;
border
:
1px
solid
#d5d5d5
;
border
:
1px
solid
#d5d5d5
;
border-radius
:
3px
;
border-radius
:
3px
;
background-color
:
#fff
;
background-color
:
#fff
;
}
}
.reg-box
{
.reg-box
{
width
:
30
0px
;
width
:
29
0px
;
display
:
inline-block
;
display
:
inline-block
;
border
:
1px
solid
#d5d5d5
;
border
:
1px
solid
#d5d5d5
;
border-radius
:
3px
;
border-radius
:
3px
;
...
...
src/frontend/web/css/main.css
View file @
1e8209de
...
@@ -964,9 +964,6 @@ a,a:hover,a:link {
...
@@ -964,9 +964,6 @@ a,a:hover,a:link {
.video-js
.vjs-play-progress
{
.video-js
.vjs-play-progress
{
background-color
:
#f12b24
!important
;
background-color
:
#f12b24
!important
;
}
}
.video-js
.vjs-load-progress
{
}
src/frontend/web/css/style.css
View file @
1e8209de
...
@@ -86,6 +86,23 @@ a:link, a:active, a:visited {
...
@@ -86,6 +86,23 @@ a:link, a:active, a:visited {
display
:
inline-block
;
display
:
inline-block
;
}
}
.logo
a
span
{
display
:
inline-block
;
height
:
60px
;
}
.logo
a
span
img
{
float
:
left
;
}
.logo
a
span
b
{
float
:
left
;
font-weight
:
normal
;
display
:
inline-block
;
height
:
60px
;
line-height
:
60px
;
color
:
#fff
;
padding-left
:
10px
;
}
.accordion
,
.accordion
,
.accordion
li
{
.accordion
li
{
...
...
src/frontend/web/img/logo.png
View replaced file @
5a771acc
View file @
1e8209de
2.13 KB
|
W:
|
H:
1.61 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/frontend/web/img/logo_white.png
View replaced file @
5a771acc
View file @
1e8209de
2.2 KB
|
W:
|
H:
1.62 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment