Skip to content

Commit

Permalink
Pull request 2056: ADG-7673 fix filters list height
Browse files Browse the repository at this point in the history
Merge in DNS/adguard-home from ADG-7673 to master

Updates #6358.

Squashed commit of the following:

commit c7fc33d
Merge: 82368de ffdebc7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 3 16:52:26 2023 +0300

    Merge branch 'master' into ADG-7673

commit 82368de
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Nov 2 10:07:55 2023 +0300

    changelog

commit e851463
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 31 18:31:35 2023 +0300

    ADG-7673 fix filters list height
  • Loading branch information
IldarKamalov authored and EugeneOne1 committed Nov 3, 2023
1 parent ffdebc7 commit 6a3906a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ NOTE: Add new changes BELOW THIS COMMENT.

### Changed

- The height of ready-to-use filter lists has been increased ([#6358]).
- Improved authentication failure logging ([#6357]).

### Fixed
Expand All @@ -46,6 +47,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6335]: https://github.com/AdguardTeam/AdGuardHome/issues/6335
[#6337]: https://github.com/AdguardTeam/AdGuardHome/issues/6337
[#6357]: https://github.com/AdguardTeam/AdGuardHome/issues/6357
[#6358]: https://github.com/AdguardTeam/AdGuardHome/issues/6358

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
5 changes: 5 additions & 0 deletions client/src/components/App/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ body {
overflow-y: auto;
}

.modal-body--filters {
max-height: 600px;
overflow-y: auto;
}

.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Filters/Form.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const renderIcons = (iconsData) => iconsData.map(({
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<svg className="icon icon--15 mr-1 icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
Expand Down Expand Up @@ -110,7 +110,7 @@ const Form = (props) => {
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);

return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
<div className="modal-body modal-body--filters">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
Expand Down
7 changes: 7 additions & 0 deletions client/src/components/ui/Icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
height: var(--size);
}

.icon--15 {
--size: 0.95rem;

width: var(--size);
height: var(--size);
}

.icon--gray {
color: var(--gray-a5);
}
Expand Down

0 comments on commit 6a3906a

Please sign in to comment.