Skip to content

php / bestpay

Go to a project
Commit 91af82ac by 张恒
Options

k

parent 7e4d27e3
Showing with 7 additions and 10 deletions
.idea/workspace.xml
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d52db3c2-5e88-4692-bb71-d738c8d9556a" name="Default" comment=""> <list default="true" id="d52db3c2-5e88-4692-bb71-d738c8d9556a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/bestpay.iml" afterPath="$PROJECT_DIR$/.idea/bestpay.iml" />
<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$/css/main.css" afterPath="$PROJECT_DIR$/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -29,8 +27,8 @@ ...@@ -29,8 +27,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$/css/main.scss"> <entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235"> <state relative-caret-position="300">
<caret line="115" column="25" lean-forward="true" selection-start-line="115" selection-start-column="25" selection-end-line="115" selection-end-column="25" /> <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -122,12 +120,12 @@ ...@@ -122,12 +120,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1513957319156</updated> <updated>1513957319156</updated>
<workItem from="1513957320785" duration="241000" /> <workItem from="1513957320785" duration="354000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="241000" /> <option name="totallyTimeSpent" value="354000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="29" width="1440" height="821" extended-state="6" /> <frame x="0" y="29" width="1440" height="821" extended-state="6" />
...@@ -164,8 +162,8 @@ ...@@ -164,8 +162,8 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/css/main.scss"> <entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235"> <state relative-caret-position="300">
<caret line="115" column="25" lean-forward="true" selection-start-line="115" selection-start-column="25" selection-end-line="115" selection-end-column="25" /> <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
css/main.css
...@@ -8,7 +8,6 @@ html, body { ...@@ -8,7 +8,6 @@ html, body {
margin: 0; margin: 0;
font-family: helvetica; font-family: helvetica;
background: white; background: white;
overflow: hidden;
height: 100%; height: 100%;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
......
css/main.scss
...@@ -17,7 +17,7 @@ html, body { ...@@ -17,7 +17,7 @@ html, body {
font-family: helvetica; font-family: helvetica;
background: white; background: white;
overflow: hidden; //overflow: hidden;
height: 100%; height: 100%;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
......
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