webfront / Clime · 提交

转到一个项目

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

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 53 行增加 和 55 行删除
@@ -2,8 +2,6 @@ @@ -2,8 +2,6 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment=""> 4 <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
5 - <change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />  
7 <change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
9 </list> 7 </list>
@@ -141,14 +139,14 @@ @@ -141,14 +139,14 @@
141 <usages-collector id="statistics.file.extensions.edit"> 139 <usages-collector id="statistics.file.extensions.edit">
142 <counts> 140 <counts>
143 <entry key="css" value="3848" /> 141 <entry key="css" value="3848" />
144 - <entry key="html" value="9019" /> 142 + <entry key="html" value="9021" />
145 <entry key="js" value="73" /> 143 <entry key="js" value="73" />
146 </counts> 144 </counts>
147 </usages-collector> 145 </usages-collector>
148 <usages-collector id="statistics.file.types.edit"> 146 <usages-collector id="statistics.file.types.edit">
149 <counts> 147 <counts>
150 <entry key="CSS" value="3848" /> 148 <entry key="CSS" value="3848" />
151 - <entry key="HTML" value="9020" /> 149 + <entry key="HTML" value="9022" />
152 <entry key="JavaScript" value="72" /> 150 <entry key="JavaScript" value="72" />
153 </counts> 151 </counts>
154 </usages-collector> 152 </usages-collector>
@@ -156,11 +154,11 @@ @@ -156,11 +154,11 @@
156 </component> 154 </component>
157 <component name="FileEditorManager"> 155 <component name="FileEditorManager">
158 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 156 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
159 - <file pinned="false" current-in-tab="false"> 157 + <file pinned="false" current-in-tab="true">
160 <entry file="file://$PROJECT_DIR$/html/gsjj.html"> 158 <entry file="file://$PROJECT_DIR$/html/gsjj.html">
161 <provider selected="true" editor-type-id="text-editor"> 159 <provider selected="true" editor-type-id="text-editor">
162 - <state relative-caret-position="340">  
163 - <caret line="418" lean-forward="true" selection-start-line="418" selection-end-line="418" /> 160 + <state relative-caret-position="448">
  161 + <caret line="649" column="20" selection-start-line="649" selection-start-column="20" selection-end-line="649" selection-end-column="20" />
164 <folding> 162 <folding>
165 <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 163 <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
166 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 164 <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 @@ @@ -241,11 +239,11 @@
241 </provider> 239 </provider>
242 </entry> 240 </entry>
243 </file> 241 </file>
244 - <file pinned="false" current-in-tab="true"> 242 + <file pinned="false" current-in-tab="false">
245 <entry file="file://$PROJECT_DIR$/html/index.html"> 243 <entry file="file://$PROJECT_DIR$/html/index.html">
246 <provider selected="true" editor-type-id="text-editor"> 244 <provider selected="true" editor-type-id="text-editor">
247 - <state relative-caret-position="432">  
248 - <caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" /> 245 + <state relative-caret-position="351">
  246 + <caret line="570" column="20" selection-start-line="570" selection-start-column="20" selection-end-line="570" selection-end-column="20" />
249 <folding> 247 <folding>
250 <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 248 <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
251 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 249 <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 @@ @@ -394,8 +392,8 @@
394 <option value="$PROJECT_DIR$/css/sckj.css" /> 392 <option value="$PROJECT_DIR$/css/sckj.css" />
395 <option value="$PROJECT_DIR$/css/index.css" /> 393 <option value="$PROJECT_DIR$/css/index.css" />
396 <option value="$PROJECT_DIR$/css/gsjj.css" /> 394 <option value="$PROJECT_DIR$/css/gsjj.css" />
397 - <option value="$PROJECT_DIR$/html/gsjj.html" />  
398 <option value="$PROJECT_DIR$/html/index.html" /> 395 <option value="$PROJECT_DIR$/html/index.html" />
  396 + <option value="$PROJECT_DIR$/html/gsjj.html" />
399 </list> 397 </list>
400 </option> 398 </option>
401 </component> 399 </component>
@@ -406,8 +404,8 @@ @@ -406,8 +404,8 @@
406 <sorting>DEFINITION_ORDER</sorting> 404 <sorting>DEFINITION_ORDER</sorting>
407 </component> 405 </component>
408 <component name="ProjectFrameBounds"> 406 <component name="ProjectFrameBounds">
409 - <option name="x" value="660" />  
410 - <option name="y" value="109" /> 407 + <option name="x" value="576" />
  408 + <option name="y" value="17" />
