Browse Source

样式优化

zhuth 6 years ago
parent
commit
ba4bcf2684

+ 1 - 1
src/components/common/filterBox/filterBox.jsx

@@ -562,7 +562,7 @@ class FilterBox extends React.Component {
                 title='筛选条件'
                 visible={visibleFilterBox}
                 footer={<div>
-                    <Button className='btn-clear' type='danger' onClick={this.removeAllFilters}>清空条件</Button>
+                    <Button onClick={this.removeAllFilters}>清空条件</Button>
                     <Button onClick={hideFilterBox}>取消</Button>
                     <Button type='primary' onClick={this.getFilters}>确定</Button>
                     </div>

+ 0 - 6
src/components/common/filterBox/filterBox.less

@@ -16,12 +16,6 @@
     div {
       button:first-child {
         float: left;
-        &.btn-clear {
-          background: transparent;
-          box-shadow: none;
-          border: none;
-          text-shadow: none;
-        }
       }
     }
   }

+ 1 - 1
src/components/common/filterBox/filterBox2.jsx

@@ -608,7 +608,7 @@ class FilterBox extends React.Component {
                 title='筛选条件'
                 visible={visibleFilterBox}
                 footer={<div>
-                    <Button className='btn-clear' type='danger' onClick={this.removeAllFilters}>清空条件</Button>
+                    <Button onClick={this.removeAllFilters}>清空条件</Button>
                     <Button onClick={hideFilterBox}>取消</Button>
                     <Button type='primary' onClick={this.getFilters}>确定</Button>
                     </div>

+ 1 - 1
src/components/dataSourceDetail/dataConnectBox.jsx

@@ -131,7 +131,7 @@ class DataConnectBox extends React.Component {
                     operation === 'view' ? null : (
                         <Row type='flex' justify='space-between'>
                             <Col>
-                                <Button type='danger' disabled={dataConnect.newOne.validating || dataConnect.newOne.saving} onClick={() => {
+                                <Button disabled={dataConnect.newOne.validating || dataConnect.newOne.saving} onClick={() => {
                                     dispatch({ type:'dataConnect/resetNewModel'});
                                     this.setState({
                                         password: '',

+ 1 - 0
src/themes/default/base.less

@@ -53,6 +53,7 @@ input::-webkit-input-placeholder {
     background-color: #2C82BE;
 }
 .ant-btn-disabled.tool-link, .ant-btn.disabled.tool-link, .ant-btn[disabled].tool-link, .ant-btn-disabled.tool-link:hover, .ant-btn.disabled.tool-link:hover, .ant-btn[disabled].tool-link:hover, .ant-btn-disabled.tool-link:focus, .ant-btn.disabled.tool-link:focus, .ant-btn[disabled].tool-link:focus, .ant-btn-disabled.tool-link:active, .ant-btn.disabled.tool-link:active, .ant-btn[disabled].tool-link:active, .ant-btn-disabled.active.tool-link, .ant-btn.disabled.active.tool-link, .ant-btn[disabled].active.tool-link {
+    color: rgba(0, 0, 0, 0.25);
     background-color: #f5f5f5;
     border-color: #ccc;
 }