Pull request: 4815 fix query log modal on tablet

Updates #4815

Squashed commit of the following:

commit 148c39ac40963a593885b86a0c851b4010b68ab0
Merge: 3447611d ab6da05b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Sep 20 13:21:06 2022 +0300

    Merge branch 'master' into 4815-tablet-view

commit 3447611dc0b1c7d2cc1f8235d1c469dd92736166
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Sep 16 17:01:05 2022 +0300

    client: fix query log modal on tablet
This commit is contained in:
Ildar Kamalov
2022-09-20 13:48:57 +03:00
parent ab6da05b51
commit cc2388e0c8
6 changed files with 46 additions and 27 deletions

View File

@@ -62,7 +62,7 @@ const ClientCell = ({
'white-space--nowrap': isDetailed, 'white-space--nowrap': isDetailed,
}); });
const hintClass = classNames('icons mr-4 icon--24 icon--lightgray', { const hintClass = classNames('icons mr-4 icon--24 logs__question icon--lightgray', {
'my-3': isDetailed, 'my-3': isDetailed,
}); });

View File

@@ -34,7 +34,7 @@ const DomainCell = ({
'my-3': isDetailed, 'my-3': isDetailed,
}); });
const privacyIconClass = classNames('icons mx-2 icon--24 d-none d-sm-block', { const privacyIconClass = classNames('icons mx-2 icon--24 d-none d-sm-block logs__question', {
'icon--green': hasTracker, 'icon--green': hasTracker,
'icon--disabled': !hasTracker, 'icon--disabled': !hasTracker,
'my-3': isDetailed, 'my-3': isDetailed,

View File

@@ -49,6 +49,12 @@
padding-top: 1rem; padding-top: 1rem;
} }
@media (max-width: 1024px) {
.grid .key-colon, .grid .title--border {
font-weight: 600;
}
}
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
.grid { .grid {
grid-template-columns: 35% 55%; grid-template-columns: 35% 55%;
@@ -70,10 +76,6 @@
grid-column: 2 / span 1; grid-column: 2 / span 1;
margin: 0 !important; margin: 0 !important;
} }
.grid .key-colon, .grid .title--border {
font-weight: 600;
}
} }
.grid .key-colon:nth-child(odd)::after { .grid .key-colon:nth-child(odd)::after {

View File

@@ -97,7 +97,7 @@ const ResponseCell = ({
return ( return (
<div className="logs__cell logs__cell--response" role="gridcell"> <div className="logs__cell logs__cell--response" role="gridcell">
<IconTooltip <IconTooltip
className={classNames('icons mr-4 icon--24 icon--lightgray', { 'my-3': isDetailed })} className={classNames('icons mr-4 icon--24 icon--lightgray logs__question', { 'my-3': isDetailed })}
columnClass='grid grid--limited' columnClass='grid grid--limited'
tooltipClass='px-5 pb-5 pt-4 mw-75 custom-tooltip__response-details' tooltipClass='px-5 pb-5 pt-4 mw-75 custom-tooltip__response-details'
contentItemClass='text-truncate key-colon o-hidden' contentItemClass='text-truncate key-colon o-hidden'

View File

@@ -485,3 +485,13 @@
.bg--green { .bg--green {
color: var(--green79); color: var(--green79);
} }
@media (max-width: 1024px) {
.logs__question {
display: none;
}
}
.logs__modal {
max-width: 720px;
}

View File

@@ -184,27 +184,34 @@ const Logs = () => {
setButtonType={setButtonType} setButtonType={setButtonType}
setModalOpened={setModalOpened} setModalOpened={setModalOpened}
/> />
<Modal portalClassName='grid' isOpen={isSmallScreen && isModalOpened} <Modal
onRequestClose={closeModal} portalClassName='grid'
style={{ isOpen={isSmallScreen && isModalOpened}
content: { onRequestClose={closeModal}
width: '100%', style={{
height: 'fit-content', content: {
left: 0, width: '100%',
top: 47, height: 'fit-content',
padding: '1rem 1.5rem 1rem', left: '50%',
}, top: 47,
overlay: { padding: '1rem 1.5rem 1rem',
backgroundColor: 'rgba(0,0,0,0.5)', maxWidth: '720px',
}, transform: 'translateX(-50%)',
}} },
overlay: {
backgroundColor: 'rgba(0,0,0,0.5)',
},
}}
> >
<svg <div className="logs__modal-wrap">
className="icon icon--24 icon-cross d-block d-md-none cursor--pointer" <svg
onClick={closeModal}> className="icon icon--24 icon-cross d-block cursor--pointer"
<use xlinkHref="#cross" /> onClick={closeModal}
</svg> >
{processContent(detailedDataCurrent, buttonType)} <use xlinkHref="#cross" />
</svg>
{processContent(detailedDataCurrent, buttonType)}
</div>
</Modal> </Modal>
</>; </>;