Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
php
/
dencare-game
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
7b7aa42c
authored
Aug 30, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
84c10bf4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
20 deletions
+21
-20
.idea/workspace.xml
+14
-14
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+0
-0
Public/static/css/main.css
+3
-3
Public/static/css/main.scss
+4
-3
No files found.
.idea/workspace.xml
View file @
7b7aa42c
...
...
@@ -4,7 +4,6 @@
<list
default=
"true"
id=
"393705e8-a82c-4795-9b3b-5f911ddba9ac"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
afterPath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
afterPath=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/css/main.css"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.css"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/css/main.scss"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
</list>
...
...
@@ -123,8 +122,8 @@
<file
leaf-file-name=
"main.scss"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"3
44
"
>
<caret
line=
"
592"
column=
"15"
lean-forward=
"false"
selection-start-line=
"592"
selection-start-column=
"15"
selection-end-line=
"592"
selection-end-column=
"15
"
/>
<state
relative-caret-position=
"3
23
"
>
<caret
line=
"
652"
column=
"2"
lean-forward=
"false"
selection-start-line=
"652"
selection-start-column=
"2"
selection-end-line=
"652"
selection-end-column=
"2
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -183,8 +182,8 @@
<option
value=
"$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Application/User/Controller/ReportController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
</list>
</option>
</component>
...
...
@@ -545,12 +544,12 @@
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"55749000"
/>
<workItem
from=
"1567098016695"
duration=
"4
571
000"
/>
<workItem
from=
"1567098016695"
duration=
"4
746
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"60
320
000"
/>
<option
name=
"totallyTimeSpent"
value=
"60
495
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"14"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"0"
/>
...
...
@@ -831,14 +830,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"344"
>
<caret
line=
"592"
column=
"15"
lean-forward=
"false"
selection-start-line=
"592"
selection-start-column=
"15"
selection-end-line=
"592"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"466"
>
...
...
@@ -851,5 +842,13 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"323"
>
<caret
line=
"652"
column=
"2"
lean-forward=
"false"
selection-start-line=
"652"
selection-start-column=
"2"
selection-end-line=
"652"
selection-end-column=
"2"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
deleted
100644 → 0
View file @
84c10bf4
File deleted
Public/static/css/main.css
View file @
7b7aa42c
...
...
@@ -856,7 +856,7 @@ ul, li {
background
:
url("../images/33.png")
left
top
;
width
:
285px
;
height
:
399px
;
-webkit-animation
:
down
1s
1
linear
1s
;
-webkit-animation
:
down
1s
1
linear
;
animation-fill-mode
:
forwards
;
}
.page-lang
.map-33
{
...
...
@@ -868,7 +868,7 @@ ul, li {
background
:
url("../images/32.png")
left
top
;
width
:
234px
;
height
:
186px
;
-webkit-animation
:
left
1s
1
linear
1s
;
-webkit-animation
:
left
1s
1
linear
;
animation-fill-mode
:
forwards
;
}
.page-lang
.map-34
{
...
...
@@ -880,7 +880,7 @@ ul, li {
background
:
url("../images/34.png")
left
top
;
width
:
197px
;
height
:
167px
;
-webkit-animation
:
left
1s
1
linear
1
s
;
-webkit-animation
:
left
1s
1
linear
0.5
s
;
animation-fill-mode
:
forwards
;
}
.page-lang
.map-21
{
...
...
Public/static/css/main.scss
View file @
7b7aa42c
...
...
@@ -640,20 +640,21 @@ ul, li {
.map-20
{
opacity
:
0
;
@include
image_bounds_by_pos
(
"../images/33.png"
,
289px
,
6708px
);
-webkit-animation
:
down
1s
1
linear
1s
;
-webkit-animation
:
down
1s
1
linear
;
animation-fill-mode
:
forwards
}
.map-33
{
opacity
:
0
;
@include
image_bounds_by_pos
(
"../images/32.png"
,
68px
,
6691px
);
-webkit-animation
:
left
1s
1
linear
1s
;
-webkit-animation
:
left
1s
1
linear
;
animation-fill-mode
:
forwards
}
.map-34
{
opacity
:
0
;
@include
image_bounds_by_pos
(
"../images/34.png"
,
68px
,
6946px
);
-webkit-animation
:
left
1s
1
linear
1
s
;
-webkit-animation
:
left
1s
1
linear
0
.5
s
;
animation-fill-mode
:
forwards
}
.map-21
{
...
...
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