a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11 in DNS/adguard-dns from feature/313 to master 

* commit '9e6ed7f273e996b2a89d9eda2302117adcc2389d':
  fix filtered reason overflow
  fix table cell overflow in filters
This commit is contained in:
Eugene Bujak 2018-09-07 19:12:05 +03:00
parent 5fdaf7cb66 9e6ed7f273
commit b54f9a7a36
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/Filters/index.js
View File

@ -41,11 +41,11 @@ class Filters extends Component {
}, { }, {
Header: 'Filter name', Header: 'Filter name',
accessor: 'name', accessor: 'name',
Cell: ({ value }) => (<span title={value}>{value}</span>), Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, { }, {
Header: 'Host file URL', Header: 'Host file URL',
accessor: 'url', accessor: 'url',
Cell: ({ value }) => (<a href={value} target='_blank' rel='noopener noreferrer'>{value}</a>), Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, { }, {
Header: 'Rules count', Header: 'Rules count',
accessor: 'rulesCount', accessor: 'rulesCount',

6
client/src/components/Logs/index.js
View File

@ -68,8 +68,10 @@ class Logs extends Component {
if (isFiltered) { if (isFiltered) {
return ( return (
<div className="logs__row"> <div className="logs__row">
{ this.renderTooltip(isFiltered, rule) } {this.renderTooltip(isFiltered, rule)}
<span>{ parsedFilteredReason }</span> <span className="logs__text" title={parsedFilteredReason}>
{parsedFilteredReason}
</span>
</div> </div>
); );
} }