mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-25 14:50:29 +00:00
V5 rtl fixup (#7622)
* [system admin, org admin] departments: fixup for the 'New Department' button after the upgrade of seafile-ui.css(bootstrap v4 to v5) * [wiki] removed unused code * [Activities] fixup for mobile after the upgrade of seafile-ui.css(bootstrap v4 to v5) * [repo snapshot] fixed the split line after the upgrade of seafile-ui.css(bootstrap v4 to v5) * [system admin, org admin] statistic: fixed & improved the 'days' selecting toolbar
This commit is contained in:
@@ -6,21 +6,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.sys-stat-tool {
|
.sys-stat-tool {
|
||||||
display: flex;
|
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
color: #212529;
|
color: #212529;
|
||||||
}
|
}
|
||||||
|
|
||||||
.system-statistic-item {
|
|
||||||
border: 1px solid #c5c5c5;
|
|
||||||
padding: 5px 10px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.system-statistic-item:hover {
|
|
||||||
background: #efefef;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sys-stat-tool .item-active {
|
.sys-stat-tool .item-active {
|
||||||
background: #efefef;
|
background: #efefef;
|
||||||
}
|
}
|
||||||
@@ -32,7 +21,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.system-statistic-input {
|
.system-statistic-input {
|
||||||
height: 31px;
|
height: 32px;
|
||||||
width: 120px;
|
width: 120px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,9 +87,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.system-statistic-button {
|
.system-statistic-button {
|
||||||
margin-left: 1rem;
|
margin-left: .5rem;
|
||||||
height: 30px;
|
height: 32px;
|
||||||
font-weight: normal;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.rc-calendar table {
|
.rc-calendar table {
|
||||||
|
@@ -220,7 +220,7 @@ class ActivityItem extends Component {
|
|||||||
<p className="m-0 text-secondary">{op}</p>
|
<p className="m-0 text-secondary">{op}</p>
|
||||||
{details}
|
{details}
|
||||||
</td>
|
</td>
|
||||||
<td className="text-right align-top">
|
<td className="text-end align-top">
|
||||||
<span className="text-secondary mobile-activity-time">
|
<span className="text-secondary mobile-activity-time">
|
||||||
<time datetime={item.time} is="relative-time" title={dayjs(item.time).format('dddd, MMMM D, YYYY h:mm:ss A')}>{dayjs(item.time).fromNow()}</time>
|
<time datetime={item.time} is="relative-time" title={dayjs(item.time).format('dddd, MMMM D, YYYY h:mm:ss A')}>{dayjs(item.time).fromNow()}</time>
|
||||||
</span>
|
</span>
|
||||||
|
@@ -37,7 +37,7 @@ class DepartmentsTreePanel extends Component {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
<button
|
<button
|
||||||
className='btn btn-secondary btn-block text-left border-0 font-weight-normal new-dept-btn shadow-none'
|
className='btn btn-secondary btn-block text-start border-0 font-weight-normal new-dept-btn shadow-none'
|
||||||
onClick={() => {this.props.toggleAddDepartment(null);}}
|
onClick={() => {this.props.toggleAddDepartment(null);}}
|
||||||
>
|
>
|
||||||
<i className="sf3-font sf3-font-new new-dept-btn-icon"></i>
|
<i className="sf3-font sf3-font-new new-dept-btn-icon"></i>
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
import React, { Fragment } from 'react';
|
import React, { Fragment } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { Button } from 'reactstrap';
|
import { Button, ButtonGroup } from 'reactstrap';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import { gettext } from '../../../utils/constants';
|
import { gettext } from '../../../utils/constants';
|
||||||
import Picker from './picker';
|
import Picker from './picker';
|
||||||
@@ -108,11 +108,11 @@ class StatisticCommonTool extends React.Component {
|
|||||||
<Fragment>
|
<Fragment>
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
<div className="system-statistic-time-range">
|
<div className="system-statistic-time-range">
|
||||||
<div className="sys-stat-tool">
|
<ButtonGroup size="sm" className="sys-stat-tool">
|
||||||
<div className={`system-statistic-item border-right-0 rounded-left ${statisticType === 'oneWeek' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneWeek')}>{gettext('7 Days')}</div>
|
<Button className={`font-weight-normal ${statisticType === 'oneWeek' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneWeek')}>{gettext('7 Days')}</Button>
|
||||||
<div className={`system-statistic-item border-right-0 ${statisticType === 'oneMonth' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneMonth')}>{gettext('30 Days')}</div>
|
<Button className={`font-weight-normal ${statisticType === 'oneMonth' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneMonth')}>{gettext('30 Days')}</Button>
|
||||||
<div className={`system-statistic-item rounded-right ${statisticType === 'oneYear' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneYear')}>{gettext('1 Year')}</div>
|
<Button className={`font-weight-normal ${statisticType === 'oneYear' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneYear')}>{gettext('1 Year')}</Button>
|
||||||
</div>
|
</ButtonGroup>
|
||||||
<div className="system-statistic-input-container">
|
<div className="system-statistic-input-container">
|
||||||
<Picker
|
<Picker
|
||||||
disabledDate={this.disabledStartDate}
|
disabledDate={this.disabledStartDate}
|
||||||
|
@@ -37,7 +37,7 @@ class DepartmentsTreePanel extends Component {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
<button
|
<button
|
||||||
className='btn btn-secondary btn-block text-left border-0 font-weight-normal new-dept-btn shadow-none'
|
className='btn btn-secondary btn-block text-start border-0 font-weight-normal new-dept-btn shadow-none'
|
||||||
onClick={() => {this.props.toggleAddDepartment(null);}}
|
onClick={() => {this.props.toggleAddDepartment(null);}}
|
||||||
>
|
>
|
||||||
<i className="sf3-font sf3-font-new new-dept-btn-icon"></i>
|
<i className="sf3-font sf3-font-new new-dept-btn-icon"></i>
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
import React, { Fragment } from 'react';
|
import React, { Fragment } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { Button } from 'reactstrap';
|
import { Button, ButtonGroup } from 'reactstrap';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import { gettext } from '../../../utils/constants';
|
import { gettext } from '../../../utils/constants';
|
||||||
import Picker from './picker';
|
import Picker from './picker';
|
||||||
@@ -108,11 +108,11 @@ class StatisticCommonTool extends React.Component {
|
|||||||
<Fragment>
|
<Fragment>
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
<div className="system-statistic-time-range">
|
<div className="system-statistic-time-range">
|
||||||
<div className="sys-stat-tool">
|
<ButtonGroup size="sm" className="sys-stat-tool">
|
||||||
<div className={`system-statistic-item border-right-0 rounded-left ${statisticType === 'oneWeek' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneWeek')}>{gettext('7 Days')}</div>
|
<Button className={`font-weight-normal ${statisticType === 'oneWeek' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneWeek')}>{gettext('7 Days')}</Button>
|
||||||
<div className={`system-statistic-item border-right-0 ${statisticType === 'oneMonth' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneMonth')}>{gettext('30 Days')}</div>
|
<Button className={`font-weight-normal ${statisticType === 'oneMonth' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneMonth')}>{gettext('30 Days')}</Button>
|
||||||
<div className={`system-statistic-item rounded-right ${statisticType === 'oneYear' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneYear')}>{gettext('1 Year')}</div>
|
<Button className={`font-weight-normal ${statisticType === 'oneYear' ? 'item-active' : ''}`} onClick={this.changeActive.bind(this, 'oneYear')}>{gettext('1 Year')}</Button>
|
||||||
</div>
|
</ButtonGroup>
|
||||||
<div className="system-statistic-input-container">
|
<div className="system-statistic-input-container">
|
||||||
<Picker
|
<Picker
|
||||||
disabledDate={this.disabledStartDate}
|
disabledDate={this.disabledStartDate}
|
||||||
|
@@ -66,7 +66,7 @@ class SidePanel extends Component {
|
|||||||
{this.props.isTreeDataLoading && <Loading /> }
|
{this.props.isTreeDataLoading && <Loading /> }
|
||||||
{!this.props.isTreeDataLoading && this.props.indexNode && this.renderIndexView() }
|
{!this.props.isTreeDataLoading && this.props.indexNode && this.renderIndexView() }
|
||||||
{!this.props.isTreeDataLoading && !this.props.indexNode && this.renderTreeView() }
|
{!this.props.isTreeDataLoading && !this.props.indexNode && this.renderTreeView() }
|
||||||
{(username && permission) && <div className="text-left p-2"><a href={siteRoot + 'library/' + repoID + '/' + slug + '/'} className="text-dark text-decoration-underline">{gettext('Go to Library')}</a></div>}
|
{(username && permission) && <div className="p-2"><a href={siteRoot + 'library/' + repoID + '/' + slug + '/'} className="text-dark text-decoration-underline">{gettext('Go to Library')}</a></div>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@@ -153,7 +153,7 @@ class RepoSnapshot extends React.Component {
|
|||||||
{folderPath == '/' && (
|
{folderPath == '/' && (
|
||||||
<div className="d-flex mb-2 align-items-center">
|
<div className="d-flex mb-2 align-items-center">
|
||||||
<p className="m-0 text-truncate" title={commitDesc}>{commitDesc}</p>
|
<p className="m-0 text-truncate" title={commitDesc}>{commitDesc}</p>
|
||||||
<div className="ml-4 border-left pl-4 d-flex align-items-center flex-shrink-0">
|
<div className="ml-4 border-start pl-4 d-flex align-items-center flex-shrink-0">
|
||||||
{showAuthor ? (
|
{showAuthor ? (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<img src={authorAvatarURL} width="20" height="20" alt="" className="rounded mr-1" />
|
<img src={authorAvatarURL} width="20" height="20" alt="" className="rounded mr-1" />
|
||||||
|
Reference in New Issue
Block a user