-
Notifications
You must be signed in to change notification settings - Fork 10
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
fix/202: make "You're connected to Square" page entire UI to be visible #224
Draft
Sidsector9
wants to merge
18
commits into
trunk
Choose a base branch
from
fix/202
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+566
−336
Draft
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
52a044b
Merge branch 'trunk' of github.com:woocommerce/woocommerce-square int…
Sidsector9 7c8f0fe
Merge branch 'trunk' of github.com:woocommerce/woocommerce-square int…
Sidsector9 eaefa2f
Merge branch 'trunk' of github.com:woocommerce/woocommerce-square int…
Sidsector9 81368b0
fix connect to square screen
Sidsector9 06faeaa
Merge branch 'trunk' into fix/202
Sidsector9 d8153a0
fix eslint issue
Sidsector9 717e352
Merge branch 'fix/202' of github.com:woocommerce/woocommerce-square i…
Sidsector9 5805ab8
replace classname for payment complete page
Sidsector9 9984bee
fix payment complete page
Sidsector9 fa8189c
float --left container to right
Sidsector9 ebe6f7e
fix header
Sidsector9 a46d10a
add SettingsWrapper
Sidsector9 d8aca19
Merge branch 'trunk' into fix/202
Sidsector9 30f6086
Merge branch 'fix/202' of github.com:woocommerce/woocommerce-square i…
Sidsector9 bead833
move flicker issue when a setting is updated
Sidsector9 1cda06e
fix font sizes for lower screens sizes
Sidsector9 4d1857c
fix eslint issues
Sidsector9 9df6f0f
Merge branch 'trunk' into fix/202
Sidsector9 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 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
118 changes: 78 additions & 40 deletions
118
src/new-user-experience/components/onboarding-header/index.scss
This file contains 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,42 +1,80 @@ | ||
@mixin is-below-mobile { | ||
@media screen and (max-width: 600px) { | ||
@content; | ||
} | ||
} | ||
|
||
@mixin is-mobile { | ||
@media screen and (min-width: 601px) and (max-width: 782px) { | ||
@content; | ||
} | ||
} | ||
|
||
@mixin is-tablet { | ||
@media screen and (min-width: 783px) and (max-width: 960px) { | ||
@content; | ||
} | ||
} | ||
|
||
@mixin is-desktop { | ||
@media screen and (min-width: 961px) { | ||
@content; | ||
} | ||
} | ||
|
||
.woo-square-onboarding__header { | ||
position: absolute; | ||
top: 0; | ||
left: -20px; | ||
width: calc(100% + 20px); | ||
background: #fff; | ||
padding: 22px 0; | ||
border-bottom: 0.5px solid #bfbfbf; | ||
z-index: 9999; | ||
|
||
.backBtn { | ||
button { | ||
margin-left: 10px; | ||
font-weight: 590; | ||
} | ||
|
||
svg { | ||
margin: 0 10px -2px 0; | ||
} | ||
} | ||
|
||
.wizardTitle { | ||
text-align: center; | ||
position: absolute; | ||
left: 0; | ||
right: 0; | ||
width: 200px; | ||
margin: auto; | ||
|
||
svg { | ||
margin: 0 10px -7px; | ||
} | ||
|
||
span { | ||
font-weight: 700; | ||
} | ||
} | ||
|
||
.closeWizard { | ||
margin-right: 20px; | ||
} | ||
position: fixed; | ||
top: 46px; | ||
width: calc( 100% - 160px ); | ||
display: flex; | ||
|
||
justify-content: space-between; | ||
align-items: center; | ||
border-bottom: 0.5px solid #bfbfbf; | ||
background-color: #fff; | ||
z-index: 999; | ||
|
||
@media screen and (max-width: 960px) { | ||
top: 32px; | ||
width: calc( 100% - 36px ); | ||
} | ||
|
||
@media screen and (max-width: 782px) { | ||
width: 100%; | ||
} | ||
|
||
.backBtn { | ||
button { | ||
display: flex !important; | ||
|
||
span { | ||
display: inline-block; | ||
margin-left: 12px; | ||
} | ||
} | ||
} | ||
|
||
.wizardTitle { | ||
display: flex; | ||
justify-content: center; | ||
} | ||
|
||
@include is-below-mobile() { | ||
top: 46px; | ||
height: 46px; | ||
} | ||
|
||
@include is-mobile { | ||
top: 46px; | ||
height: 46px; | ||
} | ||
|
||
@include is-tablet() { | ||
height: 80px; | ||
} | ||
|
||
@include is-desktop() { | ||
top: 32px; | ||
height: 80px; | ||
} | ||
} |
This file contains 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 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
Oops, something went wrong.
Oops, something went wrong.
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.
Looks like an eslint issue that needs cleaned up here