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
5cc021f3
authored
Aug 27, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
y
parent
1b51057a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
31 deletions
+37
-31
.idea/workspace.xml
+29
-30
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+0
-0
Application/Home/View/default/Index_index.tpl
+1
-1
Public/static/css/main.css
+4
-0
Public/static/css/main.scss
+3
-0
No files found.
.idea/workspace.xml
View file @
5cc021f3
...
@@ -2,7 +2,11 @@
...
@@ -2,7 +2,11 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"393705e8-a82c-4795-9b3b-5f911ddba9ac"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"393705e8-a82c-4795-9b3b-5f911ddba9ac"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/js/index.js"
afterPath=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<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>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
@@ -78,11 +82,11 @@
...
@@ -78,11 +82,11 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"Index_index.tpl"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"Index_index.tpl"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
>
<entry
file=
"file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
28
"
>
<state
relative-caret-position=
"2
47
"
>
<caret
line=
"2
09"
column=
"40"
lean-forward=
"false"
selection-start-line=
"209"
selection-start-column=
"40"
selection-end-line=
"209"
selection-end-column=
"4
0"
/>
<caret
line=
"2
16"
column=
"0"
lean-forward=
"true"
selection-start-line=
"216"
selection-start-column=
"0"
selection-end-line=
"216"
selection-end-column=
"
0"
/>
<folding>
<folding>
<element
signature=
"n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
...
@@ -160,14 +164,12 @@
...
@@ -160,14 +164,12 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"index.js"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"index.js"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"486"
>
<state
relative-caret-position=
"486"
>
<caret
line=
"385"
column=
"1"
lean-forward=
"true"
selection-start-line=
"385"
selection-start-column=
"1"
selection-end-line=
"385"
selection-end-column=
"1"
/>
<caret
line=
"385"
column=
"1"
lean-forward=
"true"
selection-start-line=
"385"
selection-start-column=
"1"
selection-end-line=
"385"
selection-end-column=
"1"
/>
<folding>
<folding
/>
<marker
date=
"1566839327000"
expanded=
"true"
signature=
"9861:11426"
ph=
"{...}"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -179,8 +181,8 @@
...
@@ -179,8 +181,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$/Public/static/css/main.scss"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
276
"
>
<state
relative-caret-position=
"
171
"
>
<caret
line=
"
319"
column=
"24"
lean-forward=
"true"
selection-start-line=
"319"
selection-start-column=
"24"
selection-end-line=
"319"
selection-end-column=
"24
"
/>
<caret
line=
"
428"
column=
"0"
lean-forward=
"true"
selection-start-line=
"428"
selection-start-column=
"0"
selection-end-line=
"428"
selection-end-column=
"0
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -211,8 +213,8 @@
...
@@ -211,8 +213,8 @@
<find>
btn-close
</find>
<find>
btn-close
</find>
<find>
page-lang
</find>
<find>
page-lang
</find>
<find>
btn-next-map
</find>
<find>
btn-next-map
</find>
<find>
btn-info
</find>
<find>
mix/
</find>
<find>
mix/
</find>
<find>
btn-info
</find>
</findStrings>
</findStrings>
<replaceStrings>
<replaceStrings>
<replace>
m-
</replace>
<replace>
m-
</replace>
...
@@ -231,9 +233,9 @@
...
@@ -231,9 +233,9 @@
<option
value=
"$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"
/>
<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$/Application/User/Controller/ReportController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
<option
value=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<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"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -587,12 +589,12 @@
...
@@ -587,12 +589,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1566667513502
</updated>
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"4
4877
000"
/>
<workItem
from=
"1566667516612"
duration=
"4
5253
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
4877
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
5253
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"2"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"6"
/>
<frame
x=
"2"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"6"
/>
...
@@ -764,10 +766,18 @@
...
@@ -764,10 +766,18 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"486"
>
<caret
line=
"385"
column=
"1"
lean-forward=
"true"
selection-start-line=
"385"
selection-start-column=
"1"
selection-end-line=
"385"
selection-end-column=
"1"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
>
<entry
file=
"file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
28
"
>
<state
relative-caret-position=
"2
47
"
>
<caret
line=
"2
09"
column=
"40"
lean-forward=
"false"
selection-start-line=
"209"
selection-start-column=
"40"
selection-end-line=
"209"
selection-end-column=
"4
0"
/>
<caret
line=
"2
16"
column=
"0"
lean-forward=
"true"
selection-start-line=
"216"
selection-start-column=
"0"
selection-end-line=
"216"
selection-end-column=
"
0"
/>
<folding>
<folding>
<element
signature=
"n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
<element
signature=
"n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
...
@@ -826,21 +836,11 @@
...
@@ -826,21 +836,11 @@
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
276
"
>
<state
relative-caret-position=
"
171
"
>
<caret
line=
"
319"
column=
"24"
lean-forward=
"true"
selection-start-line=
"319"
selection-start-column=
"24"
selection-end-line=
"319"
selection-end-column=
"24
"
/>
<caret
line=
"
428"
column=
"0"
lean-forward=
"true"
selection-start-line=
"428"
selection-start-column=
"0"
selection-end-line=
"428"
selection-end-column=
"0
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"486"
>
<caret
line=
"385"
column=
"1"
lean-forward=
"true"
selection-start-line=
"385"
selection-start-column=
"1"
selection-end-line=
"385"
selection-end-column=
"1"
/>
<folding>
<marker
date=
"1566839327000"
expanded=
"true"
signature=
"9861:11426"
ph=
"{...}"
/>
</folding>
</state>
</provider>
</entry>
</component>
</component>
</project>
</project>
\ No newline at end of file
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
View file @
5cc021f3
No preview for this file type
Application/Home/View/default/Index_index.tpl
View file @
5cc021f3
...
@@ -215,7 +215,7 @@
...
@@ -215,7 +215,7 @@
</div>
</div>
</div>
</div>
<div
class=
"page_checking"
style=
"display: none"
>
<div
class=
"
dialog
page_checking"
style=
"display: none"
>
<div
class=
"checking"
style=
"display: block;z-index: 99"
>
<div
class=
"checking"
style=
"display: block;z-index: 99"
>
<div
class=
"checkShow"
>
<div
class=
"checkShow"
>
<div></div>
<div></div>
...
...
Public/static/css/main.css
View file @
5cc021f3
...
@@ -469,6 +469,10 @@ ul, li {
...
@@ -469,6 +469,10 @@ ul, li {
height
:
782px
;
height
:
782px
;
}
}
.page_checking
{
width
:
100%
;
}
.checking
{
.checking
{
width
:
250px
;
width
:
250px
;
height
:
250px
;
height
:
250px
;
...
...
Public/static/css/main.scss
View file @
5cc021f3
...
@@ -425,7 +425,10 @@ ul, li {
...
@@ -425,7 +425,10 @@ ul, li {
height
:
782px
;
height
:
782px
;
}
}
.page_checking
{
width
:
100%
;
}
.checking
{
.checking
{
width
:
250px
;
width
:
250px
;
height
:
250px
;
height
:
250px
;
...
...
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