diff --git a/frontend/src/css/log-filter.css b/frontend/src/css/log-filter.css index 7edae4d80b..46b0240b41 100644 --- a/frontend/src/css/log-filter.css +++ b/frontend/src/css/log-filter.css @@ -1,74 +1,76 @@ - .activity-details { - text-decoration: underline; - cursor: pointer; - } - .activity-details:hover { - color: #212529; - } - .mobile-activity-time { - display: inline-block; - margin-bottom: .2em; - } - - .cur-activity-modifiers { - margin-left: -0.5rem; - } - - .cur-activity-modifiers:hover { - background: #f5f5f5; - cursor: pointer; - } - - .cur-activity-modifiers .toggle-icon { - color: #999; - } +.activity-details { + text-decoration: underline; + cursor: pointer; +} - .activity-modifier-selector-container { - width: 320px; - background: #fff; - border: 1px solid #e8e8e8; - margin-top: 2px; - z-index: 2; - } - - .activity-selected-modifiers { - min-height: 2rem; - background: #f6f6f6; - border-bottom: 1px solid #dde2ea; - line-height: 1; - } - - .activity-selected-modifier { - display: inline-flex; - align-items: center; - margin-right: 10px; - padding: 0 8px 0 2px; - border-radius: 10px; - background: #eaeaea; - } - - .unselect-activity-user { - color: #909090; - cursor: pointer; - } - - .unselect-activity-user:hover { - color: #5a5a5a; - } - - .activity-user-list { - min-height: 4rem; - max-height: 200px; - } - - .activity-user-item { - cursor: pointer; - } - - .activity-user-item:hover { - background: #f5f5f5; - } - - .activity-user-name { - font-size: 14px; - } +.activity-details:hover { + color: #212529; +} + +.mobile-activity-time { + display: inline-block; + margin-bottom: .2em; +} + +.cur-activity-modifiers { + margin-left: -0.5rem; +} + +.cur-activity-modifiers:hover { + background: #f5f5f5; + cursor: pointer; +} + +.cur-activity-modifiers .toggle-icon { + color: #999; +} + +.activity-modifier-selector-container { + width: 320px; + background: #fff; + border: 1px solid #e8e8e8; + margin-top: 2px; + z-index: 2; +} + +.activity-selected-modifiers { + min-height: 2rem; + background: #f6f6f6; + border-bottom: 1px solid #dde2ea; + line-height: 1; +} + +.activity-selected-modifier { + display: inline-flex; + align-items: center; + margin-right: 10px; + padding: 0 8px 0 2px; + border-radius: 10px; + background: #eaeaea; +} + +.unselect-activity-user { + color: #909090; + cursor: pointer; +} + +.unselect-activity-user:hover { + color: #5a5a5a; +} + +.activity-user-list { + min-height: 4rem; + max-height: 200px; +} + +.activity-user-item { + cursor: pointer; +} + +.activity-user-item:hover { + background: #f5f5f5; +} + +.activity-user-name { + font-size: 14px; +} diff --git a/frontend/src/pages/dashboard/files-activities.js b/frontend/src/pages/dashboard/files-activities.js index f501a9e504..192a0aad4c 100644 --- a/frontend/src/pages/dashboard/files-activities.js +++ b/frontend/src/pages/dashboard/files-activities.js @@ -235,7 +235,7 @@ class FilesActivities extends Component { const { onlyMine } = this.props; const { targetUsers, availableUsers } = this.state; return ( -
+
    diff --git a/frontend/src/pages/dashboard/log-repo-selector.js b/frontend/src/pages/dashboard/log-repo-selector.js index 158d22f9e6..dac36ddc35 100644 --- a/frontend/src/pages/dashboard/log-repo-selector.js +++ b/frontend/src/pages/dashboard/log-repo-selector.js @@ -2,10 +2,11 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Input } from 'reactstrap'; import { gettext } from '../../utils/constants'; -import '../../css/log-filter.css'; import { Utils } from '../../utils/utils'; import toaster from '../../components/toast'; +import '../../css/log-filter.css'; + const propTypes = { items: PropTypes.array.isRequired, selectedItems: PropTypes.array.isRequired, diff --git a/frontend/src/pages/dashboard/log-user-selector.js b/frontend/src/pages/dashboard/log-user-selector.js index 7f22e51bd5..c380141d4a 100644 --- a/frontend/src/pages/dashboard/log-user-selector.js +++ b/frontend/src/pages/dashboard/log-user-selector.js @@ -2,10 +2,11 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Input } from 'reactstrap'; import { gettext } from '../../utils/constants'; -import '../../css/log-filter.css'; import { Utils } from '../../utils/utils'; import toaster from '../../components/toast'; +import '../../css/log-filter.css'; + const propTypes = { componentName: PropTypes.string.isRequired, items: PropTypes.array.isRequired, diff --git a/frontend/src/pages/org-admin/org-logs-file-transfer.js b/frontend/src/pages/org-admin/org-logs-file-transfer.js index 34e59908bf..df27361a97 100644 --- a/frontend/src/pages/org-admin/org-logs-file-transfer.js +++ b/frontend/src/pages/org-admin/org-logs-file-transfer.js @@ -1,14 +1,15 @@ import React from 'react'; import PropTypes from 'prop-types'; import dayjs from 'dayjs'; +import { Link } from '@gatsbyjs/reach-router'; +import toaster from '../../components/toast'; +import { Utils } from '../../utils/utils'; import { orgAdminAPI } from '../../utils/org-admin-api'; import { siteRoot, gettext, lang } from '../../utils/constants'; -import { Utils } from '../../utils/utils'; -import toaster from '../../components/toast'; import OrgLogsFileTransferEvent from '../../models/org-logs-file-transfer'; -import '../../css/org-logs.css'; import UserLink from './user-link'; -import { Link } from '@gatsbyjs/reach-router'; + +import '../../css/org-logs.css'; dayjs.locale(lang); diff --git a/frontend/src/pages/org-admin/org-logs-group-member-audit.js b/frontend/src/pages/org-admin/org-logs-group-member-audit.js index 413e1956f2..a8b8909c46 100644 --- a/frontend/src/pages/org-admin/org-logs-group-member-audit.js +++ b/frontend/src/pages/org-admin/org-logs-group-member-audit.js @@ -1,14 +1,15 @@ import React from 'react'; import PropTypes from 'prop-types'; import dayjs from 'dayjs'; +import { Link } from '@gatsbyjs/reach-router'; import { orgAdminAPI } from '../../utils/org-admin-api'; import { siteRoot, gettext, lang } from '../../utils/constants'; import { Utils } from '../../utils/utils'; import toaster from '../../components/toast'; import OrgGroupMemberAuditLog from '../../models/org-logs-group-member-audit'; -import '../../css/org-logs.css'; import UserLink from './user-link'; -import { Link } from '@gatsbyjs/reach-router'; + +import '../../css/org-logs.css'; dayjs.locale(lang); diff --git a/frontend/src/pages/org-admin/web-settings/web-settings.js b/frontend/src/pages/org-admin/web-settings/web-settings.js index 808978362a..9f5a0e7dd7 100644 --- a/frontend/src/pages/org-admin/web-settings/web-settings.js +++ b/frontend/src/pages/org-admin/web-settings/web-settings.js @@ -1,4 +1,5 @@ import React, { Component, Fragment } from 'react'; +import { InputGroupText } from 'reactstrap'; import { Utils } from '../../../utils/utils'; import { orgAdminAPI } from '../../../utils/org-admin-api'; import { gettext, mediaUrl, logoPath, orgID, orgEnableAdminCustomLogo, orgEnableAdminCustomName, enableMultiADFS } from '../../../utils/constants'; @@ -8,10 +9,9 @@ import MainPanelTopbar from '../main-panel-topbar'; import Section from './section'; import InputItem from './input-item'; import FileItem from './file-item'; -import { InputGroupText } from 'reactstrap'; +import CheckboxItem from '../../sys-admin/web-settings/checkbox-item'; import '../../../css/system-admin-web-settings.css'; -import CheckboxItem from '../../sys-admin/web-settings/checkbox-item'; const { sysEnableUserCleanTrash, sysEnableEncryptedLibrary } = window.org.pageOptions;