webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 d2608617532f21086c960046ae2179a7eb5f0d2f 1 个父辈 0f259c42

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 127 行增加 和 143 行删除
... ... @@ -3,8 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpxq_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpxq_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
</list>
... ... @@ -117,40 +116,40 @@
<session id="-2119211925">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="11" />
<entry key="project.open.time.1" value="7" />
<entry key="project.closed" value="12" />
<entry key="project.open.time.1" value="8" />
<entry key="project.open.time.26" value="1" />
<entry key="project.open.time.28" value="1" />
<entry key="project.open.time.3" value="2" />
<entry key="project.open.time.5" value="1" />
<entry key="project.opened" value="12" />
<entry key="project.opened" value="13" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="70" />
<entry key="html" value="123" />
<entry key="css" value="71" />
<entry key="html" value="125" />
<entry key="js" value="12" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="70" />
<entry key="HTML" value="123" />
<entry key="CSS" value="71" />
<entry key="HTML" value="125" />
<entry key="JavaScript" value="12" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4250" />
<entry key="html" value="10284" />
<entry key="css" value="4268" />
<entry key="html" value="10739" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4250" />
<entry key="HTML" value="10285" />
<entry key="CSS" value="4268" />
<entry key="HTML" value="10740" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -161,8 +160,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="616" column="12" selection-start-line="616" selection-start-column="12" selection-end-line="616" selection-end-column="12" />
<state relative-caret-position="61">
<caret line="637" column="32" lean-forward="true" selection-start-line="637" selection-start-column="32" selection-end-line="637" selection-end-column="32" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -187,40 +186,25 @@
<element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#16119#16170#0" />
<element signature="e#16197#16247#0" />
<element signature="e#16269#16319#0" />
<element signature="e#16343#16395#0" />
<element signature="e#16419#16469#0" />
<element signature="e#16493#16543#0" />
<element signature="e#16567#16619#0" />
<element signature="e#16643#16695#0" />
<element signature="e#16719#16770#0" />
<element signature="e#16871#16900#0" />
<element signature="e#16928#19333#0" />
<element signature="e#19383#19881#0" />
<element signature="e#19949#20059#0" />
<element signature="e#20095#20549#0" />
<element signature="e#20609#21391#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/index.css">
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="556" selection-start-line="556" selection-end-line="562" selection-end-column="1" />
<state relative-caret-position="522">
<caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/jm_3.html">
<entry file="file://$PROJECT_DIR$/html/lxwm_5.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="53" column="9" selection-start-line="53" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
<state relative-caret-position="198">
<caret line="520" column="16" lean-forward="true" selection-start-line="520" selection-start-column="16" selection-end-line="520" selection-end-column="16" />
</state>
</provider>
</entry>
... ... @@ -228,8 +212,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="245">
<caret line="173" column="26" lean-forward="true" selection-start-line="173" selection-start-column="26" selection-end-line="173" selection-end-column="26" />
<state relative-caret-position="359">
<caret line="192" column="30" lean-forward="true" selection-start-line="192" selection-start-column="30" selection-end-line="192" selection-end-column="30" />
<folding>
<element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -245,10 +229,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/cpxq_2.html">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="162" column="34" lean-forward="true" selection-start-line="162" selection-start-column="34" selection-end-line="162" selection-end-column="34" />
<state relative-caret-position="202">
<caret line="444" column="1" lean-forward="true" selection-start-line="444" selection-start-column="1" selection-end-line="444" selection-end-column="1" />
</state>
</provider>
</entry>
... ... @@ -256,7 +240,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="62">
<state relative-caret-position="10962">
<caret line="428" column="68" lean-forward="true" selection-start-line="428" selection-start-column="68" selection-end-line="428" selection-end-column="68" />
<folding>
<element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -324,8 +308,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>swiper-slider</find>
<find>swiper-slide mid_company_banner_mid swiper-slide-duplicate-next</find>
<find>swiper-wrapper</find>
<find>swiper-slide-active</find>
<find>pic4_banner</find>
... ... @@ -335,7 +317,6 @@
<find>data-id</find>
<find>mid_company_banner_mid</find>
<find>slide</find>
<find>mid_list</find>
<find>pic2_subtitle</find>
<find>房屋面积</find>
<find>分别</find>
... ... @@ -354,6 +335,9 @@
<find>2007</find>
<find>&lt;p</find>
<find>pic_item_box_top</find>
<find>btn_loca</find>
<find>mid_list</find>
<find>year</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -409,9 +393,9 @@
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/css/lxwm_5.css" />
<option value="$PROJECT_DIR$/css/fwcx_4.css" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/html/cpxq_2.html" />
<option value="$PROJECT_DIR$/html/fwcx_4.html" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/html/index.html" />
</list>
... ... @@ -423,18 +407,17 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="537" />
<option name="y" value="190" />
<option name="width" value="1348" />
<option name="height" value="1100" />
<component name="ProjectFrameBounds">
<option name="x" value="891" />
<option name="y" value="404" />
<option name="width" value="1324" />
<option name="height" value="976" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -471,6 +454,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -539,18 +523,19 @@
<workItem from="1548807911154" duration="1663000" />
<workItem from="1548894777879" duration="7107000" />
<workItem from="1548985599234" duration="16586000" />
<workItem from="1549074255207" duration="5627000" />
<workItem from="1549074255207" duration="6285000" />
<workItem from="1549845206263" duration="5082000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="329198000" />
<option name="totallyTimeSpent" value="334938000" />
</component>
<component name="ToolWindowManager">
<frame x="537" y="190" width="1348" height="1100" extended-state="0" />
<frame x="570" y="38" width="1324" height="976" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.17938931" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.18273717" />
<window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -562,7 +547,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.17305699" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.38882282" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -757,13 +742,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5265">
<caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/alxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
... ... @@ -813,13 +791,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lxwm_5.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="377">
<caret line="55" column="9" selection-start-line="55" selection-start-column="9" selection-end-line="55" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lxwm_6.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
... ... @@ -838,21 +809,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7749">
<caret line="385" column="47" selection-start-line="385" selection-start-column="47" selection-end-line="385" selection-end-column="47" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
... ... @@ -870,6 +826,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jm_3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1431">
<caret line="53" column="9" selection-start-line="53" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/cpxq_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4374">
<caret line="162" column="34" lean-forward="true" selection-start-line="162" selection-start-column="34" selection-end-line="162" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10962">
<caret line="428" column="68" lean-forward="true" selection-start-line="428" selection-start-column="68" selection-end-line="428" selection-end-column="68" />
<folding>
<element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#3;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9936">
... ... @@ -905,10 +889,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/lxwm_5.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="520" column="16" lean-forward="true" selection-start-line="520" selection-start-column="16" selection-end-line="520" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="245">
<caret line="173" column="26" lean-forward="true" selection-start-line="173" selection-start-column="26" selection-end-line="173" selection-end-column="26" />
<state relative-caret-position="359">
<caret line="192" column="30" lean-forward="true" selection-start-line="192" selection-start-column="30" selection-end-line="192" selection-end-column="30" />
<folding>
<element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -922,45 +920,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/cpxq_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="162" column="34" lean-forward="true" selection-start-line="162" selection-start-column="34" selection-end-line="162" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="62">
<caret line="428" column="68" lean-forward="true" selection-start-line="428" selection-start-column="68" selection-end-line="428" selection-end-column="68" />
<folding>
<element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#3;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="556" selection-start-line="556" selection-end-line="562" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jm_3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="53" column="9" selection-start-line="53" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
<state relative-caret-position="202">
<caret line="444" column="1" lean-forward="true" selection-start-line="444" selection-start-column="1" selection-end-line="444" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="616" column="12" selection-start-line="616" selection-start-column="12" selection-end-line="616" selection-end-column="12" />
<state relative-caret-position="61">
<caret line="637" column="32" lean-forward="true" selection-start-line="637" selection-start-column="32" selection-end-line="637" selection-end-column="32" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -985,21 +955,6 @@
<element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#16119#16170#0" />
<element signature="e#16197#16247#0" />
<element signature="e#16269#16319#0" />
<element signature="e#16343#16395#0" />
<element signature="e#16419#16469#0" />
<element signature="e#16493#16543#0" />
<element signature="e#16567#16619#0" />
<element signature="e#16643#16695#0" />
<element signature="e#16719#16770#0" />
<element signature="e#16871#16900#0" />
<element signature="e#16928#19333#0" />
<element signature="e#19383#19881#0" />
<element signature="e#19949#20059#0" />
<element signature="e#20095#20549#0" />
<element signature="e#20609#21391#0" />
</folding>
</state>
</provider>
... ...
... ... @@ -552,7 +552,8 @@
.pic_item_box_top{
width: 100%;
display: flex;
justify-content: space-between;
/*justify-content: space-between;*/
flex-wrap: wrap;
}
.pic_item_box_bottom{
width: 5.8rem;
... ...
... ... @@ -82,6 +82,27 @@
display: flex;
align-items: center;
}
.year{
}
.year:first-child{
margin-left: 0;
}
.time_2007{
margin-top: 0.5rem;
margin-left: 1.43rem;
}
.time_2008{
margin-left: 2.34rem;
}
.time_2012{
margin-top: 0.5rem;
margin-left: 2.4rem;
}
.time_2018{
margin-left: 2.3rem;
}
</style>
</head>
<body>
... ... @@ -186,14 +207,16 @@
<!--时间轴-->
<div class="pic_time_box">
<div class="pic_item_box_top">
<p class="year">1988</p>
<p class="year">2008</p>
<p class="year">2018</p>
</div>
<div class="pic_item_box_bottom">
<p class="year time_color">2007</p>
<p class="year">2012</p>
<p class="year time_color">1988</p>
<p class="year time_2008">2008</p>
<p class="year time_2018">2018</p>
<p class="year time_2007">2007</p>
<p class="year time_2012">2012</p>
</div>
<!--<div class="pic_item_box_bottom">-->
<!--<p class="year ">2007</p>-->
<!--<p class="year">2012</p>-->
<!--</div>-->
</div>
... ...
... ... @@ -183,6 +183,9 @@
</div>
<!--出现图片样式-->
<div class="show_pic" >
<div class="pic_size">
... ... @@ -191,6 +194,8 @@
</div>
</div>
</div>
<!--色彩搭配-->
... ...