Merge branch 'dev_wenba' of https://git.trustie.net/caishi/forgeplus-react into dev_wenba

# Conflicts:
#	public/css/edu-purge.css
#	src/Nav/Footer.jsx
#	src/modules/tpm/TPMIndex.css

package-lock.json

@@ -1959,7 +1959,7 @@
     },
     "babel-plugin-transform-runtime": {
       "version": "6.23.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -2029,7 +2029,7 @@
     },
     "babel-preset-react": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.3.13",
@@ -3326,7 +3326,7 @@
     },
     "code-prettify": {
       "version": "0.1.0",
-      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
       "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
     },
     "codemirror": {

src/Nav/Index.scss

@@ -66,3 +66,85 @@
     }
   }
 }
+
+
+.footEdition{
+  background-color: #171B23;
+  .footContent{
+    display: flex;
+    align-items: flex-start;
+    padding:86px 0px;
+    justify-content: space-around;
+    width: 1200px;
+    margin:0px auto;
+    ul{
+      min-width: 120px;
+      text-align: left;
+      margin-right: 80px;
+      &.center{
+        text-align: center;
+      }
+      &>p{
+        height: 22px;
+        font-size: 16px;
+        font-weight: 400;
+        color: #FFFFFF;
+        line-height: 22px;
+      }
+      &>img{
+        width: 100px;
+        height: 100%;
+        margin-bottom: 30px;
+        margin-top: 25px;
+        border-radius: 10px;
+      }
+      li{
+        height: 20px;
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 20px;
+        color: #BDC2D1;
+        margin-bottom: 15px!important;
+        a{
+          color: #BDC2D1!important;
+          &:hover{
+            text-decoration: underline;
+          }
+        }
+        &.thehead{
+          height: 25px;
+          font-size: 18px;
+          font-weight: 600;
+          color: #FFFFFF;
+          line-height: 25px;
+          margin-bottom: 20px!important;
+        }
+      }
+      .theline{
+        .imgCon{
+          width: 90px;
+          height: 90px;
+          padding:5px;
+          border-radius: 4px;
+          background-color: #fff;
+          img{
+            width: 100%;
+            border-radius: 3px;
+          }
+        }
+      }
+    }
+  }
+}
+.copyrightDesc{
+  font-size: 12px;
+  font-weight: 400;
+  color: #BDC2D1;
+  line-height: 28px;
+  padding:15px 0px;
+  text-align: center;
+  background-color: #1B212C;
+  a{
+    color: #BDC2D1!important;
+  }
+}

src/forge/css/index.scss

@@ -200,3 +200,4 @@ form{
     padding:0px;
   }
 }
+