Skip to content

php / bestpay

Go to a project
Commit 1d966dd5 by 张恒
Options

k

parent a00deeba
Showing with 15 additions and 15 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="d52db3c2-5e88-4692-bb71-d738c8d9556a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/index.js" afterPath="$PROJECT_DIR$/js/index.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -24,21 +24,21 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<file leaf-file-name="main.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="105" column="19" lean-forward="false" selection-start-line="105" selection-start-column="19" selection-end-line="105" selection-end-column="19" />
<state relative-caret-position="200">
<caret line="111" column="22" lean-forward="false" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="18" column="53" lean-forward="false" selection-start-line="18" selection-start-column="53" selection-end-line="18" selection-end-column="53" />
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
<folding />
</state>
</provider>
......@@ -57,8 +57,8 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/js/index.js" />
<option value="$PROJECT_DIR$/css/main.scss" />
<option value="$PROJECT_DIR$/js/index.js" />
</list>
</option>
</component>
......@@ -150,12 +150,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1513957319156</updated>
<workItem from="1513957320785" duration="540000" />
<workItem from="1513957320785" duration="669000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="540000" />
<option name="totallyTimeSpent" value="669000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="29" width="1440" height="821" extended-state="6" />
......@@ -190,18 +190,18 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<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="360">
<caret line="18" column="53" lean-forward="false" selection-start-line="18" selection-start-column="53" selection-end-line="18" selection-end-column="53" />
<state relative-caret-position="200">
<caret line="111" column="22" lean-forward="false" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="22" />
<folding />
</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="360">
<caret line="105" column="19" lean-forward="false" selection-start-line="105" selection-start-column="19" selection-end-line="105" selection-end-column="19" />
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
<folding />
</state>
</provider>
......
js/index.js
......@@ -16,7 +16,7 @@ $('.page-info').on('click',function () {
if (!/android/i.test(navigator.userAgent)) {
var t = window.screen.height;
if (t == '812') {
$('#bottom-info').css({"bottom": "19.2rem"})
$('.home').css({"height": "19.2rem"})
}
}
});
......
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