合并分支 'lihongjuan' 到 'master'
Lihongjuan 查看合并请求 !9
正在显示
3 个修改的文件
包含
89 行增加
和
107 行删除
@@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
27 | <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> | 27 | <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> |
28 | <entry file="file://$PROJECT_DIR$/index.html"> | 28 | <entry file="file://$PROJECT_DIR$/index.html"> |
29 | <provider selected="true" editor-type-id="text-editor"> | 29 | <provider selected="true" editor-type-id="text-editor"> |
30 | - <state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925"> | 30 | + <state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783"> |
31 | <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> | 31 | <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> |
32 | <folding> | 32 | <folding> |
33 | <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 33 | <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
@@ -39,18 +39,18 @@ | @@ -39,18 +39,18 @@ | ||
39 | <file leaf-file-name="order.js" pinned="false" current-in-tab="false"> | 39 | <file leaf-file-name="order.js" pinned="false" current-in-tab="false"> |
40 | <entry file="file://$PROJECT_DIR$/js/order.js"> | 40 | <entry file="file://$PROJECT_DIR$/js/order.js"> |
41 | <provider selected="true" editor-type-id="text-editor"> | 41 | <provider selected="true" editor-type-id="text-editor"> |
42 | - <state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672"> | 42 | + <state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816"> |
43 | <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" /> | 43 | <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" /> |
44 | <folding /> | 44 | <folding /> |
45 | </state> | 45 | </state> |
46 | </provider> | 46 | </provider> |
47 | </entry> | 47 | </entry> |
48 | </file> | 48 | </file> |
49 | - <file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="true"> | 49 | + <file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="false"> |
50 | <entry file="file://$PROJECT_DIR$/css/jquery-weui.css"> | 50 | <entry file="file://$PROJECT_DIR$/css/jquery-weui.css"> |
51 | <provider selected="true" editor-type-id="text-editor"> | 51 | <provider selected="true" editor-type-id="text-editor"> |
52 | - <state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061"> | ||
53 | - <caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" /> | 52 | + <state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061"> |
53 | + <caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" /> | ||
54 | <folding> | 54 | <folding> |
55 | <element signature="e#433#1880#2" expanded="true" /> | 55 | <element signature="e#433#1880#2" expanded="true" /> |
56 | <element signature="e#23094#23349#2" expanded="true" /> | 56 | <element signature="e#23094#23349#2" expanded="true" /> |
@@ -70,31 +70,36 @@ | @@ -70,31 +70,36 @@ | ||
70 | </provider> | 70 | </provider> |
71 | </entry> | 71 | </entry> |
72 | </file> | 72 | </file> |
73 | - <file leaf-file-name="hopeaddress.js" pinned="false" current-in-tab="false"> | ||
74 | - <entry file="file://$PROJECT_DIR$/js/hopeaddress.js"> | 73 | + <file leaf-file-name="jquery-weui.js" pinned="false" current-in-tab="false"> |
74 | + <entry file="file://$PROJECT_DIR$/js/jquery-weui.js"> | ||
75 | <provider selected="true" editor-type-id="text-editor"> | 75 | <provider selected="true" editor-type-id="text-editor"> |
76 | - <state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032"> | ||
77 | - <caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" /> | ||
78 | - <folding /> | 76 | + <state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230"> |
77 | + <caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" /> | ||
78 | + <folding> | ||
79 | + <element signature="n#!!doc" expanded="true" /> | ||
80 | + </folding> | ||
79 | </state> | 81 | </state> |
80 | </provider> | 82 | </provider> |
81 | </entry> | 83 | </entry> |
82 | </file> | 84 | </file> |
83 | - <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false"> | ||
84 | - <entry file="file://$PROJECT_DIR$/shopcar.html"> | 85 | + <file leaf-file-name="order.html" pinned="false" current-in-tab="true"> |
86 | + <entry file="file://$PROJECT_DIR$/order.html"> | ||
85 | <provider selected="true" editor-type-id="text-editor"> | 87 | <provider selected="true" editor-type-id="text-editor"> |
86 | - <state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255"> | ||
87 | - <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" /> | ||
88 | - <folding /> | 88 | + <state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087"> |
89 | + <caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" /> | ||
90 | + <folding> | ||
91 | + <element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
92 | + <element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
93 | + </folding> | ||
89 | </state> | 94 | </state> |
90 | </provider> | 95 | </provider> |
91 | </entry> | 96 | </entry> |
92 | </file> | 97 | </file> |
93 | - <file leaf-file-name="research.js" pinned="false" current-in-tab="false"> | ||
94 | - <entry file="file://$PROJECT_DIR$/js/research.js"> | 98 | + <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false"> |
99 | + <entry file="file://$PROJECT_DIR$/shopcar.html"> | ||
95 | <provider selected="true" editor-type-id="text-editor"> | 100 | <provider selected="true" editor-type-id="text-editor"> |
96 | - <state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000"> | ||
97 | - <caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" /> | 101 | + <state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515"> |
102 | + <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" /> | ||
98 | <folding /> | 103 | <folding /> |
99 | </state> | 104 | </state> |
100 | </provider> | 105 | </provider> |
@@ -103,7 +108,7 @@ | @@ -103,7 +108,7 @@ | ||
103 | <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false"> | 108 | <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false"> |
104 | <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> | 109 | <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> |
105 | <provider selected="true" editor-type-id="text-editor"> | 110 | <provider selected="true" editor-type-id="text-editor"> |
106 | - <state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180"> | 111 | + <state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610"> |
107 | <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" /> | 112 | <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" /> |
108 | <folding /> | 113 | <folding /> |
109 | </state> | 114 | </state> |
@@ -113,7 +118,7 @@ | @@ -113,7 +118,7 @@ | ||
113 | <file leaf-file-name="research.html" pinned="false" current-in-tab="false"> | 118 | <file leaf-file-name="research.html" pinned="false" current-in-tab="false"> |
114 | <entry file="file://$PROJECT_DIR$/research.html"> | 119 | <entry file="file://$PROJECT_DIR$/research.html"> |
115 | <provider selected="true" editor-type-id="text-editor"> | 120 | <provider selected="true" editor-type-id="text-editor"> |
116 | - <state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250"> | 121 | + <state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990"> |
117 | <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" /> | 122 | <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" /> |
118 | <folding> | 123 | <folding> |
119 | <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 124 | <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
@@ -132,7 +137,7 @@ | @@ -132,7 +137,7 @@ | ||
132 | <file leaf-file-name="evalute.js" pinned="false" current-in-tab="false"> | 137 | <file leaf-file-name="evalute.js" pinned="false" current-in-tab="false"> |
133 | <entry file="file://$PROJECT_DIR$/js/evalute.js"> | 138 | <entry file="file://$PROJECT_DIR$/js/evalute.js"> |
134 | <provider selected="true" editor-type-id="text-editor"> | 139 | <provider selected="true" editor-type-id="text-editor"> |
135 | - <state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850"> | 140 | + <state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206"> |
136 | <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" /> | 141 | <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" /> |
137 | <folding> | 142 | <folding> |
138 | <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." /> | 143 | <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." /> |
@@ -144,7 +149,7 @@ | @@ -144,7 +149,7 @@ | ||
144 | <file leaf-file-name="research.css" pinned="false" current-in-tab="false"> | 149 | <file leaf-file-name="research.css" pinned="false" current-in-tab="false"> |
145 | <entry file="file://$PROJECT_DIR$/css/research.css"> | 150 | <entry file="file://$PROJECT_DIR$/css/research.css"> |
146 | <provider selected="true" editor-type-id="text-editor"> | 151 | <provider selected="true" editor-type-id="text-editor"> |
147 | - <state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164"> | 152 | + <state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092"> |
148 | <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" /> | 153 | <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" /> |
149 | <folding /> | 154 | <folding /> |
150 | </state> | 155 | </state> |
@@ -164,7 +169,6 @@ | @@ -164,7 +169,6 @@ | ||
164 | <option value="$PROJECT_DIR$/js/index.js" /> | 169 | <option value="$PROJECT_DIR$/js/index.js" /> |
165 | <option value="$PROJECT_DIR$/js/shopcar.js" /> | 170 | <option value="$PROJECT_DIR$/js/shopcar.js" /> |
166 | <option value="$PROJECT_DIR$/js/personcenter.js" /> | 171 | <option value="$PROJECT_DIR$/js/personcenter.js" /> |
167 | - <option value="$PROJECT_DIR$/order.html" /> | ||
168 | <option value="$PROJECT_DIR$/hopeaddress.html" /> | 172 | <option value="$PROJECT_DIR$/hopeaddress.html" /> |
169 | <option value="$PROJECT_DIR$/js/hopeaddress.js" /> | 173 | <option value="$PROJECT_DIR$/js/hopeaddress.js" /> |
170 | <option value="$PROJECT_DIR$/js/research.js" /> | 174 | <option value="$PROJECT_DIR$/js/research.js" /> |
@@ -176,6 +180,8 @@ | @@ -176,6 +180,8 @@ | ||
176 | <option value="$PROJECT_DIR$/index.html" /> | 180 | <option value="$PROJECT_DIR$/index.html" /> |
177 | <option value="$PROJECT_DIR$/js/order.js" /> | 181 | <option value="$PROJECT_DIR$/js/order.js" /> |
178 | <option value="$PROJECT_DIR$/css/jquery-weui.css" /> | 182 | <option value="$PROJECT_DIR$/css/jquery-weui.css" /> |
183 | + <option value="$PROJECT_DIR$/js/jquery-weui.js" /> | ||
184 | + <option value="$PROJECT_DIR$/order.html" /> | ||
179 | </list> | 185 | </list> |
180 | </option> | 186 | </option> |
181 | </component> | 187 | </component> |
@@ -292,7 +298,7 @@ | @@ -292,7 +298,7 @@ | ||
292 | </component> | 298 | </component> |
293 | <component name="PropertiesComponent"> | 299 | <component name="PropertiesComponent"> |
294 | <property name="WebServerToolWindowFactoryState" value="false" /> | 300 | <property name="WebServerToolWindowFactoryState" value="false" /> |
295 | - <property name="last_opened_file_path" value="G:/project" /> | 301 | + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> |
296 | <property name="HbShouldOpenHtmlAsHb" value="" /> | 302 | <property name="HbShouldOpenHtmlAsHb" value="" /> |
297 | <property name="JavaScriptLanguageLevel" value="ES6" /> | 303 | <property name="JavaScriptLanguageLevel" value="ES6" /> |
298 | <property name="JavaScriptPreferStrict" value="false" /> | 304 | <property name="JavaScriptPreferStrict" value="false" /> |
@@ -307,14 +313,10 @@ | @@ -307,14 +313,10 @@ | ||
307 | </key> | 313 | </key> |
308 | </component> | 314 | </component> |
309 | <component name="RunManager"> | 315 | <component name="RunManager"> |
310 | - <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application"> | ||
311 | - <method /> | ||
312 | - </configuration> | ||
313 | <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit"> | 316 | <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit"> |
314 | <method /> | 317 | <method /> |
315 | </configuration> | 318 | </configuration> |
316 | - <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file=""> | ||
317 | - <envs /> | 319 | + <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application"> |
318 | <method /> | 320 | <method /> |
319 | </configuration> | 321 | </configuration> |
320 | <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver"> | 322 | <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver"> |
@@ -324,6 +326,10 @@ | @@ -324,6 +326,10 @@ | ||
324 | <setting name="preferredDebugBrowser" value="Chrome" /> | 326 | <setting name="preferredDebugBrowser" value="Chrome" /> |
325 | <method /> | 327 | <method /> |
326 | </configuration> | 328 | </configuration> |
329 | + <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file=""> | ||
330 | + <envs /> | ||
331 | + <method /> | ||
332 | + </configuration> | ||
327 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> | 333 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> |
328 | <method /> | 334 | <method /> |
329 | </configuration> | 335 | </configuration> |
@@ -358,8 +364,8 @@ | @@ -358,8 +364,8 @@ | ||
358 | <servers /> | 364 | <servers /> |
359 | </component> | 365 | </component> |
360 | <component name="ToolWindowManager"> | 366 | <component name="ToolWindowManager"> |
361 | - <frame x="-7" y="2" width="1932" height="1051" extended-state="1" /> | ||
362 | - <editor active="false" /> | 367 | + <frame x="-7" y="2" width="1932" height="1051" extended-state="0" /> |
368 | + <editor active="true" /> | ||
363 | <layout> | 369 | <layout> |
364 | <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 370 | <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
365 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 371 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
@@ -367,18 +373,18 @@ | @@ -367,18 +373,18 @@ | ||
367 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 373 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
368 | <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 374 | <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
369 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.107515655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 375 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.107515655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
370 | - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
371 | - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||
372 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> | 376 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> |
373 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> | 377 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> |
374 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 378 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
375 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | 379 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
376 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 380 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
377 | - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
378 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 381 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
382 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
383 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
379 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 384 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
380 | - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | ||
381 | <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> | 385 | <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> |
386 | + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | ||
387 | + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||
382 | </layout> | 388 | </layout> |
383 | </component> | 389 | </component> |
384 | <component name="Vcs.Log.UiProperties"> | 390 | <component name="Vcs.Log.UiProperties"> |
@@ -402,14 +408,20 @@ | @@ -402,14 +408,20 @@ | ||
402 | <watches-manager /> | 408 | <watches-manager /> |
403 | </component> | 409 | </component> |
404 | <component name="editorHistoryManager"> | 410 | <component name="editorHistoryManager"> |
411 | + <entry file="file://$PROJECT_DIR$/css/research.css"> | ||
412 | + <provider selected="true" editor-type-id="text-editor"> | ||
413 | + <state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092"> | ||
414 | + <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" /> | ||
415 | + <folding /> | ||
416 | + </state> | ||
417 | + </provider> | ||
418 | + </entry> | ||
405 | <entry file="file://$PROJECT_DIR$/index.html"> | 419 | <entry file="file://$PROJECT_DIR$/index.html"> |
406 | <provider selected="true" editor-type-id="text-editor"> | 420 | <provider selected="true" editor-type-id="text-editor"> |
407 | <state vertical-scroll-proportion="0.0" vertical-offset="4503" max-vertical-offset="6688"> | 421 | <state vertical-scroll-proportion="0.0" vertical-offset="4503" max-vertical-offset="6688"> |
408 | <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" /> | 422 | <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" /> |
409 | <folding> | 423 | <folding> |
410 | - <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
411 | - <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
412 | - <element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | 424 | + <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
413 | </folding> | 425 | </folding> |
414 | </state> | 426 | </state> |
415 | </provider> | 427 | </provider> |
@@ -426,9 +438,6 @@ | @@ -426,9 +438,6 @@ | ||
426 | <provider selected="true" editor-type-id="text-editor"> | 438 | <provider selected="true" editor-type-id="text-editor"> |
427 | <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909"> | 439 | <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909"> |
428 | <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> | 440 | <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> |
429 | - <folding> | ||
430 | - <element signature="n#!!doc" expanded="false" /> | ||
431 | - </folding> | ||
432 | </state> | 441 | </state> |
433 | </provider> | 442 | </provider> |
434 | </entry> | 443 | </entry> |
@@ -436,7 +445,6 @@ | @@ -436,7 +445,6 @@ | ||
436 | <provider selected="true" editor-type-id="text-editor"> | 445 | <provider selected="true" editor-type-id="text-editor"> |
437 | <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541"> | 446 | <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541"> |
438 | <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> | 447 | <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> |
439 | - <folding /> | ||
440 | </state> | 448 | </state> |
441 | </provider> | 449 | </provider> |
442 | </entry> | 450 | </entry> |
@@ -444,7 +452,6 @@ | @@ -444,7 +452,6 @@ | ||
444 | <provider selected="true" editor-type-id="text-editor"> | 452 | <provider selected="true" editor-type-id="text-editor"> |
445 | <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832"> | 453 | <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832"> |
446 | <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> | 454 | <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> |
447 | - <folding /> | ||
448 | </state> | 455 | </state> |
449 | </provider> | 456 | </provider> |
450 | </entry> | 457 | </entry> |
@@ -452,7 +459,6 @@ | @@ -452,7 +459,6 @@ | ||
452 | <provider selected="true" editor-type-id="text-editor"> | 459 | <provider selected="true" editor-type-id="text-editor"> |
453 | <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> | 460 | <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> |
454 | <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> | 461 | <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> |
455 | - <folding /> | ||
456 | </state> | 462 | </state> |
457 | </provider> | 463 | </provider> |
458 | </entry> | 464 | </entry> |
@@ -468,10 +474,7 @@ | @@ -468,10 +474,7 @@ | ||
468 | <provider selected="true" editor-type-id="text-editor"> | 474 | <provider selected="true" editor-type-id="text-editor"> |
469 | <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211"> | 475 | <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211"> |
470 | <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> | 476 | <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> |
471 | - <folding> | ||
472 | - <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
473 | - <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
474 | - </folding> | 477 | + <folding /> |
475 | </state> | 478 | </state> |
476 | </provider> | 479 | </provider> |
477 | </entry> | 480 | </entry> |
@@ -479,7 +482,6 @@ | @@ -479,7 +482,6 @@ | ||
479 | <provider selected="true" editor-type-id="text-editor"> | 482 | <provider selected="true" editor-type-id="text-editor"> |
480 | <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634"> | 483 | <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634"> |
481 | <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> | 484 | <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> |
482 | - <folding /> | ||
483 | </state> | 485 | </state> |
484 | </provider> | 486 | </provider> |
485 | </entry> | 487 | </entry> |
@@ -487,7 +489,6 @@ | @@ -487,7 +489,6 @@ | ||
487 | <provider selected="true" editor-type-id="text-editor"> | 489 | <provider selected="true" editor-type-id="text-editor"> |
488 | <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779"> | 490 | <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779"> |
489 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> | 491 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> |
490 | - <folding /> | ||
491 | </state> | 492 | </state> |
492 | </provider> | 493 | </provider> |
493 | </entry> | 494 | </entry> |
@@ -496,9 +497,7 @@ | @@ -496,9 +497,7 @@ | ||
496 | <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707"> | 497 | <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707"> |
497 | <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" /> | 498 | <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" /> |
498 | <folding> | 499 | <folding> |
499 | - <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
500 | - <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
501 | - <element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | 500 | + <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
502 | </folding> | 501 | </folding> |
503 | </state> | 502 | </state> |
504 | </provider> | 503 | </provider> |
@@ -515,9 +514,6 @@ | @@ -515,9 +514,6 @@ | ||
515 | <provider selected="true" editor-type-id="text-editor"> | 514 | <provider selected="true" editor-type-id="text-editor"> |
516 | <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909"> | 515 | <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909"> |
517 | <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" /> | 516 | <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" /> |
518 | - <folding> | ||
519 | - <element signature="n#!!doc" expanded="false" /> | ||
520 | - </folding> | ||
521 | </state> | 517 | </state> |
522 | </provider> | 518 | </provider> |
523 | </entry> | 519 | </entry> |
@@ -525,7 +521,6 @@ | @@ -525,7 +521,6 @@ | ||
525 | <provider selected="true" editor-type-id="text-editor"> | 521 | <provider selected="true" editor-type-id="text-editor"> |
526 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427"> | 522 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427"> |
527 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 523 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
528 | - <folding /> | ||
529 | </state> | 524 | </state> |
530 | </provider> | 525 | </provider> |
531 | </entry> | 526 | </entry> |
@@ -533,7 +528,6 @@ | @@ -533,7 +528,6 @@ | ||
533 | <provider selected="true" editor-type-id="text-editor"> | 528 | <provider selected="true" editor-type-id="text-editor"> |
534 | <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832"> | 529 | <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832"> |
535 | <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> | 530 | <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> |
536 | - <folding /> | ||
537 | </state> | 531 | </state> |
538 | </provider> | 532 | </provider> |
539 | </entry> | 533 | </entry> |
@@ -541,7 +535,6 @@ | @@ -541,7 +535,6 @@ | ||
541 | <provider selected="true" editor-type-id="text-editor"> | 535 | <provider selected="true" editor-type-id="text-editor"> |
542 | <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> | 536 | <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> |
543 | <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> | 537 | <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> |
544 | - <folding /> | ||
545 | </state> | 538 | </state> |
546 | </provider> | 539 | </provider> |
547 | </entry> | 540 | </entry> |
@@ -557,10 +550,7 @@ | @@ -557,10 +550,7 @@ | ||
557 | <provider selected="true" editor-type-id="text-editor"> | 550 | <provider selected="true" editor-type-id="text-editor"> |
558 | <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> | 551 | <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> |
559 | <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> | 552 | <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> |
560 | - <folding> | ||
561 | - <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
562 | - <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
563 | - </folding> | 553 | + <folding /> |
564 | </state> | 554 | </state> |
565 | </provider> | 555 | </provider> |
566 | </entry> | 556 | </entry> |
@@ -568,7 +558,6 @@ | @@ -568,7 +558,6 @@ | ||
568 | <provider selected="true" editor-type-id="text-editor"> | 558 | <provider selected="true" editor-type-id="text-editor"> |
569 | <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634"> | 559 | <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634"> |
570 | <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> | 560 | <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> |
571 | - <folding /> | ||
572 | </state> | 561 | </state> |
573 | </provider> | 562 | </provider> |
574 | </entry> | 563 | </entry> |
@@ -576,7 +565,6 @@ | @@ -576,7 +565,6 @@ | ||
576 | <provider selected="true" editor-type-id="text-editor"> | 565 | <provider selected="true" editor-type-id="text-editor"> |
577 | <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779"> | 566 | <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779"> |
578 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> | 567 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> |
579 | - <folding /> | ||
580 | </state> | 568 | </state> |
581 | </provider> | 569 | </provider> |
582 | </entry> | 570 | </entry> |
@@ -585,9 +573,7 @@ | @@ -585,9 +573,7 @@ | ||
585 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707"> | 573 | <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707"> |
586 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 574 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
587 | <folding> | 575 | <folding> |
588 | - <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
589 | - <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
590 | - <element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | 576 | + <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
591 | </folding> | 577 | </folding> |
592 | </state> | 578 | </state> |
593 | </provider> | 579 | </provider> |
@@ -596,7 +582,6 @@ | @@ -596,7 +582,6 @@ | ||
596 | <provider selected="true" editor-type-id="text-editor"> | 582 | <provider selected="true" editor-type-id="text-editor"> |
597 | <state vertical-scroll-proportion="0.0" vertical-offset="4408" max-vertical-offset="13870"> | 583 | <state vertical-scroll-proportion="0.0" vertical-offset="4408" max-vertical-offset="13870"> |
598 | <caret line="232" column="23" selection-start-line="232" selection-start-column="23" selection-end-line="232" selection-end-column="23" /> | 584 | <caret line="232" column="23" selection-start-line="232" selection-start-column="23" selection-end-line="232" selection-end-column="23" /> |
599 | - <folding /> | ||
600 | </state> | 585 | </state> |
601 | </provider> | 586 | </provider> |
602 | </entry> | 587 | </entry> |
@@ -612,10 +597,7 @@ | @@ -612,10 +597,7 @@ | ||
612 | <provider selected="true" editor-type-id="text-editor"> | 597 | <provider selected="true" editor-type-id="text-editor"> |
613 | <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> | 598 | <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> |
614 | <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> | 599 | <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> |
615 | - <folding> | ||
616 | - <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
617 | - <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" /> | ||
618 | - </folding> | 600 | + <folding /> |
619 | </state> | 601 | </state> |
620 | </provider> | 602 | </provider> |
621 | </entry> | 603 | </entry> |
@@ -623,7 +605,6 @@ | @@ -623,7 +605,6 @@ | ||
623 | <provider selected="true" editor-type-id="text-editor"> | 605 | <provider selected="true" editor-type-id="text-editor"> |
624 | <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634"> | 606 | <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634"> |
625 | <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> | 607 | <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> |
626 | - <folding /> | ||
627 | </state> | 608 | </state> |
628 | </provider> | 609 | </provider> |
629 | </entry> | 610 | </entry> |
@@ -638,7 +619,6 @@ | @@ -638,7 +619,6 @@ | ||
638 | <provider selected="true" editor-type-id="text-editor"> | 619 | <provider selected="true" editor-type-id="text-editor"> |
639 | <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779"> | 620 | <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779"> |
640 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> | 621 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> |
641 | - <folding /> | ||
642 | </state> | 622 | </state> |
643 | </provider> | 623 | </provider> |
644 | </entry> | 624 | </entry> |
@@ -653,7 +633,6 @@ | @@ -653,7 +633,6 @@ | ||
653 | <provider selected="true" editor-type-id="text-editor"> | 633 | <provider selected="true" editor-type-id="text-editor"> |
654 | <state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1189"> | 634 | <state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1189"> |
655 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> | 635 | <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> |
656 | - <folding /> | ||
657 | </state> | 636 | </state> |
658 | </provider> | 637 | </provider> |
659 | </entry> | 638 | </entry> |
@@ -661,7 +640,6 @@ | @@ -661,7 +640,6 @@ | ||
661 | <provider selected="true" editor-type-id="text-editor"> | 640 | <provider selected="true" editor-type-id="text-editor"> |
662 | <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> | 641 | <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> |
663 | <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> | 642 | <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> |
664 | - <folding /> | ||
665 | </state> | 643 | </state> |
666 | </provider> | 644 | </provider> |
667 | </entry> | 645 | </entry> |
@@ -669,7 +647,6 @@ | @@ -669,7 +647,6 @@ | ||
669 | <provider selected="true" editor-type-id="text-editor"> | 647 | <provider selected="true" editor-type-id="text-editor"> |
670 | <state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840"> | 648 | <state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840"> |
671 | <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> | 649 | <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> |
672 | - <folding /> | ||
673 | </state> | 650 | </state> |
674 | </provider> | 651 | </provider> |
675 | </entry> | 652 | </entry> |
@@ -677,7 +654,6 @@ | @@ -677,7 +654,6 @@ | ||
677 | <provider selected="true" editor-type-id="text-editor"> | 654 | <provider selected="true" editor-type-id="text-editor"> |
678 | <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541"> | 655 | <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541"> |
679 | <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> | 656 | <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> |
680 | - <folding /> | ||
681 | </state> | 657 | </state> |
682 | </provider> | 658 | </provider> |
683 | </entry> | 659 | </entry> |
@@ -693,9 +669,6 @@ | @@ -693,9 +669,6 @@ | ||
693 | <provider selected="true" editor-type-id="text-editor"> | 669 | <provider selected="true" editor-type-id="text-editor"> |
694 | <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909"> | 670 | <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909"> |
695 | <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> | 671 | <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> |
696 | - <folding> | ||
697 | - <element signature="n#!!doc" expanded="false" /> | ||
698 | - </folding> | ||
699 | </state> | 672 | </state> |
700 | </provider> | 673 | </provider> |
701 | </entry> | 674 | </entry> |
@@ -703,15 +676,6 @@ | @@ -703,15 +676,6 @@ | ||
703 | <provider selected="true" editor-type-id="text-editor"> | 676 | <provider selected="true" editor-type-id="text-editor"> |
704 | <state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398"> | 677 | <state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398"> |
705 | <caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" /> | 678 | <caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" /> |
706 | - <folding /> | ||
707 | - </state> | ||
708 | - </provider> | ||
709 | - </entry> | ||
710 | - <entry file="file://$PROJECT_DIR$/order.html"> | ||
711 | - <provider selected="true" editor-type-id="text-editor"> | ||
712 | - <state vertical-scroll-proportion="-15.785714" vertical-offset="7748" max-vertical-offset="20306"> | ||
713 | - <caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" /> | ||
714 | - <folding /> | ||
715 | </state> | 679 | </state> |
716 | </provider> | 680 | </provider> |
717 | </entry> | 681 | </entry> |
@@ -719,7 +683,6 @@ | @@ -719,7 +683,6 @@ | ||
719 | <provider selected="true" editor-type-id="text-editor"> | 683 | <provider selected="true" editor-type-id="text-editor"> |
720 | <state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457"> | 684 | <state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457"> |
721 | <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" /> | 685 | <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" /> |
722 | - <folding /> | ||
723 | </state> | 686 | </state> |
724 | </provider> | 687 | </provider> |
725 | </entry> | 688 | </entry> |
@@ -727,7 +690,6 @@ | @@ -727,7 +690,6 @@ | ||
727 | <provider selected="true" editor-type-id="text-editor"> | 690 | <provider selected="true" editor-type-id="text-editor"> |
728 | <state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219"> | 691 | <state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219"> |
729 | <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" /> | 692 | <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" /> |
730 | - <folding /> | ||
731 | </state> | 693 | </state> |
732 | </provider> | 694 | </provider> |
733 | </entry> | 695 | </entry> |
@@ -735,13 +697,12 @@ | @@ -735,13 +697,12 @@ | ||
735 | <provider selected="true" editor-type-id="text-editor"> | 697 | <provider selected="true" editor-type-id="text-editor"> |
736 | <state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325"> | 698 | <state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325"> |
737 | <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" /> | 699 | <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" /> |
738 | - <folding /> | ||
739 | </state> | 700 | </state> |
740 | </provider> | 701 | </provider> |
741 | </entry> | 702 | </entry> |
742 | <entry file="file://$PROJECT_DIR$/js/hopeaddress.js"> | 703 | <entry file="file://$PROJECT_DIR$/js/hopeaddress.js"> |
743 | <provider selected="true" editor-type-id="text-editor"> | 704 | <provider selected="true" editor-type-id="text-editor"> |
744 | - <state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032"> | 705 | + <state vertical-scroll-proportion="0.0" vertical-offset="2907" max-vertical-offset="4408"> |
745 | <caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" /> | 706 | <caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" /> |
746 | <folding /> | 707 | <folding /> |
747 | </state> | 708 | </state> |
@@ -749,7 +710,7 @@ | @@ -749,7 +710,7 @@ | ||
749 | </entry> | 710 | </entry> |
750 | <entry file="file://$PROJECT_DIR$/js/research.js"> | 711 | <entry file="file://$PROJECT_DIR$/js/research.js"> |
751 | <provider selected="true" editor-type-id="text-editor"> | 712 | <provider selected="true" editor-type-id="text-editor"> |
752 | - <state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000"> | 713 | + <state vertical-scroll-proportion="0.0" vertical-offset="6270" max-vertical-offset="9880"> |
753 | <caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" /> | 714 | <caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" /> |
754 | <folding /> | 715 | <folding /> |
755 | </state> | 716 | </state> |
@@ -765,7 +726,7 @@ | @@ -765,7 +726,7 @@ | ||
765 | </entry> | 726 | </entry> |
766 | <entry file="file://$PROJECT_DIR$/research.html"> | 727 | <entry file="file://$PROJECT_DIR$/research.html"> |
767 | <provider selected="true" editor-type-id="text-editor"> | 728 | <provider selected="true" editor-type-id="text-editor"> |
768 | - <state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250"> | 729 | + <state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990"> |
769 | <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" /> | 730 | <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" /> |
770 | <folding> | 731 | <folding> |
771 | <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 732 | <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
@@ -782,7 +743,7 @@ | @@ -782,7 +743,7 @@ | ||
782 | </entry> | 743 | </entry> |
783 | <entry file="file://$PROJECT_DIR$/js/evalute.js"> | 744 | <entry file="file://$PROJECT_DIR$/js/evalute.js"> |
784 | <provider selected="true" editor-type-id="text-editor"> | 745 | <provider selected="true" editor-type-id="text-editor"> |
785 | - <state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850"> | 746 | + <state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206"> |
786 | <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" /> | 747 | <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" /> |
787 | <folding> | 748 | <folding> |
788 | <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." /> | 749 | <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." /> |
@@ -792,7 +753,7 @@ | @@ -792,7 +753,7 @@ | ||
792 | </entry> | 753 | </entry> |
793 | <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> | 754 | <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> |
794 | <provider selected="true" editor-type-id="text-editor"> | 755 | <provider selected="true" editor-type-id="text-editor"> |
795 | - <state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180"> | 756 | + <state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610"> |
796 | <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" /> | 757 | <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" /> |
797 | <folding /> | 758 | <folding /> |
798 | </state> | 759 | </state> |
@@ -800,7 +761,7 @@ | @@ -800,7 +761,7 @@ | ||
800 | </entry> | 761 | </entry> |
801 | <entry file="file://$PROJECT_DIR$/shopcar.html"> | 762 | <entry file="file://$PROJECT_DIR$/shopcar.html"> |
802 | <provider selected="true" editor-type-id="text-editor"> | 763 | <provider selected="true" editor-type-id="text-editor"> |
803 | - <state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255"> | 764 | + <state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515"> |
804 | <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" /> | 765 | <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" /> |
805 | <folding /> | 766 | <folding /> |
806 | </state> | 767 | </state> |
@@ -808,7 +769,7 @@ | @@ -808,7 +769,7 @@ | ||
808 | </entry> | 769 | </entry> |
809 | <entry file="file://$PROJECT_DIR$/index.html"> | 770 | <entry file="file://$PROJECT_DIR$/index.html"> |
810 | <provider selected="true" editor-type-id="text-editor"> | 771 | <provider selected="true" editor-type-id="text-editor"> |
811 | - <state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925"> | 772 | + <state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783"> |
812 | <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> | 773 | <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" /> |
813 | <folding> | 774 | <folding> |
814 | <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 775 | <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
@@ -818,7 +779,7 @@ | @@ -818,7 +779,7 @@ | ||
818 | </entry> | 779 | </entry> |
819 | <entry file="file://$PROJECT_DIR$/js/order.js"> | 780 | <entry file="file://$PROJECT_DIR$/js/order.js"> |
820 | <provider selected="true" editor-type-id="text-editor"> | 781 | <provider selected="true" editor-type-id="text-editor"> |
821 | - <state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672"> | 782 | + <state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816"> |
822 | <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" /> | 783 | <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" /> |
823 | <folding /> | 784 | <folding /> |
824 | </state> | 785 | </state> |
@@ -826,8 +787,8 @@ | @@ -826,8 +787,8 @@ | ||
826 | </entry> | 787 | </entry> |
827 | <entry file="file://$PROJECT_DIR$/css/jquery-weui.css"> | 788 | <entry file="file://$PROJECT_DIR$/css/jquery-weui.css"> |
828 | <provider selected="true" editor-type-id="text-editor"> | 789 | <provider selected="true" editor-type-id="text-editor"> |
829 | - <state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061"> | ||
830 | - <caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" /> | 790 | + <state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061"> |
791 | + <caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" /> | ||
831 | <folding> | 792 | <folding> |
832 | <element signature="e#433#1880#2" expanded="true" /> | 793 | <element signature="e#433#1880#2" expanded="true" /> |
833 | <element signature="e#23094#23349#2" expanded="true" /> | 794 | <element signature="e#23094#23349#2" expanded="true" /> |
@@ -846,5 +807,26 @@ | @@ -846,5 +807,26 @@ | ||
846 | </state> | 807 | </state> |
847 | </provider> | 808 | </provider> |
848 | </entry> | 809 | </entry> |
810 | + <entry file="file://$PROJECT_DIR$/js/jquery-weui.js"> | ||
811 | + <provider selected="true" editor-type-id="text-editor"> | ||
812 | + <state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230"> | ||
813 | + <caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" /> | ||
814 | + <folding> | ||
815 | + <element signature="n#!!doc" expanded="true" /> | ||
816 | + </folding> | ||
817 | + </state> | ||
818 | + </provider> | ||
819 | + </entry> | ||
820 | + <entry file="file://$PROJECT_DIR$/order.html"> | ||
821 | + <provider selected="true" editor-type-id="text-editor"> | ||
822 | + <state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087"> | ||
823 | + <caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" /> | ||
824 | + <folding> | ||
825 | + <element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
826 | + <element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
827 | + </folding> | ||
828 | + </state> | ||
829 | + </provider> | ||
830 | + </entry> | ||
849 | </component> | 831 | </component> |
850 | </project> | 832 | </project> |
此 diff 太大无法显示。
@@ -293,7 +293,7 @@ | @@ -293,7 +293,7 @@ | ||
293 | box-sizing: border-box; | 293 | box-sizing: border-box; |
294 | -webkit-transition: 300ms; | 294 | -webkit-transition: 300ms; |
295 | transition: 300ms; | 295 | transition: 300ms; |
296 | - font-size:0.2rem; | 296 | + font-size:0.3rem; |
297 | } | 297 | } |
298 | [v-cloak]{ | 298 | [v-cloak]{ |
299 | display:none; | 299 | display:none; |
@@ -509,7 +509,7 @@ | @@ -509,7 +509,7 @@ | ||
509 | 509 | ||
510 | <div class="weui-cell"> | 510 | <div class="weui-cell"> |
511 | <div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div> | 511 | <div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div> |
512 | - <div class="weui-cell__bd" style="margin-left: 47px;font-size: 0.3rem;color:#333333"> | 512 | + <div class="weui-cell__bd" style="margin-left: 0.2rem;font-size: 0.3rem;color:#333333"> |
513 | <input class="weui-input" id="time4" type="text" value=""> | 513 | <input class="weui-input" id="time4" type="text" value=""> |
514 | </div> | 514 | </div> |
515 | </div> | 515 | </div> |
-
请 注册 或 登录 后发表评论