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
2f77e773
authored
Aug 31, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
66841837
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
35 deletions
+34
-35
.idea/workspace.xml
+18
-18
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+0
-0
Public/static/css/main.css
+4
-8
Public/static/css/main.scss
+12
-9
No files found.
.idea/workspace.xml
View file @
2f77e773
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
<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$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
afterPath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
/>
<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$/.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.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"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/Public/static/css/main.scss"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
</list>
</list>
...
@@ -85,8 +84,8 @@
...
@@ -85,8 +84,8 @@
<file
leaf-file-name=
"Index_index.tpl"
pinned=
"false"
current-in-tab=
"true"
>
<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"
>
<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=
"
32
5"
>
<state
relative-caret-position=
"
13
5"
>
<caret
line=
"2
75"
column=
"36"
lean-forward=
"false"
selection-start-line=
"275"
selection-start-column=
"36"
selection-end-line=
"275"
selection-end-column=
"36
"
/>
<caret
line=
"2
00"
column=
"30"
lean-forward=
"true"
selection-start-line=
"200"
selection-start-column=
"30"
selection-end-line=
"200"
selection-end-column=
"38
"
/>
<folding>
<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"
/>
<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>
</folding>
...
@@ -123,8 +122,8 @@
...
@@ -123,8 +122,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=
"
-95
"
>
<state
relative-caret-position=
"
209
"
>
<caret
line=
"
240"
column=
"9"
lean-forward=
"false"
selection-start-line=
"240"
selection-start-column=
"9"
selection-end-line=
"240"
selection-end-column=
"9
"
/>
<caret
line=
"
355"
column=
"15"
lean-forward=
"true"
selection-start-line=
"355"
selection-start-column=
"15"
selection-end-line=
"355"
selection-end-column=
"15
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -185,8 +184,8 @@
...
@@ -185,8 +184,8 @@
<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$/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"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -547,12 +546,12 @@
...
@@ -547,12 +546,12 @@
<updated>
1566667513502
</updated>
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"55749000"
/>
<workItem
from=
"1566667516612"
duration=
"55749000"
/>
<workItem
from=
"1567098016695"
duration=
"6433000"
/>
<workItem
from=
"1567098016695"
duration=
"6433000"
/>
<workItem
from=
"1567181764126"
duration=
"3
062
000"
/>
<workItem
from=
"1567181764126"
duration=
"3
164
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"65
244
000"
/>
<option
name=
"totallyTimeSpent"
value=
"65
346
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"0"
y=
"23"
width=
"1440"
height=
"815"
extended-state=
"6"
/>
<frame
x=
"0"
y=
"23"
width=
"1440"
height=
"815"
extended-state=
"6"
/>
...
@@ -927,23 +926,23 @@
...
@@ -927,23 +926,23 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-95"
>
<caret
line=
"240"
column=
"9"
lean-forward=
"false"
selection-start-line=
"240"
selection-start-column=
"9"
selection-end-line=
"240"
selection-end-column=
"9"
/>
<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=
"
32
5"
>
<state
relative-caret-position=
"
13
5"
>
<caret
line=
"2
75"
column=
"36"
lean-forward=
"false"
selection-start-line=
"275"
selection-start-column=
"36"
selection-end-line=
"275"
selection-end-column=
"36
"
/>
<caret
line=
"2
00"
column=
"30"
lean-forward=
"true"
selection-start-line=
"200"
selection-start-column=
"30"
selection-end-line=
"200"
selection-end-column=
"38
"
/>
<folding>
<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"
/>
<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>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"209"
>
<caret
line=
"355"
column=
"15"
lean-forward=
"true"
selection-start-line=
"355"
selection-start-column=
"15"
selection-end-line=
"355"
selection-end-column=
"15"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</component>
</project>
</project>
\ No newline at end of file
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
View file @
2f77e773
No preview for this file type
Public/static/css/main.css
View file @
2f77e773
...
@@ -251,7 +251,10 @@ ul, li {
...
@@ -251,7 +251,10 @@ ul, li {
.page-m-b
{
.page-m-b
{
width
:
640px
;
width
:
640px
;
height
:
1238px
;
height
:
1111px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
}
}
.page-m-b
.side-1
,
.page-m-b
.side-2
,
.page-m-b
.side-3
,
.page-m-b
.side-4
{
.page-m-b
.side-1
,
.page-m-b
.side-2
,
.page-m-b
.side-3
,
.page-m-b
.side-4
{
width
:
515px
;
width
:
515px
;
...
@@ -411,13 +414,6 @@ ul, li {
...
@@ -411,13 +414,6 @@ ul, li {
width
:
640px
;
width
:
640px
;
height
:
1111px
;
height
:
1111px
;
}
}
.page-s-c
.b-j-two
{
position
:
relative
;
display
:
block
;
width
:
100%
;
height
:
1091px
;
background
:
url("../images/bj-two.jpg")
no-repeat
center
;
}
.page-s-c
.h-b
{
.page-s-c
.h-b
{
position
:
absolute
;
position
:
absolute
;
top
:
108px
;
top
:
108px
;
...
...
Public/static/css/main.scss
View file @
2f77e773
...
@@ -240,7 +240,10 @@ ul, li {
...
@@ -240,7 +240,10 @@ ul, li {
.page-m-b
{
.page-m-b
{
width
:
640px
;
width
:
640px
;
height
:
1238px
;
height
:
1111px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
.side-1
,
.side-2
,
.side-3
,
.side-4
{
.side-1
,
.side-2
,
.side-3
,
.side-4
{
width
:
515px
;
width
:
515px
;
height
:
671px
;
height
:
671px
;
...
@@ -357,20 +360,20 @@ ul, li {
...
@@ -357,20 +360,20 @@ ul, li {
}
}
}
}
.b-j-two
{
position
:
relative
;
display
:
block
;
width
:
100%
;
height
:
1091px
;
background
:
url("../images/bj-two.jpg")
no-repeat
center
;
}
.page-s-c
{
.page-s-c
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
width
:
640px
;
width
:
640px
;
height
:
1111px
;
height
:
1111px
;
.b-j-two
{
position
:
relative
;
display
:
block
;
width
:
100%
;
height
:
1091px
;
background
:
url("../images/bj-two.jpg")
no-repeat
center
;
}
.h-b
{
.h-b
{
position
:
absolute
;
position
:
absolute
;
top
:
108px
;
top
:
108px
;
...
...
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