diff --git a/src/app.css b/src/app.css index dfaad79..a2b2ea6 100644 --- a/src/app.css +++ b/src/app.css @@ -19,11 +19,10 @@ border-bottom: 1px solid #e7eaec; border-radius: 12px 12px 0 0; } - -.plugin-map-dialog-en .full-screen-active { - background-color: #e0e0e0; - border-radius: 2px; - color: #404040; +.full-screen-active { + background-color: rgba(0, 0, 0, 0.04) !important; + border-radius: 4px; + color: #666; } .plugin-map-dialog-en .dtable-map-plugin-title .modal-title { @@ -63,14 +62,14 @@ width: 24px; height: 24px; font-size: 16px; - color: #000; - opacity: .5; + color: #666; text-align: center; cursor: pointer; + border-radius: 4px; } .plugin-map-dialog-en .dtable-map-plugin-title .map-operator:hover { - opacity: .75; + background-color: rgba(0, 0, 0, 0.04) !important; } .plugin-map-dialog-en .btn-margin-right { diff --git a/src/components/dialog/new-view-dialog.js b/src/components/dialog/new-view-dialog.js index 5b1446e..a3817f2 100644 --- a/src/components/dialog/new-view-dialog.js +++ b/src/components/dialog/new-view-dialog.js @@ -1,7 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Modal, ModalBody, ModalHeader, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap'; +import { Modal, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap'; import intl from 'react-intl-universal'; +import { DTableModalHeader } from 'dtable-ui-component'; const propTypes = { onNewViewConfirm: PropTypes.func, @@ -44,7 +45,7 @@ class NewViewDialog extends React.Component { render() { return ( - {intl.get('New_view')} + {intl.get('New_view')}
diff --git a/src/components/dialog/rename-view-dialog.js b/src/components/dialog/rename-view-dialog.js index 627267b..f9894dc 100644 --- a/src/components/dialog/rename-view-dialog.js +++ b/src/components/dialog/rename-view-dialog.js @@ -1,7 +1,8 @@ import React, { Component } from 'react'; -import { Modal, ModalBody, ModalHeader, ModalFooter, Form, FormGroup, Label, Input, Button, Alert } from 'reactstrap'; +import { Modal, ModalBody, ModalFooter, Form, FormGroup, Label, Input, Alert, Button } from 'reactstrap'; import PropTypes from 'prop-types'; import intl from 'react-intl-universal'; +import { DTableModalHeader } from 'dtable-ui-component'; const propTypes = { viewName: PropTypes.string, @@ -54,7 +55,7 @@ class RenameViewDialog extends Component { render() { return ( - {intl.get('Rename_view')} + {intl.get('Rename_view')} diff --git a/src/components/location-settings.js b/src/components/location-settings.js index cf063bb..05d8428 100644 --- a/src/components/location-settings.js +++ b/src/components/location-settings.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import LocationSettingsItem from './local-settings-widgets/location-settings-item'; import intl from 'react-intl-universal'; import { getTableByName, getViewByName, getViewShownColumns } from 'dtable-utils'; -import { FieldDisplaySetting, DTableSwitch } from 'dtable-ui-component'; +import { FieldDisplaySetting, DTableSwitch, IconButton } from 'dtable-ui-component'; import { MAP_MODE, SETTING_TITLE } from '../constants.js'; import getConfigItemByType from '../utils/get-config-item-by-type'; @@ -123,7 +123,7 @@ class LocationSettings extends Component {

{intl.get('Settings')}

- +
diff --git a/src/components/view-tabs.js b/src/components/view-tabs.js index 8dd2c8e..45996de 100644 --- a/src/components/view-tabs.js +++ b/src/components/view-tabs.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { ModalPortal } from 'dtable-ui-component'; +import { ModalPortal, IconButton } from 'dtable-ui-component'; import NewViewDialog from './dialog/new-view-dialog'; import RenameViewDialog from './dialog/rename-view-dialog'; import DropdownMenu from './dropdownmenu'; @@ -383,8 +383,13 @@ class ViewTabs extends Component {
} -
- +
+
{isShowNewViewDialog &&
- - - - + + + +