411 <option name="width" value="1630" /> 409 <option name="width" value="1630" />
412 <option name="height" value="1100" /> 410 <option name="height" value="1100" />
413 </component> 411 </component>
@@ -517,15 +515,15 @@ @@ -517,15 +515,15 @@
517 <workItem from="1548376254799" duration="35479000" /> 515 <workItem from="1548376254799" duration="35479000" />
518 <workItem from="1548635475488" duration="30286000" /> 516 <workItem from="1548635475488" duration="30286000" />
519 <workItem from="1548722046541" duration="20538000" /> 517 <workItem from="1548722046541" duration="20538000" />
520 - <workItem from="1548748173198" duration="12326000" /> 518 + <workItem from="1548748173198" duration="12415000" />
521 </task> 519 </task>
522 <servers /> 520 <servers />
523 </component> 521 </component>
524 <component name="TimeTrackingManager"> 522 <component name="TimeTrackingManager">
525 - <option name="totallyTimeSpent" value="298097000" /> 523 + <option name="totallyTimeSpent" value="298186000" />
526 </component> 524 </component>
527 <component name="ToolWindowManager"> 525 <component name="ToolWindowManager">
528 - <frame x="366" y="31" width="1630" height="1100" extended-state="0" /> 526 + <frame x="576" y="17" width="1630" height="1100" extended-state="0" />
529 <editor active="true" /> 527 <editor active="true" />
530 <layout> 528 <layout>
531 <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.13756281" /> 529 <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.13756281" />
@@ -978,35 +976,6 @@ @@ -978,35 +976,6 @@
978 </state> 976 </state>
979 </provider> 977 </provider>
980 </entry> 978 </entry>
981 - <entry file="file://$PROJECT_DIR$/html/gsjj.html">  
982 - <provider selected="true" editor-type-id="text-editor">  
983 - <state relative-caret-position="340">  
984 - <caret line="418" lean-forward="true" selection-start-line="418" selection-end-line="418" />  
985 - <folding>  
986 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
987 - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
988 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
989 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
990 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
991 - <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" />  
992 - <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" />  
993 - <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
994 - <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
995 - <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" />  
996 - <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" />  
997 - <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" />  
998 - <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" />  
999 - <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" />  
1000 - <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1001 - <element signature="e#14929#15483#0" />  
1002 - <element signature="e#15533#16030#0" />  
1003 - <element signature="e#16087#16184#0" />  
1004 - <element signature="e#16250#16290#0" />  
1005 - <element signature="e#18959#19012#0" />  
1006 - </folding>  
1007 - </state>  
1008 - </provider>  
1009 - </entry>  
1010 <entry file="file://$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js"> 979 <entry file="file://$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js">
1011 <provider selected="true" editor-type-id="text-editor"> 980 <provider selected="true" editor-type-id="text-editor">
1012 <state relative-caret-position="244"> 981 <state relative-caret-position="244">
@@ -1030,8 +999,8 @@ @@ -1030,8 +999,8 @@
1030 </entry> 999 </entry>
1031 <entry file="file://$PROJECT_DIR$/html/index.html"> 1000 <entry file="file://$PROJECT_DIR$/html/index.html">
1032 <provider selected="true" editor-type-id="text-editor"> 1001 <provider selected="true" editor-type-id="text-editor">
1033 - <state relative-caret-position="432">  
1034 - <caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" /> 1002 + <state relative-caret-position="351">
  1003 + <caret line="570" column="20" selection-start-line="570" selection-start-column="20" selection-end-line="570" selection-end-column="20" />
1035 <folding> 1004 <folding>
1036 <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1005 <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1037 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 1006 <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 @@ @@ -1063,5 +1032,34 @@
1063 </state> 1032 </state>
1064 </provider> 1033 </provider>
1065 </entry> 1034 </entry>
  1035 + <entry file="file://$PROJECT_DIR$/html/gsjj.html">
  1036 + <provider selected="true" editor-type-id="text-editor">
  1037 + <state relative-caret-position="448">
  1038 + <caret line="649" column="20" selection-start-line="649" selection-start-column="20" selection-end-line="649" selection-end-column="20" />
  1039 + <folding>
  1040 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1041 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1042 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1043 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1044 + <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1045 + <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" />
  1046 + <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" />
  1047 + <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1048 + <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1049 + <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" />
  1050 + <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" />
  1051 + <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" />
  1052 + <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" />
  1053 + <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" />
  1054 + <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1055 + <element signature="e#14929#15483#0" />
  1056 + <element signature="e#15533#16030#0" />
  1057 + <element signature="e#16087#16184#0" />
  1058 + <element signature="e#16250#16290#0" />
  1059 + <element signature="e#18959#19012#0" />
  1060 + </folding>
  1061 + </state>
  1062 + </provider>
  1063 + </entry>
1066 </component> 1064 </component>
1067 </project> 1065 </project>
@@ -646,10 +646,10 @@ @@ -646,10 +646,10 @@
646 646
647 //swiper功能 647 //swiper功能
648 var swiper = new Swiper('#d_slider',{ 648 var swiper = new Swiper('#d_slider',{
649 - // autoplay: {  
650 - // delay: 1000,  
651 - // disableOnInteraction: false,  
652 - // }, 649 + autoplay: {
  650 + delay: 3000,
  651 + disableOnInteraction: false,
  652 + },
653 allowTouchMove: true, 653 allowTouchMove: true,
654 lazy: { 654 lazy: {
655 loadPrevNext: true, 655 loadPrevNext: true,
@@ -567,10 +567,10 @@ @@ -567,10 +567,10 @@
567 567
568 //swiper功能 568 //swiper功能
569 var swiper2 = new Swiper('#d_slider',{ 569 var swiper2 = new Swiper('#d_slider',{
570 - // autoplay: {  
571 - // delay: 1000,  
572 - // disableOnInteraction: false,  
573 - // }, 570 + autoplay: {
  571 + delay: 3000,
  572 + disableOnInteraction: false,
  573 + },
574 allowTouchMove: true, 574 allowTouchMove: true,
575 lazy: { 575 lazy: {
576 loadPrevNext: true, 576 loadPrevNext: true,