Skip to content

php / bestpay

Go to a project
Commit 28d7f241 by 张恒
Options

k

parent 831c8e51
Showing with 22 additions and 17 deletions
.idea/workspace.xml
......@@ -2,9 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d52db3c2-5e88-4692-bb71-d738c8d9556a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/index.js" afterPath="$PROJECT_DIR$/js/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.css" afterPath="$PROJECT_DIR$/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -25,21 +26,21 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="main.scss" pinned="false" current-in-tab="false">
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220">
<caret line="111" column="22" lean-forward="false" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="22" />
<state relative-caret-position="220">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="26" column="15" lean-forward="false" selection-start-line="26" selection-start-column="15" selection-end-line="26" selection-end-column="15" />
<state relative-caret-position="581">
<caret line="32" column="1" lean-forward="true" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
<folding />
</state>
</provider>
......@@ -68,9 +69,9 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/css/main.scss" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/index.js" />
<option value="$PROJECT_DIR$/css/main.scss" />
</list>
</option>
</component>
......@@ -162,12 +163,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1513957319156</updated>
<workItem from="1513957320785" duration="803000" />
<workItem from="1513957320785" duration="1075000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="803000" />
<option name="totallyTimeSpent" value="1075000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="29" width="1440" height="821" extended-state="6" />
......@@ -210,18 +211,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/main.scss">
<entry file="file://$PROJECT_DIR$/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220">
<caret line="111" column="22" lean-forward="false" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="22" />
<state relative-caret-position="581">
<caret line="32" column="1" lean-forward="true" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/index.js">
<entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="26" column="15" lean-forward="false" selection-start-line="26" selection-start-column="15" selection-end-line="26" selection-end-column="15" />
<state relative-caret-position="220">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
......
css/main.css
......@@ -6,6 +6,8 @@
html, body {
width: 100%;
margin: 0;
background: url("../image/home-bj.jpg") no-repeat center;
background-size: 100% 100%;
font-family: helvetica;
background: white;
height: 100%;
......
css/main.scss
......@@ -14,6 +14,8 @@
html, body {
width: 100%;
margin: 0;
background: url("../image/home-bj.jpg") no-repeat center;
background-size: 100% 100%;
font-family: helvetica;
background: white;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment