webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 7ce2d0e93ce5b6a301ca15c0bea9ffa01bd0de9f 1 个父辈 3c07442d

更改主页轮播图效果，公司简介中精品案例的布局，和精品案例页面中的布局

内嵌 并排对比
正在显示 6 个修改的文件 包含 126 行增加 和 96 行删除
... ... @@ -3,7 +3,11 @@
<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/qqrz.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/qqrz.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/jpal.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/jpal.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/jpal.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jpal.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -114,19 +118,21 @@
<session id="-2119211925">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="41" />
<entry key="project.open.time.0" value="18" />
<entry key="project.closed" value="44" />
<entry key="project.open.time.0" value="19" />
<entry key="project.open.time.1" value="15" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.25" value="1" />
<entry key="project.open.time.26" value="1" />
<entry key="project.open.time.27" value="1" />
<entry key="project.open.time.28" value="1" />
<entry key="project.open.time.3" value="2" />
<entry key="project.open.time.38" value="1" />
<entry key="project.open.time.43" value="1" />
<entry key="project.open.time.5" value="1" />
<entry key="project.open.time.50" value="1" />
<entry key="project.opened" value="43" />
<entry key="project.opened" value="46" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -145,15 +151,15 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="5108" />
<entry key="html" value="15979" />
<entry key="css" value="5207" />
<entry key="html" value="16071" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="5109" />
<entry key="HTML" value="15979" />
<entry key="CSS" value="5208" />
<entry key="HTML" value="16071" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -164,8 +170,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="94" column="43" lean-forward="true" selection-start-line="94" selection-start-column="43" selection-end-line="94" selection-end-column="43" />
<state relative-caret-position="157">
<caret line="641" column="29" lean-forward="true" selection-start-line="641" selection-start-column="29" selection-end-line="641" selection-end-column="29" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -206,8 +212,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="723" column="23" lean-forward="true" selection-start-line="723" selection-start-column="23" selection-end-line="723" selection-end-column="23" />
<state relative-caret-position="19521">
<caret line="723" column="23" selection-start-line="723" selection-start-column="23" selection-end-line="723" selection-end-column="23" />
</state>
</provider>
</entry>
... ... @@ -224,8 +230,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7938">
<caret line="318" column="18" selection-start-line="318" selection-start-column="18" selection-end-line="318" selection-end-column="18" />
<state relative-caret-position="323">
<caret line="414" column="42" selection-start-line="414" selection-start-column="42" selection-end-line="414" selection-end-column="42" />
<folding>
<element signature="n#div#0;n#div#2;n#div#5;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#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -237,8 +243,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12690">
<caret line="470" column="18" selection-start-line="470" selection-start-column="18" selection-end-line="470" selection-end-column="18" />
<state relative-caret-position="318">
<caret line="464" column="16" lean-forward="true" selection-start-line="464" selection-start-column="16" selection-end-line="464" selection-end-column="16" />
</state>
</provider>
</entry>
... ... @@ -246,17 +252,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/jpal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6588">
<caret line="244" column="23" selection-start-line="244" selection-start-column="23" selection-end-line="244" selection-end-column="23" />
<state relative-caret-position="1317">
<caret line="244" column="19" selection-start-line="244" selection-start-column="19" selection-end-line="244" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/jpal.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3483">
<caret line="129" selection-start-line="129" selection-end-line="129" />
<state relative-caret-position="187">
<caret line="126" column="50" selection-start-line="126" selection-start-column="50" selection-end-line="126" selection-end-column="50" />
</state>
</provider>
</entry>
... ... @@ -279,11 +285,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="290">
<caret line="91" column="23" lean-forward="true" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
<state relative-caret-position="2295">
<caret line="85" column="25" lean-forward="true" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
</state>
</provider>
</entry>
... ... @@ -300,8 +306,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>mid_color_content_item</find>
<find>mid_item</find>
<find>mid_items</find>
<find>box_middle</find>
<find>banner</find>
... ... @@ -330,6 +334,8 @@
<find>mid_box_text</find>
<find>_text</find>
<find>video</find>
<find>xxx</find>
<find>可耐美</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -389,12 +395,12 @@
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/html/jm_3.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/qqrz.css" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/jpal.css" />
<option value="$PROJECT_DIR$/html/jpal.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/css/qqrz.css" />
<option value="$PROJECT_DIR$/css/jpal.css" />
<option value="$PROJECT_DIR$/html/jpal.html" />
</list>
</option>
</component>
... ... @@ -405,17 +411,16 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="991" />
<option name="y" value="113" />
<option name="x" value="296" />
<option name="y" value="222" />
<option name="width" value="1232" />
<option name="height" value="985" />
<option name="height" value="948" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -442,13 +447,14 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://F:/ljh项目/可耐美手机端/clime/html/cpxq_2.html" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="F:/苏杭项目/kenaimei" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
... ... @@ -541,18 +547,21 @@
<workItem from="1550726401026" duration="7012000" />
<workItem from="1550819426662" duration="153000" />
<workItem from="1550820435562" duration="59000" />
<workItem from="1550885339760" duration="470000" />
<workItem from="1550885339760" duration="1269000" />
<workItem from="1550903148792" duration="409000" />
<workItem from="1551054826329" duration="1840000" />
<workItem from="1551077852393" duration="3259000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="452880000" />
<option name="totallyTimeSpent" value="459187000" />
</component>
<component name="ToolWindowManager">
<frame x="991" y="113" width="1232" height="985" extended-state="0" />
<frame x="401" y="113" width="1232" height="948" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.19095477" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.19095477" />
<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" />
... ... @@ -564,7 +573,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.20117646" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.21033211" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -823,42 +832,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15012">
<caret line="556" column="23" selection-start-line="556" selection-start-column="23" selection-end-line="556" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7938">
<caret line="318" column="18" selection-start-line="318" selection-start-column="18" selection-end-line="318" selection-end-column="18" />
<folding>
<element signature="n#div#0;n#div#2;n#div#5;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#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12690">
<caret line="470" column="18" selection-start-line="470" selection-start-column="18" selection-end-line="470" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/jpal.css">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6588">
<caret line="244" column="23" selection-start-line="244" selection-start-column="23" selection-end-line="244" selection-end-column="23" />
<state relative-caret-position="19521">
<caret line="723" column="23" selection-start-line="723" selection-start-column="23" selection-end-line="723" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jpal.html">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3483">
<caret line="129" selection-start-line="129" selection-end-line="129" />
<state relative-caret-position="15012">
<caret line="556" column="23" selection-start-line="556" selection-start-column="23" selection-end-line="556" selection-end-column="23" />
</state>
</provider>
</entry>
... ... @@ -876,17 +860,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="723" column="23" lean-forward="true" selection-start-line="723" selection-start-column="23" selection-end-line="723" selection-end-column="23" />
<state relative-caret-position="2295">
<caret line="85" column="25" lean-forward="true" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="94" column="43" lean-forward="true" selection-start-line="94" selection-start-column="43" selection-end-line="94" selection-end-column="43" />
<state relative-caret-position="157">
<caret line="641" column="29" lean-forward="true" selection-start-line="641" selection-start-column="29" selection-end-line="641" selection-end-column="29" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -923,10 +907,35 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="414" column="42" selection-start-line="414" selection-start-column="42" selection-end-line="414" selection-end-column="42" />
<folding>
<element signature="n#div#0;n#div#2;n#div#5;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#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="464" column="16" lean-forward="true" selection-start-line="464" selection-start-column="16" selection-end-line="464" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/jpal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1317">
<caret line="244" column="19" selection-start-line="244" selection-start-column="19" selection-end-line="244" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/jpal.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="290">
<caret line="91" column="23" lean-forward="true" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
<state relative-caret-position="187">
<caret line="126" column="50" selection-start-line="126" selection-start-column="50" selection-end-line="126" selection-end-column="50" />
</state>
</provider>
</entry>
... ...
... ... @@ -441,7 +441,7 @@
width: 100%;
display:flex;
flex-wrap: nowrap;
height: 4.5rem;
/*height: 4.5rem;*/
/*background-color: #50B388;*/
white-space: nowrap;
overflow-x: scroll;
... ... @@ -460,6 +460,7 @@
.banner_pic{
width: 3.9rem;
height: 3.9rem;
display: flex;
}
.banner_pic img{
width: 100%;
... ... @@ -467,18 +468,18 @@
}
/*设置文字*/
.banner_text{
margin-top: 0.15rem;
/*margin-top: 0.15rem;*/
width: 3.9rem;
height: 0.27rem;
/*height: 0.27rem;*/
font-size: 0.28rem;
font-weight: bold;
color: #49526A;
text-align: center;
padding: 0.2rem 0;
text-overflow: ellipsis;
/*display: -webkit-box;*/
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
-webkit-line-clamp: 1;
overflow: hidden;
}
... ...
... ... @@ -90,7 +90,7 @@
.mid_box{
margin-top: 0.24rem;
width: 6.82rem;
height: 7.2rem;
/*height: 7.2rem;*/
background-color: #ffffff;
display: flex;
flex-flow: column;
... ... @@ -100,23 +100,35 @@
.mid_box_pic{
width: 6.22rem;
height: 6.22rem;
display: flex;
margin-top: 0.3rem;
}
.mid_box_pic img{
width: 100%;
height: 100%;
}
.mid_box_text{
margin-top: 0.23rem;
/*margin-top: 0.23rem;*/
width: 6.22rem;
font-size: 0.28rem;
text-align: center;
font-weight: bold;
box-sizing: border-box;
padding: 0.2rem 0;
text-overflow: ellipsis;
/*text-overflow: ellipsis;*/
/*-webkit-box-orient: vertical;*/
/*-webkit-line-clamp: 1;*/
/*overflow: hidden;*/
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*text-overflow: ellipsis;*/
/*display: -webkit-box;*/
/*-webkit-box-orient: vertical;*/
/*-webkit-line-clamp: 1;*/
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
... ...
... ... @@ -408,7 +408,11 @@
<img src="../images/bicon_19@2x.png">
</div>
<div class="banner_text">
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
油漆油漆油漆油漆油漆
油漆油漆油漆油漆油漆
油漆油漆油漆油漆油漆
油漆油漆油漆油漆油漆
</div>
</div>
<div class="mid_new_box" >
... ... @@ -416,7 +420,11 @@
<img src="../images/bicon_19@2x.png">
</div>
<div class="banner_text">
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
可耐美德国
可耐美德国
可耐美德国
可耐美德国
可耐美德国
</div>
</div>
</div>
... ...
... ... @@ -68,16 +68,16 @@
width: 2.28rem;
height: 3.1rem;
display: flex;
margin:0 0.3rem;
margin:0 0.18rem;
}
.pic4_banner_mid img{
width: 100%;
height: 100%;
}
.swiper-slide-active{
width: 3.1rem;
height: 100%;
}
/*.swiper-slide-active{*/
/*width: 3.1rem;*/
/*height: 100%;*/
/*}*/
.swiper-wrapper{
display: flex;
align-items: center;
... ...
... ... @@ -124,7 +124,7 @@
<img src="../images/bicon_22@2x.png">
</div>
<div class="mid_box_text">
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
可耐美可耐美可耐美可耐美可耐美可耐美可耐美可耐美可耐美可耐美
</div>
</div>
... ...