webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 9af57798646563be525f3a4b55fe0225ad5cd60d 1 个父辈 b8348d2a

更新 gsjj.css 布局

内嵌 并排对比
正在显示 2 个修改的文件 包含 151 行增加 和 91 行删除
... ... @@ -3,7 +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/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -114,11 +114,11 @@
<session id="-2119211925">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="48" />
<entry key="project.closed" value="49" />
<entry key="project.open.time.0" value="19" />
<entry key="project.open.time.1" value="17" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.21" value="1" />
<entry key="project.open.time.25" value="1" />
<entry key="project.open.time.26" value="1" />
... ... @@ -129,7 +129,7 @@
<entry key="project.open.time.43" value="1" />
<entry key="project.open.time.5" value="1" />
<entry key="project.open.time.50" value="1" />
<entry key="project.opened" value="50" />
<entry key="project.opened" value="51" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -148,14 +148,14 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="5207" />
<entry key="css" value="5227" />
<entry key="html" value="16078" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="5208" />
<entry key="CSS" value="5228" />
<entry key="HTML" value="16078" />
<entry key="JavaScript" value="72" />
</counts>
... ... @@ -167,12 +167,15 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="562" lean-forward="true" selection-start-line="562" selection-end-line="562" />
<state relative-caret-position="538">
<caret line="484" column="10" lean-forward="true" selection-start-line="484" selection-start-column="10" selection-end-line="484" selection-end-column="10" />
<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#0;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#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#p#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -206,15 +209,14 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="169">
<caret line="673" column="8" selection-start-line="673" selection-start-column="8" selection-end-line="673" selection-end-column="8" />
<state relative-caret-position="662">
<caret line="447" selection-start-line="447" selection-end-line="447" />
<folding>
<element signature="e#21597#21939#0" />
<element signature="e#22012#22736#0" />
<element signature="e#23851#29626#0" />
</folding>
</state>
</provider>
... ... @@ -232,21 +234,46 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10530">
<caret line="414" column="42" selection-start-line="414" selection-start-column="42" selection-end-line="414" selection-end-column="42" />
<state relative-caret-position="226">
<caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" />
<folding>
<element signature="e#788#930#0" />
<element signature="e#949#1170#0" />
<element signature="e#1201#1245#0" />
<element signature="e#1275#1312#0" />
<element signature="e#1331#1408#0" />
<element signature="e#1428#1467#0" />
<element signature="e#1488#1563#0" />
<element signature="e#1584#1692#0" />
<element signature="e#1735#1797#0" />
<element signature="e#1820#2467#0" />
<element signature="e#2645#2711#0" />
<element signature="e#2735#2806#0" />
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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#0;n#div#2;n#div#5;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="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" />
<element signature="e#19062#19112#0" />
<element signature="e#19150#19704#0" />
<element signature="e#19754#20251#0" />
<element signature="e#20308#20405#0" />
<element signature="e#20471#20511#0" />
<element signature="e#23180#23233#0" />
<element signature="e#25472#26248#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12528">
<caret line="464" column="16" selection-start-line="464" selection-start-column="16" selection-end-line="464" selection-end-column="16" />
<state relative-caret-position="-316">
<caret line="137" column="1" lean-forward="true" selection-start-line="137" selection-start-column="1" selection-end-line="137" selection-end-column="1" />
</state>
</provider>
</entry>
... ... @@ -255,7 +282,7 @@
<entry file="file://$PROJECT_DIR$/css/jpal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4752">
<caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
<caret line="176" selection-start-line="176" selection-end-line="176" />
</state>
</provider>
</entry>
... ... @@ -291,7 +318,7 @@
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="85" column="25" lean-forward="true" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
<caret line="85" column="25" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
</state>
</provider>
</entry>
... ... @@ -331,13 +358,13 @@
<find>c-h</find>
<find>ul</find>
<find>map</find>
<find>swiper</find>
<find>banner_text</find>
<find>mid_box_text</find>
<find>_text</find>
<find>video</find>
<find>xxx</find>
<find>可耐美</find>
<find>swiper</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -398,11 +425,11 @@
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/qqrz.css" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/css/jpal.css" />
<option value="$PROJECT_DIR$/html/jpal.html" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
</list>
</option>
</component>
... ... @@ -413,8 +440,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="545" />
<option name="y" value="105" />
<option name="x" value="886" />
<option name="y" value="69" />
<option name="width" value="1366" />
<option name="height" value="948" />
</component>
... ... @@ -423,7 +450,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -434,6 +460,11 @@
<path>
<item name="clime" type="b2602c69:ProjectViewProjectNode" />
<item name="clime" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="clime" type="b2602c69:ProjectViewProjectNode" />
<item name="clime" type="462c0819:PsiDirectoryNode" />
<item name="html" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -445,6 +476,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -551,18 +583,19 @@
<workItem from="1551141036190" duration="211000" />
<workItem from="1551171749336" duration="41000" />
<workItem from="1551251711773" duration="81000" />
<workItem from="1551320989198" duration="124000" />
<workItem from="1551320989198" duration="642000" />
<workItem from="1551404039587" duration="2682000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="459969000" />
<option name="totallyTimeSpent" value="463169000" />
</component>
<component name="ToolWindowManager">
<frame x="545" y="105" width="1366" height="948" extended-state="0" />
<frame x="886" y="69" width="1366" height="948" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.17168675" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.17168675" />
<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" />
... ... @@ -574,7 +607,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 active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.05904059" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.34932348" />
<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" />
... ... @@ -833,14 +866,70 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15012">
<caret line="556" column="23" selection-start-line="556" selection-start-column="23" selection-end-line="556" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/jpal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4752">
<caret line="176" selection-start-line="176" selection-end-line="176" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jpal.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3402">
<caret line="126" column="50" selection-start-line="126" selection-start-column="50" selection-end-line="126" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jm_3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9882">
<caret line="366" selection-start-line="366" selection-end-line="366" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4_1result.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5022">
<caret line="186" column="43" selection-start-line="186" selection-start-column="43" selection-end-line="186" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="85" column="25" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="662">
<caret line="447" selection-start-line="447" selection-end-line="447" />
<folding>
<element signature="e#21597#21939#0" />
<element signature="e#22012#22736#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="562" lean-forward="true" selection-start-line="562" selection-end-line="562" />
<state relative-caret-position="538">
<caret line="484" column="10" lean-forward="true" selection-start-line="484" selection-start-column="10" selection-end-line="484" selection-end-column="10" />
<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#0;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#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#p#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -873,75 +962,46 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15012">
<caret line="556" column="23" selection-start-line="556" selection-start-column="23" selection-end-line="556" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10530">
<caret line="414" column="42" selection-start-line="414" selection-start-column="42" selection-end-line="414" selection-end-column="42" />
<state relative-caret-position="226">
<caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" />
<folding>
<element signature="e#788#930#0" />
<element signature="e#949#1170#0" />
<element signature="e#1201#1245#0" />
<element signature="e#1275#1312#0" />
<element signature="e#1331#1408#0" />
<element signature="e#1428#1467#0" />
<element signature="e#1488#1563#0" />
<element signature="e#1584#1692#0" />
<element signature="e#1735#1797#0" />
<element signature="e#1820#2467#0" />
<element signature="e#2645#2711#0" />
<element signature="e#2735#2806#0" />
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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#0;n#div#2;n#div#5;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="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" />
<element signature="e#19062#19112#0" />
<element signature="e#19150#19704#0" />
<element signature="e#19754#20251#0" />
<element signature="e#20308#20405#0" />
<element signature="e#20471#20511#0" />
<element signature="e#23180#23233#0" />
<element signature="e#25472#26248#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12528">
<caret line="464" column="16" selection-start-line="464" selection-start-column="16" selection-end-line="464" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/jpal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4752">
<caret line="176" lean-forward="true" selection-start-line="176" selection-end-line="176" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jpal.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3402">
<caret line="126" column="50" selection-start-line="126" selection-start-column="50" selection-end-line="126" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jm_3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9882">
<caret line="366" selection-start-line="366" selection-end-line="366" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4_1result.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5022">
<caret line="186" column="43" selection-start-line="186" selection-start-column="43" selection-end-line="186" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="85" column="25" lean-forward="true" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="673" column="8" selection-start-line="673" selection-start-column="8" selection-end-line="673" selection-end-column="8" />
<folding>
<element signature="e#21597#21939#0" />
<element signature="e#22012#22736#0" />
<element signature="e#23851#29626#0" />
</folding>
<state relative-caret-position="-316">
<caret line="137" column="1" lean-forward="true" selection-start-line="137" selection-start-column="1" selection-end-line="137" selection-end-column="1" />
</state>
</provider>
</entry>
... ...
... ... @@ -130,11 +130,11 @@
.top_intro_content{
width: 6rem;
height: 2.26rem;
font-size: 0.26rem;
color: #ffffff;
line-height: 0.4rem;
overflow: scroll;
padding-left: 0.04rem ;
}
/*--------------- 人物介绍栏 ---------------*/
.mid_person{
... ...