张亚鹏 / Wechat_project_1 · 提交

转到一个项目

作者 乔爽
提交 23640840f62d54d77d8696ce665b70ceadae366b 1 个父辈 f3cbbc08

更新

内嵌 并排对比
正在显示 2 个修改的文件 包含 32 行增加 和 27 行删除
... ... @@ -3,11 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" 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$/cpxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/cpxq.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cpgg.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpgg.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cplb.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cplb.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cpxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gift.html" beforeDir="false" afterPath="$PROJECT_DIR$/gift.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -122,14 +118,14 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="86" />
<entry key="html" value="255" />
<entry key="css" value="151" />
<entry key="html" value="436" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="87" />
<entry key="HTML" value="254" />
<entry key="CSS" value="152" />
<entry key="HTML" value="435" />
</counts>
</usages-collector>
</session>
... ... @@ -149,7 +145,7 @@
<entry file="file://$PROJECT_DIR$/css/cplb.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
<caret line="194" column="21" selection-start-line="194" selection-start-column="21" selection-end-line="194" selection-end-column="21" />
<caret line="136" column="8" selection-start-line="136" selection-start-column="8" selection-end-line="136" selection-end-column="29" />
</state>
</provider>
</entry>
... ... @@ -224,10 +220,13 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cplb.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="172" column="54" lean-forward="true" selection-start-line="172" selection-start-column="54" selection-end-line="172" selection-end-column="54" />
<state relative-caret-position="219">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#script#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
... ... @@ -245,7 +244,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>abs</find>
<find>input_container</find>
<find>btn_box</find>
<find>btn_</find>
... ... @@ -275,6 +273,7 @@
<find>resp</find>
<find>menu_price</find>
<find>item_left</find>
<find>main_item_title</find>
</findStrings>
<dirStrings>
<dir>F:\ljh\上传资料企业微信\images</dir>
... ... @@ -338,8 +337,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="652" />
<option name="y" value="98" />
<option name="x" value="654" />
<option name="y" value="182" />
<option name="width" value="1472" />
<option name="height" value="948" />
</component>
... ... @@ -441,15 +440,15 @@
<workItem from="1547539924447" duration="726000" />
<workItem from="1547550818174" duration="368000" />
<workItem from="1547598324930" duration="428000" />
<workItem from="1547620624212" duration="3541000" />
<workItem from="1547620624212" duration="4592000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="178237000" />
<option name="totallyTimeSpent" value="179288000" />
</component>
<component name="ToolWindowManager">
<frame x="652" y="98" width="1472" height="948" extended-state="0" />
<frame x="541" y="252" width="1472" height="948" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17433752" />
... ... @@ -650,16 +649,19 @@
<entry file="file://$PROJECT_DIR$/css/cplb.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
<caret line="194" column="21" selection-start-line="194" selection-start-column="21" selection-end-line="194" selection-end-column="21" />
<caret line="136" column="8" selection-start-line="136" selection-start-column="8" selection-end-line="136" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cplb.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="172" column="54" lean-forward="true" selection-start-line="172" selection-start-column="54" selection-end-line="172" selection-end-column="54" />
<state relative-caret-position="219">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#script#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
... ...
... ... @@ -131,15 +131,18 @@ input::-webkit-input-placeholder{
}
.main_item_title{
font-size: 0.3rem;
margin-top: 0.3rem;
margin-left: 0.29rem ;
margin-bottom: 0.05rem;
margin: 0.3rem 0.29rem 0.1rem 0.29rem;
text-overflow: ellipsis;
/*display: -webkit-box;*/
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.main_item_time{
font-size: 0.28rem;
color: #7b7b7b;
margin-left: 0.31rem;
/*margin-bottom: 0.33rem;*/
margin: 0 0.31rem;
}
.menu_container{
... ...