Skip to content

Fix close button placement #374

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

Merged
dannify merged 5 commits into from
Apr 4, 2020
Merged

Fix close button placement #374

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
089d5c0
fix close button position in grid so that it always has room and aff…
snowystinger Apr 4, 2020
ad822b8
min max because at small screens the padding was collapsing
snowystinger Apr 4, 2020
6ad468f
Merge branch 'master' into dialog-fix-dismiss-button-position
dannify Apr 4, 2020
da0ad9d
minmax IS the solution!!!
snowystinger Apr 4, 2020
770e76c
Merge branch 'dialog-fix-dismiss-button-position' of github.com:adobe…
snowystinger Apr 4, 2020
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
16 changes: 7 additions & 9 deletions packages/@adobe/spectrum-css-temp/components/dialog/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ governing permissions and limitations under the License.

/* 12px desktop (medium scale) and 8px mobile (large scale) */
--spectrum-dialog-close-button-padding: calc(26px - var(--spectrum-global-dimension-size-175));
--spectrum-dialog-close-button-size: var(--spectrum-global-dimension-size-400);

--spectrum-dialog-gap-size: var(--spectrum-global-dimension-size-200);
}
Expand Down Expand Up @@ -87,8 +88,8 @@ governing permissions and limitations under the License.

.spectrum-Dialog .spectrum-Dialog-grid {
display: grid;
grid-template-columns: var(--spectrum-dialog-padding) auto 1fr auto minmax(0, auto) var(--spectrum-dialog-padding);
grid-template-rows: auto var(--spectrum-dialog-padding) auto auto 1fr auto var(--spectrum-dialog-padding);
grid-template-columns: var(--spectrum-dialog-padding) auto 1fr auto minmax(0, auto) minmax(var(--spectrum-dialog-padding), var(--spectrum-dialog-close-button-size));
grid-template-rows: auto minmax(var(--spectrum-dialog-padding), var(--spectrum-dialog-close-button-size)) auto auto 1fr auto var(--spectrum-dialog-padding);
grid-template-areas:
"hero hero hero hero hero hero"
". . . . . closeButton"
Expand Down Expand Up @@ -214,11 +215,8 @@ governing permissions and limitations under the License.
.spectrum-Dialog-closeButton {
grid-area: closeButton;
/* align and justify so it doesn't do the default 'stretch' and end up with forced height/width */
align-self: start;
justify-self: end;

inset-block-start: var(--spectrum-dialog-close-button-padding);
inset-inline-end: var(--spectrum-dialog-close-button-padding);
align-self: end;
justify-self: start;
}

/* Alert Dialog is a specific type of Dialog */
Expand Down Expand Up @@ -278,8 +276,8 @@ governing permissions and limitations under the License.

@media screen and (max-width: 700px) {
.spectrum-Dialog .spectrum-Dialog-grid {
grid-template-columns: var(--spectrum-dialog-padding) auto 1fr auto auto var(--spectrum-dialog-padding);
grid-template-rows: auto var(--spectrum-dialog-padding) auto auto auto 1fr auto var(--spectrum-dialog-padding);
grid-template-columns: var(--spectrum-dialog-padding) auto 1fr auto auto minmax(var(--spectrum-dialog-padding), var(--spectrum-dialog-close-button-size));
grid-template-rows: auto minmax(var(--spectrum-dialog-padding), var(--spectrum-dialog-close-button-size)) auto auto auto 1fr auto var(--spectrum-dialog-padding);
grid-template-areas:
"hero hero hero hero hero hero"
". . . . . closeButton"
Expand Down