Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
php
/
nex3s-avatar
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
269cbbcc
authored
Mar 04, 2020
by
doszhang
Browse files
Options
Browse Files
Download
Plain Diff
dos
parents
b37c32e2
f361b904
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
5 deletions
+8
-5
Application/Common/Conf/config.php
+1
-1
Application/Home/View/default/Index_index.tpl
+1
-1
Application/Home/View/default/layout.tpl
+1
-1
Public/static/css/._main.min.css
+0
-0
Public/static/css/main.min.css
+5
-2
No files found.
Application/Common/Conf/config.php
View file @
269cbbcc
...
...
@@ -13,7 +13,7 @@ return array(
'AUTH_CLIENT_ID'
=>
'zhida_app'
,
'AUTH_CLIENT_PASSWORD'
=>
'izhida'
,
/* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
'__CDN__'
=>
'https://static3.izhida.cn/cdn1/nex3s-avatar/v1.
0.9
'
,
'__CDN__'
=>
'https://static3.izhida.cn/cdn1/nex3s-avatar/v1.
1.0
'
,
// '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
'URL_MODEL'
=>
3
,
'STORAGE_PATH'
=>
WEB_ROOT_PATH
.
'/Data/Storage'
,
...
...
Application/Home/View/default/Index_index.tpl
View file @
269cbbcc
...
...
@@ -12,7 +12,7 @@
// body 主题部分
{:block name="body"}
<div
class=
"page-2054 page1 page"
><div
class=
"res-2815
1 bg"
></div><div
class=
"res-28149 hide canvas-block1"
></div><div
class=
"res-28140 username"
><input
name=
"username"
type=
"text"
/></div><div
class=
"res-28152
title"
></div><div
class=
"res-28142 btn-create"
></div><div
class=
"res-28143 hide btn-retry"
></div><div
class=
"res-28144 hide tip"
></div><div
class=
"res-28150 canvas-block"
></div></div>
<div
class=
"page-2054 page1 page"
><div
class=
"res-2815
3 bg"
></div><div
class=
"res-28149 hide canvas-block1"
></div><div
class=
"res-28140 username"
><input
name=
"username"
type=
"text"
/></div><div
class=
"res-28155
title"
></div><div
class=
"res-28142 btn-create"
></div><div
class=
"res-28143 hide btn-retry"
></div><div
class=
"res-28144 hide tip"
></div><div
class=
"res-28150 canvas-block"
></div></div>
{:/block}
//js 文件导入
...
...
Application/Home/View/default/layout.tpl
View file @
269cbbcc
...
...
@@ -76,7 +76,7 @@
{:/if}
{:block name='css'}{:/block}
<link
rel=
"stylesheet"
type=
"text/css"
href=
"__CDN__/css/notify.css"
media=
"all"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"__CDN__/css/index.css?version=1.0.
1
"
media=
"all"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"__CDN__/css/index.css?version=1.0.
2
"
media=
"all"
/>
</head>
<body>
...
...
Public/static/css/._main.min.css
deleted
100644 → 0
View file @
b37c32e2
File deleted
Public/static/css/main.min.css
View file @
269cbbcc
body
{
margin
:
0
;
padding
:
0
}
.hide
{
display
:
none
;}
.page
{
width
:
32rem
;
height
:
61.9rem
;
position
:
relative
;
display
:
none
;
overflow
:
hidden
;
margin
:
0
auto
;}
.page-2054
{
display
:
block
}
input
,
textarea
,
img
{
border
:
0
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
margin
:
0
;
padding
:
0
;}
input
,
textarea
{
background
:
transparent
;}
input
[
type
=
file
]
{
opacity
:
0
;}
.res-28150
{
position
:
absolute
;
left
:
7.05rem
;
top
:
20.45rem
;
width
:
18rem
;
height
:
18rem
;}
.res-28144
{
position
:
absolute
;
opacity
:
1
;
left
:
11.4rem
;
top
:
39.25rem
;
width
:
9.2rem
;
height
:
1.45rem
;
background
:
url(../images/5408_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28143
{
position
:
absolute
;
opacity
:
1
;
left
:
9.3rem
;
top
:
49.5rem
;
width
:
13.5rem
;
height
:
3.25rem
;
background
:
url(../images/5971_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28152
{
position
:
absolute
;
opacity
:
1
;
left
:
0rem
;
top
:
7.75rem
;
width
:
32rem
;
height
:
7.75rem
;
background
:
url(../images/7699_1583299843.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28142
{
position
:
absolute
;
opacity
:
1
;
left
:
9.3rem
;
top
:
49.5rem
;
width
:
13.5rem
;
height
:
3.25rem
;
background
:
url(../images/6532_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28149
{
position
:
absolute
;
opacity
:
1
;
left
:
7.05rem
;
top
:
20.45rem
;
width
:
18rem
;
height
:
18rem
;
background
:
url(../images/782_1583247415.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28140
{
position
:
absolute
;
opacity
:
1
;
left
:
6.4rem
;
top
:
45.25rem
;
width
:
19.3rem
;
height
:
2.1rem
;
background
:
url(../images/6793_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28151
{
position
:
absolute
;
opacity
:
1
;
left
:
0rem
;
top
:
0rem
;
width
:
32rem
;
height
:
61.9rem
;
background
:
url(../images/1293_1583298317.jpg)
left
top
no-repeat
;
background-size
:
100%
100%
;}
\ No newline at end of file
<<<<<<<
HEAD
body
{
margin
:
0
;
padding
:
0
}
.hide
{
display
:
none
;}
.page
{
width
:
32rem
;
height
:
61.9rem
;
position
:
relative
;
display
:
none
;
overflow
:
hidden
;
margin
:
0
auto
;}
.page-2054
{
display
:
block
}
input
,
textarea
,
img
{
border
:
0
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
margin
:
0
;
padding
:
0
;}
input
,
textarea
{
background
:
transparent
;}
input
[
type
=
file
]
{
opacity
:
0
;}
.res-28150
{
position
:
absolute
;
left
:
7.05rem
;
top
:
20.45rem
;
width
:
18rem
;
height
:
18rem
;}
.res-28144
{
position
:
absolute
;
opacity
:
1
;
left
:
11.4rem
;
top
:
39.25rem
;
width
:
9.2rem
;
height
:
1.45rem
;
background
:
url(../images/5408_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28143
{
position
:
absolute
;
opacity
:
1
;
left
:
9.3rem
;
top
:
49.5rem
;
width
:
13.5rem
;
height
:
3.25rem
;
background
:
url(../images/5971_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28152
{
position
:
absolute
;
opacity
:
1
;
left
:
0rem
;
top
:
7.75rem
;
width
:
32rem
;
height
:
7.75rem
;
background
:
url(../images/7699_1583299843.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28142
{
position
:
absolute
;
opacity
:
1
;
left
:
9.3rem
;
top
:
49.5rem
;
width
:
13.5rem
;
height
:
3.25rem
;
background
:
url(../images/6532_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28149
{
position
:
absolute
;
opacity
:
1
;
left
:
7.05rem
;
top
:
20.45rem
;
width
:
18rem
;
height
:
18rem
;
background
:
url(../images/782_1583247415.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28140
{
position
:
absolute
;
opacity
:
1
;
left
:
6.4rem
;
top
:
45.25rem
;
width
:
19.3rem
;
height
:
2.1rem
;
background
:
url(../images/6793_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28151
{
position
:
absolute
;
opacity
:
1
;
left
:
0rem
;
top
:
0rem
;
width
:
32rem
;
height
:
61.9rem
;
background
:
url(../images/1293_1583298317.jpg)
left
top
no-repeat
;
background-size
:
100%
100%
;}
=======
body
{
margin
:
0
;
padding
:
0
}
.hide
{
display
:
none
;}
.page
{
width
:
32rem
;
height
:
61.9rem
;
position
:
relative
;
display
:
none
;
overflow
:
hidden
;
margin
:
0
auto
;}
.page-2054
{
display
:
block
}
input
,
textarea
,
img
{
border
:
0
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
margin
:
0
;
padding
:
0
;}
input
,
textarea
{
background
:
transparent
;}
input
[
type
=
file
]
{
opacity
:
0
;}
.res-28150
{
position
:
absolute
;
left
:
7.05rem
;
top
:
20.45rem
;
width
:
18rem
;
height
:
18rem
;}
.res-28144
{
position
:
absolute
;
opacity
:
1
;
left
:
11.4rem
;
top
:
39.25rem
;
width
:
9.2rem
;
height
:
1.45rem
;
background
:
url(../images/5408_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28143
{
position
:
absolute
;
opacity
:
1
;
left
:
9.3rem
;
top
:
49.5rem
;
width
:
13.5rem
;
height
:
3.25rem
;
background
:
url(../images/5971_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28155
{
position
:
absolute
;
opacity
:
1
;
left
:
0rem
;
top
:
7.75rem
;
width
:
32rem
;
height
:
5.8rem
;
background
:
url(../images/5839_1583306284.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28142
{
position
:
absolute
;
opacity
:
1
;
left
:
9.3rem
;
top
:
49.5rem
;
width
:
13.5rem
;
height
:
3.25rem
;
background
:
url(../images/6532_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28149
{
position
:
absolute
;
opacity
:
1
;
left
:
7.05rem
;
top
:
20.45rem
;
width
:
18rem
;
height
:
18rem
;
background
:
url(../images/782_1583247415.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28140
{
position
:
absolute
;
opacity
:
1
;
left
:
6.4rem
;
top
:
45.25rem
;
width
:
19.3rem
;
height
:
2.1rem
;
background
:
url(../images/6793_1583242424.png)
left
top
no-repeat
;
background-size
:
100%
100%
;}
.res-28153
{
position
:
absolute
;
opacity
:
1
;
left
:
0rem
;
top
:
0rem
;
width
:
32.05rem
;
height
:
61.9rem
;
background
:
url(../images/1651_1583304165.jpg)
left
top
no-repeat
;
background-size
:
100%
100%
;}
>>>>>>>
master
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