webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 443f332b7c13cd81d12840d0e84b6c4ee3604fb0 1 个父辈 907f07cb

修改公司简介的视频窗口化显示

内嵌 并排对比
正在显示 2 个修改的文件 包含 134 行增加 和 89 行删除
... ... @@ -2,11 +2,9 @@
<project version="4">
<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$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" 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/" />
... ... @@ -131,28 +129,28 @@
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="108" />
<entry key="html" value="188" />
<entry key="html" value="189" />
<entry key="js" value="15" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="108" />
<entry key="HTML" value="188" />
<entry key="HTML" value="189" />
<entry key="JavaScript" value="15" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4877" />
<entry key="html" value="14901" />
<entry key="html" value="15035" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4878" />
<entry key="HTML" value="14901" />
<entry key="HTML" value="15035" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -161,10 +159,57 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="203">
<caret line="622" column="10" lean-forward="true" selection-start-line="622" selection-start-column="10" selection-end-line="622" selection-end-column="10" />
<folding>
<element signature="n#style#0;n#head#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#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#2;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" />
<element signature="n#style#0;n#p#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#4;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#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#2;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#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#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#6;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#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="n#div#0;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#18462#18491#0" />
<element signature="e#18519#20924#0" />
<element signature="e#20974#21472#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="496" column="34" selection-start-line="496" selection-start-column="24" selection-end-line="496" selection-end-column="34" />
<state relative-caret-position="497">
<caret line="631" column="10" selection-start-line="631" selection-start-column="10" selection-end-line="631" selection-end-column="10" />
</state>
</provider>
</entry>
... ... @@ -178,7 +223,7 @@
</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="108">
... ... @@ -320,11 +365,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="221" column="21" lean-forward="true" selection-start-line="221" selection-start-column="21" selection-end-line="221" selection-end-column="21" />
<state relative-caret-position="267">
<caret line="322" column="47" selection-start-line="322" selection-start-column="47" selection-end-line="322" selection-end-column="47" />
<folding>
<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" />
</folding>
... ... @@ -423,7 +468,6 @@
<option value="$PROJECT_DIR$/html/lxwm_6.html" />
<option value="$PROJECT_DIR$/html/search_2.html" />
<option value="$PROJECT_DIR$/html/search_no_2.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/jm_3.html" />
<option value="$PROJECT_DIR$/html/fwcx_4.html" />
<option value="$PROJECT_DIR$/css/cpzx_2.css" />
... ... @@ -439,6 +483,7 @@
<option value="$PROJECT_DIR$/html/sckj_2.html" />
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
</list>
</option>
</component>
... ... @@ -449,10 +494,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="944" />
<option name="y" value="211" />
<option name="width" value="1494" />
<option name="height" value="864" />
<option name="x" value="354" />
<option name="y" value="175" />
<option name="width" value="1580" />
<option name="height" value="1092" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -567,18 +612,18 @@
<workItem from="1550017968081" duration="18243000" />
<workItem from="1550040998069" duration="2667000" />
<workItem from="1550104390752" duration="3399000" />
<workItem from="1550120762200" duration="8698000" />
<workItem from="1550120762200" duration="9889000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="402262000" />
<option name="totallyTimeSpent" value="403453000" />
</component>
<component name="ToolWindowManager">
<frame x="861" y="236" width="1494" height="864" extended-state="0" />
<frame x="354" y="175" width="1580" height="1092" 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.15796703" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.14915694" />
<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" />
... ... @@ -590,7 +635,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.13305898" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.26436782" />
<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" />
... ... @@ -887,52 +932,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="611" lean-forward="true" selection-start-line="611" selection-end-line="611" />
<folding>
<element signature="n#style#0;n#head#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#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#2;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" />
<element signature="n#style#0;n#p#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#4;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#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#2;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#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#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#6;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#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="n#div#0;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#18462#18491#0" />
<element signature="e#18519#20924#0" />
<element signature="e#20974#21472#0" />
<element signature="e#21684#22138#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/search_no_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
... ... @@ -975,16 +974,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="221" column="21" lean-forward="true" selection-start-line="221" selection-start-column="21" selection-end-line="221" selection-end-column="21" />
<folding>
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/page.js">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -996,13 +985,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="496" column="34" selection-start-line="496" selection-start-column="24" selection-end-line="496" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/cpzx_2.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
... ... @@ -1205,5 +1187,67 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="497">
<caret line="631" column="10" selection-start-line="631" selection-start-column="10" selection-end-line="631" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="622" column="10" lean-forward="true" selection-start-line="622" selection-start-column="10" selection-end-line="622" selection-end-column="10" />
<folding>
<element signature="n#style#0;n#head#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#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#2;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" />
<element signature="n#style#0;n#p#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#4;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#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#2;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#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#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#6;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#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="n#div#0;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#18462#18491#0" />
<element signature="e#18519#20924#0" />
<element signature="e#20974#21472#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="322" column="47" selection-start-line="322" selection-start-column="47" selection-end-line="322" selection-end-column="47" />
<folding>
<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" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -155,7 +155,7 @@
可耐美中国
</div>
</div>
<!-------------------------------可耐美德国----------------------------------->
<div class="clime_germany" >
... ... @@ -233,7 +233,7 @@
</div>
<!--视频介绍-->
<div class="mid_company_video">
<video controls>
<video controls="controls" loop="loop" webkit-playsinline="true" playsinline="true" x5-playsinline="true" >
<source src="../video/Bugatti_1.mp4" type="video/mp4">
</video>
... ... @@ -321,7 +321,8 @@
<div class="mid_company">
<!--视频介绍-->
<div class="mid_company_video">
<video controls>
<video controls="controls" loop="loop" webkit-playsinline="true" playsinline="true" x5-playsinline="true" >
<source src="../video/Bugatti_1.mp4" type="video/mp4">
</video>
</div>
... ...