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
94b6f444
authored
Aug 31, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
50a1d8f6
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
23 deletions
+32
-23
.idea/workspace.xml
+21
-17
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+0
-0
Application/Home/View/default/Index_index.tpl
+3
-1
Public/static/css/main.css
+4
-2
Public/static/css/main.scss
+4
-3
No files found.
.idea/workspace.xml
View file @
94b6f444
...
...
@@ -2,8 +2,11 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<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>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -82,8 +85,8 @@
<file
leaf-file-name=
"Index_index.tpl"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1
35
"
>
<caret
line=
"
271"
column=
"25"
lean-forward=
"false"
selection-start-line=
"271"
selection-start-column=
"25"
selection-end-line=
"271"
selection-end-column=
"25
"
/>
<state
relative-caret-position=
"1
54
"
>
<caret
line=
"
160"
column=
"30"
lean-forward=
"true"
selection-start-line=
"160"
selection-start-column=
"30"
selection-end-line=
"160"
selection-end-column=
"38
"
/>
<folding>
<element
signature=
"n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
</folding>
...
...
@@ -120,8 +123,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=
"
152
"
>
<caret
line=
"2
52"
column=
"3"
lean-forward=
"true"
selection-start-line=
"252"
selection-start-column=
"3"
selection-end-line=
"252"
selection-end-column=
"3
"
/>
<state
relative-caret-position=
"
285
"
>
<caret
line=
"2
78"
column=
"8"
lean-forward=
"false"
selection-start-line=
"278"
selection-start-column=
"8"
selection-end-line=
"278"
selection-end-column=
"8
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -182,8 +185,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>
...
...
@@ -544,12 +547,12 @@
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"55749000"
/>
<workItem
from=
"1567098016695"
duration=
"6433000"
/>
<workItem
from=
"1567181764126"
duration=
"3
455
000"
/>
<workItem
from=
"1567181764126"
duration=
"3
632
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"65
637
000"
/>
<option
name=
"totallyTimeSpent"
value=
"65
814
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"0"
y=
"23"
width=
"1440"
height=
"815"
extended-state=
"6"
/>
...
...
@@ -924,23 +927,23 @@
</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=
"152"
>
<caret
line=
"252"
column=
"3"
lean-forward=
"true"
selection-start-line=
"252"
selection-start-column=
"3"
selection-end-line=
"252"
selection-end-column=
"3"
/>
<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=
"1
35
"
>
<caret
line=
"
271"
column=
"25"
lean-forward=
"false"
selection-start-line=
"271"
selection-start-column=
"25"
selection-end-line=
"271"
selection-end-column=
"25
"
/>
<state
relative-caret-position=
"1
54
"
>
<caret
line=
"
160"
column=
"30"
lean-forward=
"true"
selection-start-line=
"160"
selection-start-column=
"30"
selection-end-line=
"160"
selection-end-column=
"38
"
/>
<folding>
<element
signature=
"n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"true"
/>
</folding>
</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=
"285"
>
<caret
line=
"278"
column=
"8"
lean-forward=
"false"
selection-start-line=
"278"
selection-start-column=
"8"
selection-end-line=
"278"
selection-end-column=
"8"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
View file @
94b6f444
No preview for this file type
Application/Home/View/default/Index_index.tpl
View file @
94b6f444
...
...
@@ -158,7 +158,8 @@
<div
class=
"word"
></div>
</div>
</div>
<div
class=
"page-x-z"
style=
"display: none"
>
<div
class=
"page-sate page-x-z"
style=
"display: none"
>
<div
class=
"b-j-two"
>
<div
class=
"zhou m-b-zhou-sate"
></div>
<div
class=
"c-d m-b-sate"
></div>
<div
class=
"b-j"
id=
"b-j"
>
...
...
@@ -198,6 +199,7 @@
<div
class=
"btn-f-h btn-sate"
></div>
</div>
</div>
</div>
<div
class=
"page-sate page-s-c"
style=
"display: none"
>
<div
class=
"b-j-two"
>
<div
class=
"zhou m-b-zhou-sate"
></div>
...
...
Public/static/css/main.css
View file @
94b6f444
...
...
@@ -309,9 +309,11 @@ ul, li {
}
.page-x-z
{
background
:
url("../images/m-b-bj-1.jpg")
no-repeat
center
;
width
:
640px
;
height
:
1238px
;
height
:
1111px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
}
.page-x-z
.b-t
{
display
:
flex
;
...
...
Public/static/css/main.scss
View file @
94b6f444
...
...
@@ -271,11 +271,12 @@ ul, li {
}
.page-x-z
{
background
:
url("../images/m-b-bj-1.jpg")
no-repeat
center
;
width
:
640px
;
height
:
1238px
;
height
:
1111px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
.b-t
{
display
:
flex
;
/* justify-content: center; */
flex-wrap
:
wrap-reverse
;
...
...
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