Skip to content

[TASK] #52479 attempt to make first tab more readable when much content #69

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.

Sign up for GitHub

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

Open
Ckauczor wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[TASK] #52479 attempt to make first tab more readable when much content #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
260a9f2
[TASK] #52479 attempt to make first tab more readable when much content
Sep 30, 2021
7491ba3
[TASK] #52479 Linting
Sep 30, 2021
65196e7
Merge branch 'master' into task/52479/expandDocumentationTab
s2b Feb 2, 2022
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
2 changes: 1 addition & 1 deletion Resources/Private/Components/Organism/StyleguideToolbar/StyleguideToolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<div class="tabContents">
<f:if condition="{componentData.arguments} || ({showDocumentation} && {componentData.documentation})">
<div class="tabContent active">
<div class="tabContent documentation active">
<h1>{componentData.name.displayName}</h1>
<f:if condition="{componentData.arguments}">
<div class="boxMargin">
Expand Down
11 changes: 11 additions & 0 deletions Resources/Private/Components/Organism/StyleguideToolbar/StyleguideToolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ const StyleguideToolbar = el => {
});
})
});

const docTab = document.querySelector('.documentation')
const docTabInner = document.querySelector('.documentation .boxMargin')
const docHeight = parseFloat(window.getComputedStyle(docTabInner, null).getPropertyValue("height")) + 30
if (docHeight > 500 && docHeight < 600) {
docTab.classList.add('maxHeight500')
} else if (docHeight > 600 && docHeight < 700) {
docTab.classList.add('maxHeight600')
} else if (docHeight > 700 && docHeight < 800) {
docTab.classList.add('maxHeight700');
}
};

register('StyleguideToolbar', StyleguideToolbar);
31 changes: 30 additions & 1 deletion Resources/Private/Components/Organism/StyleguideToolbar/StyleguideToolbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,36 @@
.toolbarBot {
top: -16px;
}

@media (min-width: 992px) {
.tabContent {
&.documentation {
&.maxHeight500 {
max-height: 500px;
}

&.maxHeight600 {
max-height: 600px;
}

&.maxHeight700 {
max-height: 700px;
}

.boxMargin {
width: 50%;
display: inline-block;
vertical-align: top;
}

.componentDocumentation {
width: 45%;
display: inline-block;
padding-left: 15px;
}
}
}
}
}

.toolbarTabs {
Expand Down Expand Up @@ -232,7 +262,6 @@

.componentDocumentation {
line-height: 1.8;
max-width: 70em;

pre, code {
background: $dark-grey-1;
Expand Down