Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
php
/
bestpay
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
a0ebdeca
authored
Dec 26, 2017
by
张恒
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
k
parent
9490b7e8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
13 deletions
+8
-13
.idea/workspace.xml
+6
-11
.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc
+0
-0
css/main.css
+1
-1
css/main.scss
+1
-1
No files found.
.idea/workspace.xml
View file @
a0ebdeca
...
@@ -2,13 +2,8 @@
...
@@ -2,13 +2,8 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"d52db3c2-5e88-4692-bb71-d738c8d9556a"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"d52db3c2-5e88-4692-bb71-d738c8d9556a"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc"
afterPath=
"$PROJECT_DIR$/.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/image/bj.png"
afterPath=
"$PROJECT_DIR$/image/bj.png"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/css/main.css"
afterPath=
"$PROJECT_DIR$/css/main.css"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/css/main.scss"
afterPath=
"$PROJECT_DIR$/css/main.scss"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/css/main.scss"
afterPath=
"$PROJECT_DIR$/css/main.scss"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/index.html"
afterPath=
"$PROJECT_DIR$/index.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/js/index.js"
afterPath=
"$PROJECT_DIR$/js/index.js"
/>
</list>
</list>
<ignored
path=
"$PROJECT_DIR$/.tmp/"
/>
<ignored
path=
"$PROJECT_DIR$/.tmp/"
/>
<ignored
path=
"$PROJECT_DIR$/temp/"
/>
<ignored
path=
"$PROJECT_DIR$/temp/"
/>
...
@@ -32,8 +27,8 @@
...
@@ -32,8 +27,8 @@
<file
leaf-file-name=
"main.scss"
pinned=
"false"
current-in-tab=
"true"
>
<file
leaf-file-name=
"main.scss"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/css/main.scss"
>
<entry
file=
"file://$PROJECT_DIR$/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"3
1
3"
>
<state
relative-caret-position=
"3
9
3"
>
<caret
line=
"1
66"
column=
"3"
lean-forward=
"true"
selection-start-line=
"166"
selection-start-column=
"3"
selection-end-line=
"166"
selection-end-column=
"3
"
/>
<caret
line=
"1
19"
column=
"0"
lean-forward=
"true"
selection-start-line=
"119"
selection-start-column=
"0"
selection-end-line=
"119"
selection-end-column=
"0
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -174,12 +169,12 @@
...
@@ -174,12 +169,12 @@
<workItem
from=
"1514167528770"
duration=
"8447000"
/>
<workItem
from=
"1514167528770"
duration=
"8447000"
/>
<workItem
from=
"1514200644225"
duration=
"350000"
/>
<workItem
from=
"1514200644225"
duration=
"350000"
/>
<workItem
from=
"1514214503382"
duration=
"441000"
/>
<workItem
from=
"1514214503382"
duration=
"441000"
/>
<workItem
from=
"1514277550054"
duration=
"
29
000"
/>
<workItem
from=
"1514277550054"
duration=
"
126
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"13
214
000"
/>
<option
name=
"totallyTimeSpent"
value=
"13
311
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"0"
y=
"23"
width=
"1440"
height=
"821"
extended-state=
"6"
/>
<frame
x=
"0"
y=
"23"
width=
"1440"
height=
"821"
extended-state=
"6"
/>
...
@@ -390,8 +385,8 @@
...
@@ -390,8 +385,8 @@
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/css/main.scss"
>
<entry
file=
"file://$PROJECT_DIR$/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"3
1
3"
>
<state
relative-caret-position=
"3
9
3"
>
<caret
line=
"1
66"
column=
"3"
lean-forward=
"true"
selection-start-line=
"166"
selection-start-column=
"3"
selection-end-line=
"166"
selection-end-column=
"3
"
/>
<caret
line=
"1
19"
column=
"0"
lean-forward=
"true"
selection-start-line=
"119"
selection-start-column=
"0"
selection-end-line=
"119"
selection-end-column=
"0
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
...
.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc
View file @
a0ebdeca
No preview for this file type
css/main.css
View file @
a0ebdeca
...
@@ -114,7 +114,7 @@ p {
...
@@ -114,7 +114,7 @@ p {
position
:
relative
;
position
:
relative
;
}
}
#page
.home
.content
.bj
{
#page
.home
.content
.bj
{
background
:
url("../image/bj.png?t=1")
no-repeat
center
;
background
:
url("../image/bj.png?t=
2.
1")
no-repeat
center
;
background-size
:
100%
100%
;
background-size
:
100%
100%
;
width
:
10rem
;
width
:
10rem
;
height
:
17.86667rem
;
height
:
17.86667rem
;
...
...
css/main.scss
View file @
a0ebdeca
...
@@ -120,7 +120,7 @@ p {
...
@@ -120,7 +120,7 @@ p {
.bj
{
.bj
{
background
:
url("../image/bj.png?t=1")
no-repeat
center
;
background
:
url("../image/bj.png?t=
2.
1")
no-repeat
center
;
background-size
:
100%
100%
;
background-size
:
100%
100%
;
width
:
torem
(
750px
);
width
:
torem
(
750px
);
height
:
torem
(
1340px
);
height
:
torem
(
1340px
);
...
...
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