-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Import Layout from PVC
#2340
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
Merged
Merged
Import Layout from PVC
#2340
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d8ec726
Import Layout styles from PVC
simurai b2adf16
Bump `@primer/view-components` to `0.0.115`
simurai d95b96b
Merge branch 'main' into import_from_pvc/layout
simurai f08a096
Bump `@primer/view-components` to `0.0.115`
simurai ca87256
Rename `menu_component` import to `alpha/menu`
simurai 7083dd5
Create mighty-forks-occur.md
simurai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@primer/css": patch | ||
| --- | ||
|
|
||
| Import `Layout` from PVC |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,182 +1 @@ | ||
| // Layout component | ||
|
|
||
| .Layout { | ||
| display: grid; | ||
|
|
||
| --Layout-sidebar-width: #{map-get($sidebar-width, 'sm')}; | ||
| --Layout-gutter: 16px; | ||
|
|
||
| @media (max-width: calc(#{$width-sm} - 0.02px)) { | ||
| @include flow-as-row; | ||
| } | ||
|
|
||
| &.Layout--flowRow-until-md { | ||
| @media (max-width: calc(#{$width-md} - 0.02px)) { | ||
| @include flow-as-row; | ||
| } | ||
| } | ||
|
|
||
| &.Layout--flowRow-until-lg { | ||
| @media (max-width: calc(#{$width-lg} - 0.02px)) { | ||
| @include flow-as-row; | ||
| } | ||
| } | ||
|
|
||
| // Flow as column | ||
|
|
||
| grid-auto-flow: column; | ||
| grid-template-columns: auto 0 minmax(0, calc(100% - var(--Layout-sidebar-width) - var(--Layout-gutter))); // sidebar column, separator, main column | ||
| grid-gap: var(--Layout-gutter); | ||
|
|
||
| .Layout-sidebar { | ||
| grid-column: 1; | ||
| } | ||
|
|
||
| .Layout-divider { | ||
| display: none; | ||
| } | ||
|
|
||
| .Layout-main { | ||
| grid-column: 2 / span 2; | ||
| } | ||
|
|
||
| // Gutter spacing | ||
|
|
||
| @include breakpoint(lg) { | ||
| --Layout-gutter: 24px; | ||
| } | ||
|
|
||
| &.Layout--gutter-none { | ||
| // stylelint-disable-next-line length-zero-no-unit | ||
| --Layout-gutter: 0px; | ||
| } | ||
|
|
||
| &.Layout--gutter-condensed { | ||
| --Layout-gutter: 16px; | ||
| } | ||
|
|
||
| &.Layout--gutter-spacious { | ||
| @include breakpoint(lg) { | ||
| --Layout-gutter: 32px; | ||
| } | ||
|
|
||
| @include breakpoint(xl) { | ||
| --Layout-gutter: 40px; | ||
| } | ||
| } | ||
|
|
||
| // Sidebar width | ||
|
|
||
| @each $breakpoint in map-keys($sidebar-width) { | ||
| @include breakpoint($breakpoint) { | ||
| --Layout-sidebar-width: #{map-get($sidebar-width, $breakpoint)}; | ||
| } | ||
| } | ||
|
|
||
| &.Layout--sidebar-narrow { | ||
| @each $breakpoint in map-keys($sidebar-narrow-width) { | ||
| @include breakpoint($breakpoint) { | ||
| --Layout-sidebar-width: #{map-get($sidebar-narrow-width, $breakpoint)}; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| &.Layout--sidebar-wide { | ||
| @each $breakpoint in map-keys($sidebar-wide-width) { | ||
| @include breakpoint($breakpoint) { | ||
| --Layout-sidebar-width: #{map-get($sidebar-wide-width, $breakpoint)}; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Sidebar position | ||
|
|
||
| &.Layout--sidebarPosition-start { | ||
| .Layout-sidebar { | ||
| grid-column: 1; | ||
| } | ||
|
|
||
| .Layout-main { | ||
| grid-column: 2 / span 2; | ||
| } | ||
| } | ||
|
|
||
| &.Layout--sidebarPosition-end { | ||
| grid-template-columns: minmax(0, calc(100% - var(--Layout-sidebar-width) - var(--Layout-gutter))) 0 auto; | ||
|
|
||
| .Layout-main { | ||
| grid-column: 1; | ||
| } | ||
|
|
||
| .Layout-sidebar { | ||
| grid-column: 2 / span 2; | ||
| } | ||
| } | ||
|
|
||
| // Sidebar divider | ||
|
|
||
| &.Layout--divided { | ||
| .Layout-divider { | ||
| display: block; | ||
| grid-column: 2; | ||
| width: 1px; | ||
| // stylelint-disable-next-line primer/spacing | ||
| margin-right: -1px; | ||
| background: var(--color-border-default); | ||
| } | ||
|
|
||
| .Layout-main { | ||
| grid-column: 3 / span 1; | ||
| } | ||
|
|
||
| &.Layout--sidebarPosition-end { | ||
| .Layout-sidebar { | ||
| grid-column: 3 / span 1; | ||
| } | ||
|
|
||
| .Layout-main { | ||
| grid-column: 1; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .Layout-divider { | ||
| display: none; | ||
| width: 1px; | ||
| } | ||
|
|
||
| .Layout-sidebar { | ||
| width: var(--Layout-sidebar-width); | ||
| } | ||
|
|
||
| .Layout-main { | ||
| min-width: 0; | ||
|
|
||
| // Centered main column | ||
| // FIXME: right-aligned sidebar | ||
| .Layout-main-centered-md, | ||
| .Layout-main-centered-lg, | ||
| .Layout-main-centered-xl { | ||
| margin-right: auto; | ||
| margin-left: auto; | ||
|
|
||
| > .container-md, | ||
| > .container-lg, | ||
| > .container-xl { | ||
| margin-left: 0; | ||
| } | ||
| } | ||
|
|
||
| .Layout-main-centered-md { | ||
| max-width: calc(#{$container-md} + var(--Layout-sidebar-width) + var(--Layout-gutter)); | ||
| } | ||
|
|
||
| .Layout-main-centered-lg { | ||
| max-width: calc(#{$container-lg} + var(--Layout-sidebar-width) + var(--Layout-gutter)); | ||
| } | ||
|
|
||
| .Layout-main-centered-xl { | ||
| max-width: calc(#{$container-xl} + var(--Layout-sidebar-width) + var(--Layout-gutter)); | ||
| } | ||
| } | ||
| @import '@primer/view-components/app/components/primer/alpha/layout'; |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| @import '@primer/view-components/app/components/primer/menu_component'; | ||
| @import '@primer/view-components/app/components/primer/alpha/menu'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These mixins are still needed in
page-layout.scss, so I moved them here and deleted@import './mixins.scss';