Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix - Change Styles To Prevent Overflow Problems #543

Merged
merged 1 commit into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/containers/DataViewModalContainer/DataViewModalContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ const DataViewModalContainer = () => {

return (
<Modal
className='dataViewModalParent'
className='data-view-modal-container'
handleClose={handleClose}
title='Visualizar dados'
isVisible={isVisible}
footer={null}
isFullScreen
>
<div className='dataViewModal'>
<div className='dataViewModalDataHeader'>
<div className='data-view-modal'>
<div className='data-view-modal-data-header'>
<span style={{ fontSize: '12px' }}>ATRIBUTOS: </span>

<span style={{ color: '#262626', fontSize: '14px' }}>
Expand All @@ -187,7 +187,7 @@ const DataViewModalContainer = () => {

<Tabs defaultActiveKey='1'>
<Tabs.TabPane tab='Atributos' key='1'>
<div className='attributtesTable'>
<div className='attributes-table'>
<DatasetColumnsTable
columns={datasetColumns}
selectedRows={selectedRows}
Expand All @@ -197,7 +197,7 @@ const DataViewModalContainer = () => {
/>
</div>

<div className='dataViewAttributtesDownload'>
<div className='data-view-attributes-download'>
<h2>Tipos dos atributos</h2>

<a
Expand All @@ -215,7 +215,7 @@ const DataViewModalContainer = () => {
</a>
</div>

<div className='dataViewAttributtesUpload'>
<div className='data-view-attributes-upload'>
<h2>Altere todos os tipos de uma só vez</h2>

<p>
Expand Down Expand Up @@ -249,7 +249,7 @@ const DataViewModalContainer = () => {
</Tabs.TabPane>

<Tabs.TabPane tab='Observações' key='2'>
<div className='dataViewObservations'>
<div className='data-view-observations'>
<CommonTable
size={'small'}
columns={columns}
Expand Down
146 changes: 78 additions & 68 deletions src/containers/DataViewModalContainer/DataViewModalContainer.less
Original file line number Diff line number Diff line change
@@ -1,90 +1,100 @@
@import '/src/variables.less';
@import "/src/variables.less";

.dataViewModal {
height: 95%;
.data-view-modal-container {
.ant-modal-content {
display: flex;
flex-direction: column;

.dataViewAttributtesDownload {
float: left;
width: 30%;
padding: 20px;
border-bottom: 1px solid #e8e8e8;

button:not(:disabled) {
color: @primary-color;
.ant-modal-body {
height: auto;
flex: 1;
}
}

.dataViewAttributtesUpload {
float: left;
width: 30%;
padding: 20px;
.data-view-modal {
.data-view-attributes-download {
float: left;
width: 30%;
padding: 20px;
border-bottom: 1px solid #e8e8e8;

button:not(:disabled) {
color: @primary-color;
button:not(:disabled) {
color: @primary-color;
}
}

ul {
list-style: none;
padding: 0;
}
li {
padding-left: 0.7em;
}
li:before {
content: '-'; /* FontAwesome Unicode */
display: inline-block;
margin-left: -0.7em; /* same as padding-left set on li */
width: 0.7em; /* same as padding-left set on li */
.data-view-attributes-upload {
float: left;
width: 30%;
padding: 20px;

button:not(:disabled) {
color: @primary-color;
}

ul {
list-style: none;
padding: 0;
}
li {
padding-left: 0.7em;
}
li:before {
content: "-"; /* FontAwesome Unicode */
display: inline-block;
margin-left: -0.7em; /* same as padding-left set on li */
width: 0.7em; /* same as padding-left set on li */
}
}
}

.datasetTable {
margin: 15px 10px 10px 0px;
}
.datasetTable {
margin: 15px 10px 10px 0px;
}

.ant-tabs-nav {
margin: 0;
}
.ant-tabs-nav {
margin: 0;
}

.ant-tabs {
height: 100%;
}
.ant-tabs {
height: 100%;
}

.ant-tabs-tab {
padding: 12px 15px;
margin: 0px;
}
.ant-tabs-tab {
padding: 12px 15px;
margin: 0px;
}

.ant-tabs-content {
height: 100%;
}
.ant-tabs-content {
height: 100%;
}

.ant-table-body {
max-height: none;
overflow-y: hidden;
}
.ant-table-body {
max-height: none;
overflow-y: hidden;
}

.attributtesTable {
float: left;
width: 70%;
height: 100%;
border-right: 1px solid #e8e8e8;
overflow: auto;
}
.attributes-table {
float: left;
width: 70%;
height: 100%;
border-right: 1px solid #e8e8e8;
overflow: auto;
}

.dataViewModalDataHeader {
margin: 1px 0;
padding: 10px 0;
height: 5%;
}
.data-view-modal-data-header {
margin: 1px 0;
padding: 10px 0;
height: 5%;
}

.dataViewObservations {
margin: 15px 0px;
.data-view-observations {
margin: 15px 0px;
}
}
}

.dataViewModalParent {
.ant-modal-body {
padding: 0 25px;
.dataViewModalParent {
.ant-modal-body {
padding: 0 25px;
}
}
}