Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge

src/forge/Settings/Index.js

@@ -53,7 +53,7 @@ class Index extends Component {
                 </Link>
               </p>
             </li>
-            <li
+            {/* <li
               className={
                 pathname.indexOf("setting/branch") > -1 ? "active" : ""
               }
@@ -63,8 +63,9 @@ class Index extends Component {
                 <i className="iconfont icon-fenzhi font-20 mr10"></i>
                   分支设置
                 </Link>
+  
               </p>
-            </li>
+            </li> */}
             <li
               className={pathname.indexOf("setting/tags") > -1 ? "active" : ""}
             >
@@ -76,18 +77,18 @@ class Index extends Component {
               </p>
             </li>
 
-            <li
+            {/* <li
               className={
                 pathname.indexOf("setting/hooks") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/projects/${projectsId}/setting/hooks`} className="w-100">
+                <Link to={"javascript:void(0)"} className="w-100">
                 <i className="iconfont icon-zhongqingdianxinicon10 font-18 mr10"></i>
                   管理Web钩子
                 </Link>
               </p>
-            </li>
+            </li> */}
           </ul>
         </div>
         <div className="list-right">

src/forge/Settings/Setting.js

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Form, Input, Checkbox, Select } from "antd";
 
 import axios from "axios";
+import "./setting.css";
 const { TextArea } = Input;
 const { Option } = Select;
 class Setting extends Component {
@@ -145,8 +146,10 @@ class Setting extends Component {
     const { CategoryList, LanguageList, private_check } = this.state;
     return (
       <div>
-        <div className="normalBox">
-          <div className="normalBox-title font-16">基本设置</div>
+        <div className="">
+          <div className="flex-a-center baseForm bbr">
+            <span className="font-18 fwb text-black">基本设置</span>
+            </div>
           <Form className="baseForm">
             <Form.Item label="项目名称">
               {getFieldDecorator("project_name", {
@@ -210,7 +213,7 @@ class Setting extends Component {
             </p>
           </Form>
         </div>
-        <div className="dangerousBox">
+        <div className="dangerousBox mb20">
           <div className="dangerousTitle">危险操作区</div>
           <div className="flex-a-center padding15-10">
             <div>

src/forge/Settings/new_tags.js

@@ -1,7 +1,8 @@
 import React , {Component} from 'react';
-import { Dropdown , Icon , Menu , Pagination, Modal,Input,Popconfirm,Form, Spin } from 'antd';
+import { Dropdown , Icon , Menu , Pagination, Modal,Input,Popconfirm,Form, Spin, Button } from 'antd';
 import { Link } from 'react-router-dom';
 import '../Order/order.css'
+import "./setting.css";
 import NoneData from '../Nodata';
 import { SketchPicker } from 'react-color'
 import reactCSS from 'reactcss'
@@ -330,22 +331,23 @@ class NewTags extends Component{
     }
 
     return(
-      <div className="main">
-        <div className="normalBox">
-          <div className="normalBox-title font-16 topWrapper_select" style={{"justify-content":"space-between"}}>
-            <span className="topWrapper_select">项目标签</span>
+      <div className="">
+        <div className="flex-a-center baseForm bbr" style={{"justify-content":"space-between"}}>
+            <span className="font-18 fwb text-black">项目标签</span>
             {
               data && data.user_admin_or_member ?
-                <div className="topWrapper_select">
-                  <a onClick={this.newshow} className="topWrapper_btn" >创建标签</a>
-                </div>
+              <Button type="primary" onClick={this.newshow}>
+                <Icon type="plus"></Icon>
+                创建标签
+              </Button>
 
                 : ''
             }
           </div>
+        <div>
           <div style={{display: this.state.display}} className="padding15">
             <Form>
-              <div className="tagdiv" >
+              <div className="new-tag-div" >
                 <Form.Item
                   className="inptwidth"
                 >
@@ -386,7 +388,10 @@ class NewTags extends Component{
                 </div>
                 <div className="fr" style={{marginTop:5}}>
                 <Spin spinning={isSpin}>
-                  <a onClick={this.createtagpost} className="topWrapper_btn fr" >创建标签</a>
+                  <Button type="primary" onClick={this.createtagpost} className="fr">
+                  创建标签
+                  </Button>
+                  {/* <a onClick={this.createtagpost} className="topWrapper_btn fr" >创建标签</a> */}
                   <a onClick={this.newclose} className="a_btn cancel_btn fr" >取消</a>
                 </Spin>
                  

src/forge/Settings/setting.css

@@ -114,4 +114,13 @@
 .text-yellow{color: #FF6E21 !important;}
 .text-delete{color: #BBBBBB; }
 .text-delete:hover{color: #db2828; }
+.new-tag-div{
+  padding: 15px;
+  height: 75px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  background: #fafafa;
+  flex-wrap: wrap;
+}
 

src/forge/UsersList/fork_users.js

@@ -101,7 +101,7 @@ class ForkUsers extends Component {
                 <div className="ml12">
                   <div>
                     <Link
-                      to={`/users/${item.login}/projects`}
+                      to={`/projects/${item.id}`}
                       className="font-16 text-primary hide-1 task-hide max-w-200"
                     >
                       {item.name}