mirror of
https://github.com/mattermost/mattermost.git
synced 2026-08-27 05:37:15 -05:00
[MM-67886] Remove height cap on Feature Flags table in System Console (#35556)
* [MM-67886] Remove height cap on Feature Flags table in System Console The Feature Flags page is entirely dedicated to the table, so the max-height restriction is unnecessary and leaves excessive blank space. Add a --full-height modifier class to remove the cap on this page only. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * [MM-67886] Fix scrolling header on Feature Flags and Server Logs pages Replace wrapper--admin with wrapper--fixed so the admin header stays fixed while content scrolls, matching all other System Console pages. Rework the logs CSS to use flex-based sizing instead of fixed heights so only the innermost container (DataGrid_rows / log__panel) scrolls, preventing double scrollbars. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * [MM-67886] Fix CSS property order lint errors Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
co-authored by
Claude Opus 4.6
Mattermost Build
parent
37028a794d
commit
b10346496b
@@ -30,12 +30,12 @@ const FeatureFlags: React.FC<Props> = (props: Props) => {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='wrapper--admin'>
|
||||
<div className='wrapper--fixed'>
|
||||
<AdminHeader>
|
||||
<FormattedMessage {...messages.title}/>
|
||||
</AdminHeader>
|
||||
<div className='admin-console__wrapper'>
|
||||
<div className='admin-logs-content admin-console__content'>
|
||||
<div className='admin-console__content'>
|
||||
<div className={'banner info'}>
|
||||
<div className='banner__content'>
|
||||
<FormattedMessage
|
||||
@@ -45,7 +45,7 @@ const FeatureFlags: React.FC<Props> = (props: Props) => {
|
||||
</div>
|
||||
</div>
|
||||
<div className='job-table__panel'>
|
||||
<div className='job-table__table'>
|
||||
<div className='job-table__table job-table__table--full-height'>
|
||||
<table
|
||||
className='table'
|
||||
>
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
exports[`components/admin_console/server_logs/Logs should display the logs correctly after loading 1`] = `
|
||||
<div>
|
||||
<div
|
||||
class="wrapper--admin"
|
||||
class="wrapper--fixed"
|
||||
>
|
||||
<div
|
||||
class="admin-console__header"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.LogTable {
|
||||
overflow: auto;
|
||||
overflow: hidden;
|
||||
|
||||
.DataGrid {
|
||||
.DataGrid_row {
|
||||
|
||||
@@ -217,7 +217,7 @@ export default class Logs extends React.PureComponent<Props, State> {
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='wrapper--admin'>
|
||||
<div className='wrapper--fixed'>
|
||||
<AdminHeader>
|
||||
<FormattedMessage {...messages.title}/>
|
||||
</AdminHeader>
|
||||
|
||||
@@ -138,7 +138,7 @@ class PlainLogList extends React.PureComponent<Props, State> {
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div>
|
||||
<div className='plain-log-list'>
|
||||
<div
|
||||
tabIndex={-1}
|
||||
ref={this.logPanel}
|
||||
|
||||
@@ -37,13 +37,6 @@
|
||||
flex: 1 1 auto;
|
||||
padding: 20px;
|
||||
|
||||
> .wrapper--admin {
|
||||
display: flex;
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.admin-console__filters-rows {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -196,7 +189,8 @@
|
||||
.log__panel {
|
||||
overflow: scroll;
|
||||
width: 100%;
|
||||
height: calc(100vh - 280px);
|
||||
min-height: 0;
|
||||
flex: 1;
|
||||
padding: 10px;
|
||||
border: variables.$border-gray;
|
||||
margin-top: 14px;
|
||||
@@ -610,6 +604,10 @@
|
||||
border: variables.$border-gray;
|
||||
margin: 20px 0 10px;
|
||||
background-color: variables.$white;
|
||||
|
||||
&--full-height {
|
||||
max-height: none;
|
||||
}
|
||||
}
|
||||
|
||||
.admin-console__disabled-text {
|
||||
@@ -1112,6 +1110,7 @@
|
||||
|
||||
.admin-console .admin-console__content.admin-logs-content {
|
||||
display: flex;
|
||||
overflow: hidden;
|
||||
max-width: none;
|
||||
height: 100%;
|
||||
flex-direction: column;
|
||||
@@ -1148,7 +1147,8 @@
|
||||
}
|
||||
|
||||
.LogTable {
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
flex: 1;
|
||||
|
||||
.DataGrid {
|
||||
display: flex;
|
||||
@@ -1157,11 +1157,18 @@
|
||||
|
||||
.DataGrid_rows {
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
min-height: 100% !important;
|
||||
min-height: 0 !important;
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.plain-log-list {
|
||||
display: flex;
|
||||
min-height: 0;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
div[disabled] {
|
||||
|
||||
Reference in New Issue
Block a user