liting2017 6 éve%!(EXTRA string=óta)
szülő
commit
e4afb7d6f0
3 módosított fájl, 4 hozzáadás és 35 törlés
  1. 4 16
      src/css/newMenu/demand.css
  2. 0 15
      src/css/newMenu/header.css
  3. 0 4
      webpack.config.js

+ 4 - 16
src/css/newMenu/demand.css

@@ -71,7 +71,7 @@
     padding: 10px 0;
     box-sizing: border-box;
     width: 19.6%;
-    display: inline-block;
+    float: left;
 }
 .newDemand ul li a{
     color: #666;
@@ -90,7 +90,9 @@
     float: right;
     margin-top: 3px;
 }
-
+.newDemand ul li div p:nth-child(2){
+    height: 40px;
+}
 /* HOT */
 
 .mainHot .hot {
@@ -157,7 +159,6 @@
     margin-bottom: 16px;
     padding: 5px 0;;
     width: 100%;
-<<<<<<< HEAD
     transition:  all .5s ease-out;
 }
 .demandTxt .col-md-7>div:hover{
@@ -166,8 +167,6 @@
 }
 .demandTxt .col-md-7>div:hover .name{
     color: #ff5910;
-=======
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
 }
 .demandTxt .col-md-7 div a{
     color:#333;
@@ -219,10 +218,6 @@
     float: right;
     margin-left: 20px;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
 .demandTxt .colorOrange{
     vertical-align: top;
     margin-top: -20px;
@@ -247,22 +242,15 @@
 .talentsTxt ol li {
     padding: 5px 5px 0px;
     height: 56px;
-<<<<<<< HEAD
-    transition: all .5s ease-out;
-=======
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     margin-bottom: 30px;
 }
 .talentsTxt ol li img{
     float: right;
 }
-<<<<<<< HEAD
 .talentsTxt ol li:hover{
     margin-left: -8px;
     transition: all .5s ease-in
 }
-=======
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
 .introduceP{
     padding-left: 10px; 
     margin-top: 12px;

+ 0 - 15
src/css/newMenu/header.css

@@ -305,25 +305,15 @@ input:focus{
 
 .colorWrite {
     color: #ccc;
-<<<<<<< HEAD
     height: 40px;
-=======
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     margin: 12px 0px;
 }
 
 .navMeau .menuList {
-<<<<<<< HEAD
     /* display: none; */
     position: absolute;
     top: 55px;
     padding: 20px 20px 40px;
-=======
-    display: none;
-    position: absolute;
-    top: 55px;
-    padding: 20px 20px 60px;
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     left: 0;
     z-index: 99999;
     background: #3b3b3b;
@@ -335,13 +325,8 @@ input:focus{
     float: left;
     box-sizing: border-box;
     width: 50%;
-<<<<<<< HEAD
     height: 36px;
     line-height: 36px;
-=======
-    height: 40px;
-    line-height: 40px;
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     text-align: center
 }
 

+ 0 - 4
webpack.config.js

@@ -268,11 +268,7 @@ module.exports = (function () {
             disableHostCheck: true,
             host: '192.168.1.106',
             port: 80,
-<<<<<<< HEAD
             allowedHosts: ['127.0.0.1','192.168.1.222'],
-=======
-            allowedHosts: ['127.0.0.1','192.168.1.101'],
->>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }