This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
Refactor siteInfo.js with Aphrodite #7985
Merged
Conversation
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
|
Note: on the last two dialogs the text is not aligned to the buttons but it is just because the word is not broken. With
|
NejcZdovc
reviewed
Apr 3, 2017
js/components/siteInfo.js
Outdated
| position: 'absolute' | ||
| }, | ||
| secureIcon__extendedValidation: { | ||
| color: 'green' |
There was a problem hiding this comment.
Please change this to HEX
There was a problem hiding this comment.
NejcZdovc
suggested changes
Apr 5, 2017
js/components/siteInfo.js
Outdated
| [css(styles.secureIcon__fa)]: true | ||
| })} /> | ||
| <span className={css(styles.secureIcon__label)} | ||
| data-test-id='insecureconnection' |
There was a problem hiding this comment.
change to insecureConnection
js/components/siteInfo.js
Outdated
| <div className={css(styles.flexJustifyEnd, styles.viewCertificateButton__wrapper)}> | ||
| <Button l10nId='viewCertificate' | ||
| className='primaryButton' | ||
| data-test-id='viewCertificate' |
js/components/siteInfo.js
Outdated
| <div className={css(styles.flexJustifyEnd, styles.viewCertificateButton__wrapper)}> | ||
| <Button l10nId='allowRunInsecureContent' | ||
| className='whiteButton' | ||
| data-test-id='allowRunInsecureContentButton' |
js/components/siteInfo.js
Outdated
| /> | ||
| <Button l10nId='dismissAllowRunInsecureContent' | ||
| className='primaryButton' | ||
| data-test-id='dismissAllowRunInsecureContentButton' |
js/components/siteInfo.js
Outdated
| <div className={css(styles.flexJustifyEnd, styles.viewCertificateButton__wrapper)}> | ||
| <Button l10nId='dismissDenyRunInsecureContent' | ||
| className='whiteButton' | ||
| data-test-id='dismissDenyRunInsecureContentButton' |
js/components/siteInfo.js
Outdated
| /> | ||
| <Button l10nId='denyRunInsecureContent' | ||
| className='primaryButton' | ||
| data-test-id='denyRunInsecureContentButton' |
cezaraugusto
reviewed
Apr 6, 2017
There was a problem hiding this comment.
Just needs to update per @NejcZdovc feedback since some tests are failing due to that. Otherwise LGTM.
Closes #7949 Also modify messageBox.js, which was introduced with #7107 - Introduced globalStyles.spacing.dialogInsideMargin As the marginTop of title and marginBottom of buttons on messageBox.js had been set to 0.5em, I removed and added them to padding of flyoutDialog. The vaule was calculated this way: calc(10px + 0.5rem) = 18px. Also I applied it to the elements inside messageBox.js - Aligned the buttons to the right (same as messageBox.js) - Introduced siteInfo__wrapperLarge As the buttons on mixed content info dialog are so huge that sometimes they are wrapped, epecially on foreign language like Japanese. This is a temporary workaround to avoid it. - Moved 'denyRunInsecureContent' button to the right to improve UX - Updated automated test code Auditors: Test Plan: 1. Open https://apple.com 2. Click the lock icon on the URL bar 3. Make sure the title and description are aligned 4. Make sure the button is aligned to the right 5. Open http://apple.com 6. Click the unlock icon on the URL bar 7. Make sure the title and description are aligned 8. Open https://mixed-script.badssl.com 9. Click the lock icon 10. Make sure the buttons are aligned to the right and they are not wrapped 11. Click "Load Unsafe Script" 12. Click the unlock icon on the URL bar 13. Click "Stop Loading Unsafe Script" 14. Visit http://jsbin.com/fiyojusahu/edit?html,output 15. Make sure the elements are aligned well 16. Visit http://jsbin.com/sadunogefu/edit?html,output 17. Make sure the switch next to "Prevent this page from creating additional dialogs" is aligned with the body text
|
@luixxiul can we merge this, because I need this PR to start working on something new. I noticed that you changed base branch, so not sure if I can merge it or not |
|
OK, I'm going to change the base branch as this does not depend on another PR of mine. |
|
@NejcZdovc Done! If LGTM, please ping me, thanks! |
|
@luixxiul LGTM, so you can merge it |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Closes #7949
Also modify messageBox.js, which was introduced with #7107
Introduced globalStyles.spacing.dialogInsideMargin
As the marginTop of title and marginBottom of buttons on messageBox.js had been set to 0.5em, I removed and added them to padding of flyoutDialog. The vaule was calculated this way:
calc(10px + 0.5rem) = 18px. Also I applied it to the elements inside messageBox.jsAligned the buttons to the right (same as messageBox.js)
Introduced siteInfo__wrapper__large
As the buttons on mixed content info dialog are so huge that sometimes they are wrapped, epecially on foreign language like Japanese. This is a temporary workaround to avoid it.
Moved 'denyRunInsecureContent' button to the right to improve UX
Updated automated test code
Auditors:
Test Plan:
git rebase -ito squash commits (if needed).Test Plan: