Commit 94362d7c by zhangheng

1

parent 509295e9
......@@ -2,10 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<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$/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$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -19,14 +17,14 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.35561746">
<splitter split-orientation="horizontal" split-proportion="0.61002785">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3667">
<caret line="193" column="26" lean-forward="false" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="26" />
<state relative-caret-position="220">
<caret line="162" column="40" lean-forward="true" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="40" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -84,8 +82,8 @@
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1368">
<caret line="202" column="23" lean-forward="true" selection-start-line="202" selection-start-column="23" selection-end-line="202" selection-end-column="31" />
<state relative-caret-position="228">
<caret line="205" column="0" lean-forward="false" selection-start-line="205" selection-start-column="0" selection-end-line="205" selection-end-column="0" />
<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" />
</folding>
......@@ -122,8 +120,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="171">
<caret line="148" column="17" lean-forward="false" selection-start-line="148" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
<state relative-caret-position="285">
<caret line="367" column="10" lean-forward="false" selection-start-line="367" selection-start-column="3" selection-end-line="367" selection-end-column="10" />
<folding />
</state>
</provider>
......@@ -164,6 +162,7 @@
<find>map-12</find>
<find>image_bounds_by_pos</find>
<find>page-s-</find>
<find>b-j-two</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -183,8 +182,8 @@
<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$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -545,12 +544,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="1693000" />
<workItem from="1567181764126" duration="1823000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63875000" />
<option name="totallyTimeSpent" value="64005000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -814,6 +813,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75392">
<caret line="11" column="154066" lean-forward="false" selection-start-line="11" selection-start-column="154066" selection-end-line="11" selection-end-column="154066" />
<folding />
</state>
</provider>
</entry>
......@@ -845,13 +845,32 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="112" column="14" lean-forward="false" selection-start-line="112" selection-start-column="14" selection-end-line="112" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="391" column="47" lean-forward="true" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding>
<marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3667">
<caret line="193" column="26" lean-forward="false" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="26" />
<state relative-caret-position="220">
<caret line="162" column="40" lean-forward="true" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="40" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -905,41 +924,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="112" column="14" lean-forward="false" selection-start-line="112" selection-start-column="14" selection-end-line="112" selection-end-column="14" />
<state relative-caret-position="285">
<caret line="367" column="10" lean-forward="false" selection-start-line="367" selection-start-column="3" selection-end-line="367" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="391" column="47" lean-forward="true" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding>
<marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1368">
<caret line="202" column="23" lean-forward="true" selection-start-line="202" selection-start-column="23" selection-end-line="202" selection-end-column="31" />
<state relative-caret-position="228">
<caret line="205" column="0" lean-forward="false" selection-start-line="205" selection-start-column="0" selection-end-line="205" selection-end-column="0" />
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="148" column="17" lean-forward="false" selection-start-line="148" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -203,7 +203,6 @@
<div class="b-j-two">
</div>
<img class="b-j-two" src="__CDN__/images/bj-two.jpg">
<img class="h-b" src="">
<img class="btn-s" src="__CDN__/images/f-h.png">
<div class="btn">
......
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