Skip to content

T
test
提交 05807ed7 作者: 武宏岩
操作

解决ie不能加载过度效果问题 #13

上级 b695f1cb f7adb572
正在显示 包含 45 行增加 和 35 行删除
.gitlab-ci.yml
......@@ -58,7 +58,7 @@ build_push_image_pred:
remote_run_image_dev:
stage: deploy
script:
- bash ~/.local/bin/f200.sh $CONTAINER_NAME 7084 80 $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
- bash ~/.local/bin/f200.sh $CONTAINER_NAME 8066 80 $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
tags:
- shell-200
only:
......@@ -69,7 +69,7 @@ remote_run_image_pred:
stage: deploy
script:
- bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME 7084 80 $PRED_REPO:$CONTAINER_NAME zp 39.106.144.161
- bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME 8066 80 $PROD_REPO:$CONTAINER_NAME zp 39.106.144.161
tags:
- shell-prod
only:
......
Dockerfile
FROM registry-vpc.cn-beijing.aliyuncs.com/qianjia2018/qianjia_public:dist-node as build-stage
WORKDIR /app
COPY package*.json ./
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh
RUN npm config set registry http://172.18.0.1:9000/repository/node-public && npm install
COPY . .
RUN npm run lan
# FROM registry-vpc.cn-beijing.aliyuncs.com/qianjia2018/qianjia_public:dist-node as build-stage
# WORKDIR /app
# COPY package*.json ./
# RUN apk update && apk upgrade && \
# apk add --no-cache bash git openssh
# RUN npm config set registry http://172.18.0.1:9000/repository/node-public && npm install
# COPY . .
# RUN npm run lan
FROM registry-vpc.cn-beijing.aliyuncs.com/qianjia2018/qianjia_public:dist-nginx as production-stage
#FROM nginx:1.13.12-alpine as production-stage
COPY --from=build-stage /app/dist /usr/share/nginx/html
# FROM registry-vpc.cn-beijing.aliyuncs.com/qianjia2018/qianjia_public:dist-nginx as production-stage
# #FROM nginx:1.13.12-alpine as production-stage
# COPY --from=build-stage /app/dist /usr/share/nginx/html
# EXPOSE 80
# CMD ["nginx", "-g", "daemon off;"]
FROM nginx:1.13.12-alpine as production-stage
COPY . /usr/share/nginx/html
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
about.html
......@@ -23,8 +23,7 @@
<!-- 固定导航 -->
<div id="top_nav" class="header_scroll">
<div class="main_body clear">
<a class="logo left" href="./index.html#header">
</a>
<a class="logo left" href="./index.html#header"></a>
<div class="nav right">
<a class="nav_first" href="./index.html#header">首页</a>
<a href="./index.html#introduce">公司介绍</a>
......@@ -402,10 +401,11 @@
<img src="./images/white_logo.png" alt="">
</div>
<p class="support">千家网络科技提供技术支持</p>
<span>唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.冀ICP备14024444号-1</span>
<p class="bottom_title">唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.</p>
<a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
class="clear filing_information">
<img class="left" src="./images/filing_information.png" alt="">
class=" filing_information">
<img src="./images/filing_information.png" alt="">
<span>冀ICP备14024444号-1</span>
</a>
</footer>
</body>
......
contactus.html
......@@ -23,8 +23,7 @@
<!-- 固定导航 -->
<div id="top_nav" class="header_scroll">
<div class="main_body clear">
<a class="logo left" href="./index.html#header">
</a>
<a class="logo left" href="./index.html#header"></a>
<div class="nav right">
<a class="nav_first" href="./index.html#header">首页</a>
<a href="./index.html#introduce">公司介绍</a>
......@@ -344,9 +343,11 @@
<img src="./images/white_logo.png" alt="">
</div>
<p class="support">千家网络科技提供技术支持</p>
<span>唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.冀ICP备14024444号-1</span>
<a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window" class="clear filing_information">
<img class="left" src="./images/filing_information.png" alt="">
<p class="bottom_title">唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.</p>
<a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
class=" filing_information">
<img src="./images/filing_information.png" alt="">
<span>冀ICP备14024444号-1</span>
</a>
</footer>
</body>
......
css/about.css
......@@ -392,7 +392,8 @@ header {
border-radius: 50%;
background: url(../images/switch.jpg);
z-index: 100;
}
overflow: hidden;
}
#video_banner .box_show li video{
object-fit: fill;
width:100%;
......
css/index.css
......@@ -1326,7 +1326,7 @@
/* 发展历程 */
#cours {
height: 800px;
background: url('../images/cours_img.jpg') no-repeat center;
background: url('../images/cours_img.png') no-repeat center;
}
#cours .cours_content {
......@@ -1528,7 +1528,7 @@
/* 荣誉资质 */
#honor {
margin-bottom: 80px;
/* margin-bottom: 80px; */
}
#honor .honor_content {
text-align: center;
......@@ -1646,7 +1646,7 @@
background: #192d3b;
}
#footer img {
#footer .service_img img {
padding-top: 25px;
display: block;
margin: auto;
......@@ -1662,7 +1662,7 @@
margin-top: 12px;
}
#footer span {
#footer .bottom_title {
font-size: 12px;
line-height: 12px;
color: rgba(255, 255, 255, .6);
......@@ -1672,17 +1672,21 @@
}
#footer .filing_information {
width: 20px;
display: block;
margin-left: 50%;
transform: translate(-10px);
margin-top: 10px;
text-decoration:none;
position: relative;
left:50%;
top:10px;
margin-left:-71px;
}
#footer .filing_information img {
width: 20px;
height: 20px;
padding-top: 0;
}
#footer .filing_information span{
color: rgba(255, 255, 255, .6);
font-size: 12px;
line-height: 20px;
}
/* 自定义动画 */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论