合并分支 'dev' 到 'release'

ie中logo图片变形问题

查看合并请求 QJMIS-CPD/CPD_company_site/web_company_site!13

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-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

css/index.css

@@ -21,14 +21,11 @@
 /* logo */
 #top_nav .logo {
     cursor: pointer;
+    width: 238px;
+    height: 50px;
+    background: url("../images/logo-02.svg") no-repeat;
 }
 
-#top_nav .logo img {
-    display: block;
-    margin-right: 12px;
-    width: 239px;
-
-}
 
 /* 导航栏 */
 #top_nav .nav {
@@ -713,10 +710,17 @@
     height: 380px;
     background: #fafafa;
     border-radius: 50%;
+    margin: auto;
+}
+#skynet .box_system{
+    width: 100%;
+    height: 380px;
+    position: absolute;
+    top: 110px;
 }
 
 #skynet .test .donkey {
-    margin-top: 140px;
+    padding-top: 140px;
     font-size: 45px;
     color: #12ab8d;
     font-family: "Microsoft Yahei";

index.html

@@ -30,7 +30,7 @@
         <div id="top_nav" class="header_scroll">
             <div class="main_body clear">
                 <a class="logo left" href="./index.html#header">
-                    <img src="./images/logo-02.svg" alt="" class="left">
+                    
                 </a>
                 <div class="nav right">
                     <a class="nav_first" href="./index.html#header">首页</a>
@@ -233,11 +233,13 @@
         </div>
     </div>
     <div id="skynet" class="wow main_body">
+        <div class="box_system">
             <div class="test">
                 <div class="donkey">天网监察体系</div>
                 <div class="sunspot">稽核中心 +MIS</div>
             </div>
         </div>
+    </div>
     <div id="hover" class="main_body">
         <ul>
             <li>新增房源<br>系统验真<span class="arrow"></span></li>