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.

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

Jump to bottom

✨ amp-story-desktop-one-panel Position system layer UI on top of story panel #34907

Merged
merged 7 commits into from
Jun 17, 2021
Merged

✨ amp-story-desktop-one-panel Position system layer UI on top of story panel #34907

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bd5e77
Position system UI lauyer on top of story panel.
processprocess Jun 17, 2021
ab8b092
Share variables with system layer.
processprocess Jun 17, 2021
08c9af3
Add class on system layer.
processprocess Jun 17, 2021
eb5c51c
Restructure variables. Remove media queries.
processprocess Jun 17, 2021
69406e9
Bring back whitespace.
processprocess Jun 17, 2021
9593be8
whitespace
processprocess Jun 17, 2021
2d79652
punctuation
processprocess Jun 17, 2021
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
38 changes: 20 additions & 18 deletions extensions/amp-story/1.0/amp-story-desktop-one-panel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,33 @@

@import './amp-story-desktop-user-overridable.css';


/** Variables shared between page and system layer */
.i-amphtml-story-desktop-one-panel {
--i-amphtml-story-desktop-one-panel-large-ratio: 69 / 116;
--i-amphtml-story-desktop-one-panel-small-ratio: 3 / 4;
}

.i-amphtml-story-desktop-one-panel amp-story-page {
/* Calculates height by factoring in responsive vertical margin. */
--i-amphtml-story-desktop-one-panel-large-height: calc(100vh - max(148px, 16.5vh));
height: var(--i-amphtml-story-desktop-one-panel-large-height) !important;
width: calc(var(--i-amphtml-story-desktop-one-panel-large-height) * var(--i-amphtml-story-desktop-one-panel-large-ratio)) !important;
border-radius: 10px !important;
margin: auto !important;
--i-amphtml-story-desktop-one-panel-ratio: 69 / 116;
--i-amphtml-story-desktop-one-panel-responsive-margin: max(74px, 8.25vh);
/** Calculates panel height by subtracting responsive vertical margin. */
--i-amphtml-story-desktop-one-panel-height: calc(100vh - var(--i-amphtml-story-desktop-one-panel-responsive-margin) * 2);
--i-amphtml-story-desktop-one-panel-width: calc(var(--i-amphtml-story-desktop-one-panel-height) * var(--i-amphtml-story-desktop-one-panel-ratio));
--i-amphtml-story-desktop-one-panel-border-radius: 10px;
}

@media(max-height: 756px) {
.i-amphtml-story-desktop-one-panel amp-story-page {
height: 100vh !important;
width: calc(100vh * var(--i-amphtml-story-desktop-one-panel-large-ratio)) !important;
border-radius: 0 !important;
.i-amphtml-story-desktop-one-panel {
--i-amphtml-story-desktop-one-panel-responsive-margin: 0;
--i-amphtml-story-desktop-one-panel-width: calc(100vh * var(--i-amphtml-story-desktop-one-panel-ratio));
--i-amphtml-story-desktop-one-panel-border-radius: 0;
}
}

@media(max-height: 538px) {
.i-amphtml-story-desktop-one-panel amp-story-page {
width: calc(100vh * var(--i-amphtml-story-desktop-one-panel-small-ratio)) !important;
.i-amphtml-story-desktop-one-panel {
--i-amphtml-story-desktop-one-panel-ratio: 3 / 4;
}
}

.i-amphtml-story-desktop-one-panel amp-story-page {
width: var(--i-amphtml-story-desktop-one-panel-width) !important;
height: var(--i-amphtml-story-desktop-one-panel-height) !important;
border-radius: var(--i-amphtml-story-desktop-one-panel-border-radius) !important;
margin: auto !important;
}
7 changes: 7 additions & 0 deletions extensions/amp-story/1.0/amp-story-system-layer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,3 +530,10 @@
top: 0 !important;
width: 100vw !important;
}

.i-amphtml-story-desktop-one-panel.i-amphtml-story-system-layer {
width: var(--i-amphtml-story-desktop-one-panel-width) !important;
margin: auto !important;
margin-top: var(--i-amphtml-story-desktop-one-panel-responsive-margin) !important;
border-radius: var(--i-amphtml-story-desktop-one-panel-border-radius) !important;
}
4 changes: 4 additions & 0 deletions extensions/amp-story/1.0/amp-story-system-layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,7 @@ export class SystemLayer {

shadowRoot.classList.remove('i-amphtml-story-desktop-fullbleed');
shadowRoot.classList.remove('i-amphtml-story-desktop-panels');
shadowRoot.classList.remove('i-amphtml-story-desktop-one-panel');
shadowRoot.removeAttribute('desktop');

switch (uiState) {
Expand All @@ -899,6 +900,9 @@ export class SystemLayer {
shadowRoot.setAttribute('desktop', '');
shadowRoot.classList.add('i-amphtml-story-desktop-fullbleed');
break;
case UIType.DESKTOP_ONE_PANEL:
shadowRoot.classList.add('i-amphtml-story-desktop-one-panel');
break;
}
});
}
Expand Down