webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 be44d6a6fc1122ab0954fc25a7edb5c36f850530 1 个父辈 ccb11a0d

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 53 行增加 和 55 行删除
... ... @@ -2,8 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" 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" />
</list>
... ... @@ -141,14 +139,14 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="3848" />
<entry key="html" value="9019" />
<entry key="html" value="9021" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="3848" />
<entry key="HTML" value="9020" />
<entry key="HTML" value="9022" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -156,11 +154,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="340">
<caret line="418" lean-forward="true" selection-start-line="418" selection-end-line="418" />
<state relative-caret-position="448">
<caret line="649" column="20" selection-start-line="649" selection-start-column="20" selection-end-line="649" selection-end-column="20" />
<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" />
... ... @@ -241,11 +239,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="432">
<caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" />
<state relative-caret-position="351">
<caret line="570" column="20" selection-start-line="570" selection-start-column="20" selection-end-line="570" selection-end-column="20" />
<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" />
... ... @@ -394,8 +392,8 @@
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
</list>
</option>
</component>
... ... @@ -406,8 +404,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="660" />
<option name="y" value="109" />
<option name="x" value="576" />
<option name="y" value="17" />
<option name="width" value="1630" />
<option name="height" value="1100" />
</component>
... ... @@ -517,15 +515,15 @@
<workItem from="1548376254799" duration="35479000" />
<workItem from="1548635475488" duration="30286000" />
<workItem from="1548722046541" duration="20538000" />
<workItem from="1548748173198" duration="12326000" />
<workItem from="1548748173198" duration="12415000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="298097000" />
<option name="totallyTimeSpent" value="298186000" />
</component>
<component name="ToolWindowManager">
<frame x="366" y="31" width="1630" height="1100" extended-state="0" />
<frame x="576" y="17" width="1630" height="1100" 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.13756281" />
... ... @@ -978,35 +976,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="418" lean-forward="true" selection-start-line="418" selection-end-line="418" />
<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#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#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#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" />
<element signature="e#14929#15483#0" />
<element signature="e#15533#16030#0" />
<element signature="e#16087#16184#0" />
<element signature="e#16250#16290#0" />
<element signature="e#18959#19012#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
... ... @@ -1030,8 +999,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" />
<state relative-caret-position="351">
<caret line="570" column="20" selection-start-line="570" selection-start-column="20" selection-end-line="570" selection-end-column="20" />
<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" />
... ... @@ -1063,5 +1032,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448">
<caret line="649" column="20" selection-start-line="649" selection-start-column="20" selection-end-line="649" selection-end-column="20" />
<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#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#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#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" />
<element signature="e#14929#15483#0" />
<element signature="e#15533#16030#0" />
<element signature="e#16087#16184#0" />
<element signature="e#16250#16290#0" />
<element signature="e#18959#19012#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -646,10 +646,10 @@
//swiper功能
var swiper = new Swiper('#d_slider',{
// autoplay: {
// delay: 1000,
// disableOnInteraction: false,
// },
autoplay: {
delay: 3000,
disableOnInteraction: false,
},
allowTouchMove: true,
lazy: {
loadPrevNext: true,
... ...
... ... @@ -567,10 +567,10 @@
//swiper功能
var swiper2 = new Swiper('#d_slider',{
// autoplay: {
// delay: 1000,
// disableOnInteraction: false,
// },
autoplay: {
delay: 3000,
disableOnInteraction: false,
},
allowTouchMove: true,
lazy: {
loadPrevNext: true,
... ...