webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 4aede345add57231f1f47dd7cb271efb77671361 1 个父辈 28d51791

色彩搭配——>色块样式添加

内嵌 并排对比
正在显示 3 个修改的文件 包含 129 行增加 和 72 行删除
... ... @@ -2,11 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cpzx_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpzx_2.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
... ... @@ -144,15 +140,15 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4657" />
<entry key="html" value="12722" />
<entry key="css" value="4727" />
<entry key="html" value="12728" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4657" />
<entry key="HTML" value="12723" />
<entry key="CSS" value="4727" />
<entry key="HTML" value="12729" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -250,11 +246,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="657">
<caret line="290" column="22" selection-start-line="290" selection-start-column="22" selection-end-line="290" selection-end-column="22" />
<state relative-caret-position="468">
<caret line="178" column="18" lean-forward="true" selection-start-line="178" selection-start-column="18" selection-end-line="178" selection-end-column="18" />
<folding>
<element signature="n#div#0;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -299,19 +295,29 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="226" column="51" lean-forward="true" selection-start-line="226" selection-start-column="36" selection-end-line="226" selection-end-column="51" />
<state relative-caret-position="657">
<caret line="298" column="18" selection-start-line="298" selection-start-column="18" selection-end-line="298" selection-end-column="18" />
<folding>
<element signature="n#div#1;n#div#0;n#div#1;n#div#3;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#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;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#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;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#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#3;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#4;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#4;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -388,8 +394,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="464" column="21" selection-start-line="464" selection-start-column="21" selection-end-line="464" selection-end-column="21" />
<state relative-caret-position="237">
<caret line="469" column="24" lean-forward="true" selection-start-line="469" selection-start-column="24" selection-end-line="469" selection-end-column="24" />
</state>
</provider>
</entry>
... ... @@ -406,9 +412,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>sanjiaoright</find>
<find>mid_</find>
<find>线下门店</find>
<find>p</find>
<find>2007</find>
<find>&lt;p</find>
... ... @@ -429,13 +432,16 @@
<find>加盟流程</find>
<find>mid_common_item</find>
<find>mid_list</find>
<find>色彩搭配</find>
<find>show_pic</find>
<find>mid_select</find>
<find>icon-sanjiaoright</find>
<find>mid_item</find>
<find>items</find>
<find>mid_items</find>
<find>mid_item</find>
<find>色彩搭配</find>
<find>mid_color_items</find>
<find>mid_color_content_item</find>
<find>.mid_color_content_item</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -492,10 +498,10 @@
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/jm_3.html" />
<option value="$PROJECT_DIR$/html/fwcx_4.html" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/css/cpzx_2.css" />
<option value="$PROJECT_DIR$/html/cpzx_2.html" />
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/html/sckj.html" />
</list>
</option>
</component>
... ... @@ -506,9 +512,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="642" />
<option name="y" value="24" />
<option name="width" value="1210" />
<option name="x" value="641" />
<option name="y" value="9" />
<option name="width" value="1269" />
<option name="height" value="1033" />
</component>
<component name="ProjectView">
... ... @@ -625,18 +631,18 @@
<workItem from="1549845206263" duration="18001000" />
<workItem from="1549879359285" duration="125000" />
<workItem from="1549931467183" duration="4792000" />
<workItem from="1549950124825" duration="11782000" />
<workItem from="1549950124825" duration="12613000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="364556000" />
<option name="totallyTimeSpent" value="365387000" />
</component>
<component name="ToolWindowManager">
<frame x="642" y="24" width="1210" height="1033" extended-state="0" />
<frame x="641" y="9" width="1269" height="1033" 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.2397611" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.2282697" />
<window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -1119,36 +1125,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="226" column="51" lean-forward="true" selection-start-line="226" selection-start-column="36" selection-end-line="226" selection-end-column="51" />
<folding>
<element signature="n#div#1;n#div#0;n#div#1;n#div#3;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#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;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#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#13259#19414#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="464" column="21" selection-start-line="464" selection-start-column="21" selection-end-line="464" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
... ... @@ -1208,8 +1184,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="657">
<caret line="290" column="22" selection-start-line="290" selection-start-column="22" selection-end-line="290" selection-end-column="22" />
<state relative-caret-position="468">
<caret line="178" column="18" lean-forward="true" selection-start-line="178" selection-start-column="18" selection-end-line="178" selection-end-column="18" />
<folding>
<element signature="n#div#0;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -1228,5 +1204,45 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="469" column="24" lean-forward="true" selection-start-line="469" selection-start-column="24" selection-end-line="469" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="657">
<caret line="298" column="18" selection-start-line="298" selection-start-column="18" selection-end-line="298" selection-end-column="18" />
<folding>
<element signature="n#div#1;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;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#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#3;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#4;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#4;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#13259#19414#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -334,12 +334,13 @@ input::-webkit-input-placeholder{
display: flex;
flex-flow: column;
align-items: center;
justify-content: center;
/*justify-content: center;*/
}
.mid_color_big{
font-size: 0.32rem;
font-weight: 500;
color: #3F4249;
margin-top: 0.45rem;
}
.mid_color_box_right{
width: 3.6rem;
... ... @@ -461,12 +462,15 @@ input::-webkit-input-placeholder{
font-size: 0.22rem;
}
.mid_color_items{
width: 2.7rem;
display: flex;
flex-flow: column;
justify-content: space-between;
flex-wrap: wrap;
}
.mid_color_content_item{
display: flex;
flex-flow: column;
margin-top: 0.3rem;
}
.mid_color_content_item_top{
width: 1.2rem;
... ...
... ... @@ -216,6 +216,10 @@
</div>
<!--色彩搭配-->
<p class="mid_big_text"> 色彩搭配 </p>
<p class="mid_small_text"> COLOR MATCHING </p>
<!--色彩搭配模块2-->
<div class="mid_color_box_big">
<div class="mid_color_box">
... ... @@ -248,6 +252,42 @@
</div>
</div>
<div class="mid_color_content_item">
<!--颜色盒-->
<div class="mid_color_content_item_top center_color_1">
</div>
<!--介绍字体-->
<div class="mid_color_content_item_bottom">
BN7007-4
</div>
</div>
<div class="mid_color_content_item">
<!--颜色盒-->
<div class="mid_color_content_item_top center_color_1">
</div>
<!--介绍字体-->
<div class="mid_color_content_item_bottom">
BN7007-4
</div>
</div>
<div class="mid_color_content_item">
<!--颜色盒-->
<div class="mid_color_content_item_top center_color_1">
</div>
<!--介绍字体-->
<div class="mid_color_content_item_bottom">
BN7007-4
</div>
</div>
</div>
... ... @@ -257,9 +297,6 @@
</div>
</div>
</div>
<!--色彩搭配-->
<p class="mid_big_text"> 色彩搭配 </p>
<p class="mid_small_text"> COLOR MATCHING </p>
<!--色彩搭配模块1-->
<div class="mid_color_box_big">
<div class="mid_color_box">
... ...