Skip to content
This repository has been archived by the owner on Jun 12, 2024. It is now read-only.

[Assembly v1] Replace viewport and scroll classes in PageLayout #524

Merged
merged 2 commits into from
Oct 1, 2021
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
2 changes: 1 addition & 1 deletion docs/src/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
height: 50px !important;
}
@media screen and (min-width: 640px) {
#docs-content #dr-ui--page-layout-sidebar.scroll-auto-mm {
#docs-content #dr-ui--page-layout-sidebar.overflow-auto-mm {
overflow: unset !important;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Array [
}
>
<div
className="sticky-mm scroll-auto-mm scroll-styled viewport-almost-mm px12-mm"
className="sticky-mm overflow-auto-mm scroll-styled h-viewport-11/12-mm px12-mm"
data-swiftype-index="false"
id="dr-ui--page-layout-sidebar"
style={
Expand Down Expand Up @@ -284,7 +284,7 @@ Array [
className="dr-ui--page-layout-aside col w-full w-1/3-mxl"
>
<aside
className="scroll-auto-mxl scroll-styled viewport-almost-mxl sticky-mxl color-text"
className="overflow-auto-mxl scroll-styled h-viewport-11/12-mxl sticky-mxl color-text"
data-swiftype-index="false"
style={
Object {
Expand Down Expand Up @@ -646,7 +646,7 @@ Array [
}
>
<div
className="sticky-mm scroll-auto-mm scroll-styled viewport-almost-mm px12-mm"
className="sticky-mm overflow-auto-mm scroll-styled h-viewport-11/12-mm px12-mm"
data-swiftype-index="false"
id="dr-ui--page-layout-sidebar"
style={
Expand Down Expand Up @@ -940,7 +940,7 @@ Array [
className="dr-ui--page-layout-aside col w-full w-1/3-mxl"
>
<aside
className="scroll-auto-mxl scroll-styled viewport-almost-mxl sticky-mxl color-text"
className="overflow-auto-mxl scroll-styled h-viewport-11/12-mxl sticky-mxl color-text"
data-swiftype-index="false"
style={
Object {
Expand Down Expand Up @@ -1237,7 +1237,7 @@ Array [
}
>
<div
className="sticky-mm scroll-auto-mm scroll-styled viewport-almost-mm px12-mm"
className="sticky-mm overflow-auto-mm scroll-styled h-viewport-11/12-mm px12-mm"
data-swiftype-index="false"
id="dr-ui--page-layout-sidebar"
style={
Expand Down Expand Up @@ -1561,7 +1561,7 @@ Array [
className="dr-ui--page-layout-aside col w-full w-1/3-mxl"
>
<aside
className="scroll-auto-mxl scroll-styled viewport-almost-mxl sticky-mxl color-text"
className="overflow-auto-mxl scroll-styled h-viewport-11/12-mxl sticky-mxl color-text"
data-swiftype-index="false"
style={
Object {
Expand Down Expand Up @@ -1800,7 +1800,7 @@ Array [
}
>
<div
className="sticky-mm scroll-auto-mm scroll-styled viewport-almost-mm px12-mm"
className="sticky-mm overflow-auto-mm scroll-styled h-viewport-11/12-mm px12-mm"
data-swiftype-index="false"
id="dr-ui--page-layout-sidebar"
style={
Expand Down Expand Up @@ -2157,7 +2157,7 @@ Array [
className="dr-ui--page-layout-aside col w-full w-1/3-mxl"
>
<aside
className="scroll-auto-mxl scroll-styled viewport-almost-mxl sticky-mxl color-text"
className="overflow-auto-mxl scroll-styled h-viewport-11/12-mxl sticky-mxl color-text"
data-swiftype-index="false"
style={
Object {
Expand Down Expand Up @@ -2332,7 +2332,7 @@ Array [
}
>
<div
className="sticky-mm scroll-auto-mm scroll-styled viewport-almost-mm px12-mm"
className="sticky-mm overflow-auto-mm scroll-styled h-viewport-11/12-mm px12-mm"
data-swiftype-index="false"
id="dr-ui--page-layout-sidebar"
style={
Expand Down
2 changes: 1 addition & 1 deletion src/components/page-layout/components/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class ContentWrapper extends React.PureComponent {
return (
<aside
data-swiftype-index="false"
className="scroll-auto-mxl scroll-styled viewport-almost-mxl sticky-mxl color-text"
className="overflow-auto-mxl scroll-styled h-viewport-11/12-mxl sticky-mxl color-text"
style={{ top: '10px' }}
>
{this.props.customAside ? this.props.customAside : undefined}
Expand Down
2 changes: 1 addition & 1 deletion src/components/page-layout/components/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class Sidebar extends React.PureComponent {
<div
data-swiftype-index="false"
id="dr-ui--page-layout-sidebar"
className="sticky-mm scroll-auto-mm scroll-styled viewport-almost-mm px12-mm"
className="sticky-mm overflow-auto-mm scroll-styled h-viewport-11/12-mm px12-mm"
style={{ top: '10px' }}
>
<div className="mb6 border-b border--darken10">
Expand Down