Skip to content

Commit

Permalink
6180 fix dashboard empty tables scroll
Browse files Browse the repository at this point in the history
Updates AdguardTeam#6180

Squashed commit of the following:

commit ad4188f
Merge: 8302506 0fb6d61
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 11 15:03:55 2023 +0300

    Merge branch 'master' into ADG-7473

commit 8302506
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:43:02 2023 +0300

    Revert "ADG-7473 get table page size from local storage"

    This reverts commit b6bf48a.

commit 960f3a1
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:42:31 2023 +0300

    fix stats config page

commit b6bf48a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:30:22 2023 +0300

    ADG-7473 get table page size from local storage

commit 7201d00
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 17:20:48 2023 +0300

    ADG-7473 fix dashboard tables scroll
  • Loading branch information
IldarKamalov committed Oct 11, 2023
1 parent 0fb6d61 commit 3ce3c41
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion client/src/components/Settings/LogsConfig/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class LogsConfig extends Component {
interval,
customInterval,
anonymize_client_ip,
ignored: ignored.join('\n'),
ignored: ignored?.join('\n'),
}}
onSubmit={this.handleFormSubmit}
processing={processing}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Settings/StatsConfig/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class StatsConfig extends Component {
interval,
customInterval,
enabled,
ignored: ignored.join('\n'),
ignored: ignored?.join('\n'),
}}
onSubmit={this.handleFormSubmit}
processing={processing}
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ui/Card.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

.dashboard .card-table-overflow--limited {
max-height: 18rem;
max-height: 19rem;
}

.card-actions {
Expand Down

0 comments on commit 3ce3c41

Please sign in to comment.