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

Always display the mobile nav menu when disconnecting sites #14925

Merged
merged 5 commits into from
Mar 12, 2020
Merged

Always display the mobile nav menu when disconnecting sites #14925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
135e722
Always display the mobile nav menu when disconnecting sites
enejb Mar 9, 2020
26a98c0
update colour to variable
enejb Mar 9, 2020
858b190
Update to tabs
enejb Mar 12, 2020
3010ed0
Fix the adminbar overlap
enejb Mar 12, 2020
b150c3f
Remove all spaces and use tabs instead
jeherve Mar 12, 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
5 changes: 5 additions & 0 deletions _inc/client/at-a-glance/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,11 @@

.jp-connection-settings__modal.dops-modal {
max-width: 635px;
min-height: 400px;

@include breakpoint( '>660px' ) {
min-height: auto;
}
}

.jp-connection-settings__modal-body {
Expand Down
31 changes: 31 additions & 0 deletions _inc/client/components/jetpack-termination-dialog/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

.jetpack-termination-dialog__feature {
width: calc( 100% - 2em );

@include breakpoint( '>660px' ) {
width: calc( 50% - 2em );
}
Expand Down Expand Up @@ -113,25 +114,55 @@
font-weight: normal;
line-height: 24px;
margin-top: 29px;
margin-bottom: 120px;

// replicates behavior from .dops-card and keeps this centered
@include breakpoint( '>480px' ) {
margin-top: 37px;
}
@include breakpoint( '>680px' ) {
margin-bottom: 0;
}
}

.admin-bar .dops-modal-wrapper {
@media only screen and ( min-width: 600px ) {
top: 46px;
}
@media only screen and ( min-width: 782px ) {
top: 32px;
}
}

.jetpack-termination-dialog__button-row {
display: flex;
flex-direction: column;
justify-content: space-between;
position: fixed;
background: $white;
bottom: 0;
margin-left: -16px;
width: 100%;
padding: 10px 16px;
border-top: 1px solid $gray;
box-sizing: border-box;

p {
text-align: center;
margin-top: 0;
}

@include breakpoint( '>480px' ) {
margin-left: -24px;
padding: 10px 24px;
}

@include breakpoint( '>660px' ) {
flex-direction: row;
position: relative;
margin-left: 0;
padding: 0;
border-top: none;

p {
text-align: auto;
Expand Down