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
95000b04
authored
Aug 30, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
y
parent
4e7fc29e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
28 deletions
+14
-28
.idea/workspace.xml
+6
-7
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+0
-0
Public/static/css/main.css
+4
-8
Public/static/css/main.scss
+4
-13
No files found.
.idea/workspace.xml
View file @
95000b04
...
...
@@ -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>
...
...
@@ -181,8 +180,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=
"
399
"
>
<caret
line=
"2
50"
column=
"16"
lean-forward=
"false"
selection-start-line=
"250"
selection-start-column=
"16"
selection-end-line=
"250"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"
266
"
>
<caret
line=
"2
43"
column=
"13"
lean-forward=
"false"
selection-start-line=
"243"
selection-start-column=
"13"
selection-end-line=
"243"
selection-end-column=
"13
"
/>
<folding
/>
</state>
</provider>
...
...
@@ -592,12 +591,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"5
377
0000"
/>
<workItem
from=
"1566667516612"
duration=
"5
406
0000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"5
377
0000"
/>
<option
name=
"totallyTimeSpent"
value=
"5
406
0000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"31"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"0"
/>
...
...
@@ -839,8 +838,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/css/main.scss"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
399
"
>
<caret
line=
"2
50"
column=
"16"
lean-forward=
"false"
selection-start-line=
"250"
selection-start-column=
"16"
selection-end-line=
"250"
selection-end-column=
"16
"
/>
<state
relative-caret-position=
"
266
"
>
<caret
line=
"2
43"
column=
"13"
lean-forward=
"false"
selection-start-line=
"243"
selection-start-column=
"13"
selection-end-line=
"243"
selection-end-column=
"13
"
/>
<folding
/>
</state>
</provider>
...
...
.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
View file @
95000b04
No preview for this file type
Public/static/css/main.css
View file @
95000b04
...
...
@@ -250,15 +250,11 @@ ul, li {
}
.page-m-b
{
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
background
:
url("../images/m-b-bj-1.jpg")
no-repeat
center
;
width
:
640px
;
}
.page-m-b
.ceshi
{
background
:
url("../images/ceshi.jpg")
top
center
no-repeat
;
width
:
600px
;
height
:
1039px
;
height
:
1238px
;
position
:
absolute
;
top
:
-57px
;
}
.page-m-b
.side-1
,
.page-m-b
.side-2
,
.page-m-b
.side-3
,
.page-m-b
.side-4
{
width
:
515px
;
...
...
Public/static/css/main.scss
View file @
95000b04
...
...
@@ -237,20 +237,11 @@ ul, li {
}
}
.page-m-b
{
//background: url("../images/m-b-bj-1.jpg") no-repeat center;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
background
:
url("../images/m-b-bj-1.jpg")
no-repeat
center
;
width
:
640px
;
.ceshi
{
background
:url
(
"../images/ceshi.jpg"
)
top
center
no-repeat
;
width
:
600px
;
height
:
1039px
;
}
//height: 1238px;
//position: relative;
//top: -57px;
height
:
1238px
;
position
:
absolute
;
top
:
-57px
;
.side-1
,
.side-2
,
.side-3
,
.side-4
{
width
:
515px
;
height
:
671px
;
...
...
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