webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 db35798ae2cde235ce98f30ab8cf9f9667fb69fe 1 个父辈 34cccc2d

调整公司简介 padding-left

内嵌 并排对比
正在显示 2 个修改的文件 包含 69 行增加 和 69 行删除
... ... @@ -5,9 +5,7 @@
<change afterPath="$PROJECT_DIR$/video/Bugatti_1.mp4" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.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>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -118,8 +116,8 @@
<session id="-2119211925">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="53" />
<entry key="project.open.time.0" value="22" />
<entry key="project.closed" value="54" />
<entry key="project.open.time.0" value="23" />
<entry key="project.open.time.1" value="18" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.2" value="2" />
... ... @@ -133,7 +131,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="55" />
<entry key="project.opened" value="56" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -154,14 +152,14 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="5250" />
<entry key="css" value="5306" />
<entry key="html" value="16149" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="5251" />
<entry key="CSS" value="5307" />
<entry key="HTML" value="16149" />
<entry key="JavaScript" value="72" />
</counts>
... ... @@ -173,8 +171,8 @@
<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="254">
<caret line="181" column="30" lean-forward="true" selection-start-line="181" selection-start-column="30" selection-end-line="181" selection-end-column="30" />
<state relative-caret-position="146">
<caret line="177" column="46" lean-forward="true" selection-start-line="177" selection-start-column="46" selection-end-line="177" selection-end-column="46" />
<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" />
... ... @@ -223,7 +221,7 @@
<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="284">
<state relative-caret-position="3483">
<caret line="238" lean-forward="true" selection-start-line="238" selection-end-line="238" />
<folding>
<element signature="e#788#930#0" />
... ... @@ -253,17 +251,17 @@
<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="337">
<caret line="67" column="24" lean-forward="true" selection-start-line="67" selection-start-column="24" selection-end-line="67" selection-end-column="24" />
<state relative-caret-position="27">
<caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354">
<caret line="394" column="16" selection-start-line="394" selection-start-column="16" selection-end-line="394" selection-end-column="16" />
<state relative-caret-position="273">
<caret line="391" column="28" selection-start-line="391" selection-start-column="28" selection-end-line="391" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -273,11 +271,11 @@
<provider selected="true" editor-type-id="images" />
</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="256">
<caret line="133" column="19" lean-forward="true" selection-start-line="133" selection-start-column="19" selection-end-line="133" selection-end-column="19" />
<state relative-caret-position="162">
<caret line="135" column="21" lean-forward="true" selection-start-line="135" selection-start-column="21" selection-end-line="135" selection-end-column="21" />
</state>
</provider>
</entry>
... ... @@ -422,9 +420,9 @@
<option value="$PROJECT_DIR$/html/jpal.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
</list>
</option>
</component>
... ... @@ -435,8 +433,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="1004" />
<option name="y" value="68" />
<option name="x" value="559" />
<option name="y" value="127" />
<option name="width" value="1732" />
<option name="height" value="901" />
</component>
... ... @@ -445,7 +443,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -472,6 +469,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -583,15 +581,16 @@
<workItem from="1551407999780" duration="6498000" />
<workItem from="1551425235975" duration="2598000" />
<workItem from="1551488659119" duration="712000" />
<workItem from="1551492633198" duration="752000" />
<workItem from="1551492633198" duration="1076000" />
<workItem from="1551494692034" duration="3315000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="474128000" />
<option name="totallyTimeSpent" value="477767000" />
</component>
<component name="ToolWindowManager">
<frame x="1004" y="68" width="1732" height="901" extended-state="0" />
<frame x="749" y="132" width="1732" height="901" 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.13459268" />
... ... @@ -857,40 +856,9 @@
<entry file="file://$PROJECT_DIR$/images/aicon_08.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/aicon_101.png">
<provider selected="true" editor-type-id="images" />
</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="10152">
<caret line="376" lean-forward="true" selection-start-line="376" selection-end-line="376" />
</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/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<state relative-caret-position="3483">
<caret line="238" lean-forward="true" selection-start-line="238" selection-end-line="238" />
<folding>
<element signature="e#788#930#0" />
... ... @@ -916,24 +884,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<entry file="file://$PROJECT_DIR$/images/aicon_101.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/html/jpal.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="133" column="19" lean-forward="true" selection-start-line="133" selection-start-column="19" selection-end-line="133" selection-end-column="19" />
<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/sckj.html">
<entry file="file://$PROJECT_DIR$/html/jm_3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10152">
<caret line="376" lean-forward="true" selection-start-line="376" selection-end-line="376" />
</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="337">
<caret line="67" column="24" lean-forward="true" selection-start-line="67" selection-start-column="24" selection-end-line="67" selection-end-column="24" />
<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$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="391" column="28" selection-start-line="391" selection-start-column="28" selection-end-line="391" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="181" column="30" lean-forward="true" selection-start-line="181" selection-start-column="30" selection-end-line="181" selection-end-column="30" />
<state relative-caret-position="146">
<caret line="177" column="46" lean-forward="true" selection-start-line="177" selection-start-column="46" selection-end-line="177" selection-end-column="46" />
<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" />
... ... @@ -978,10 +970,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="354">
<caret line="394" column="16" selection-start-line="394" selection-start-column="16" selection-end-line="394" selection-end-column="16" />
<state relative-caret-position="162">
<caret line="135" column="21" lean-forward="true" selection-start-line="135" selection-start-column="21" selection-end-line="135" selection-end-column="21" />
</state>
</provider>
</entry>
... ...
... ... @@ -134,7 +134,8 @@
color: #ffffff;
line-height: 0.4rem;
overflow: scroll;
padding-left: 0.18rem ;
padding-left: 0.14rem ;
}
/*--------------- 人物介绍栏 ---------------*/
.mid_person{
... ...