Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Update siteInfo.js to the modified BEM style #10933

Merged
merged 1 commit into from
Sep 22, 2017
Merged

Update siteInfo.js to the modified BEM style #10933

merged 1 commit into from
Sep 22, 2017

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented Sep 13, 2017

Closes #10932

Auditors:

Test Plan:

  1. Open https://mixed-script.badssl.com/
  2. Open https://mixed.badssl.com/ in a new tab
  3. Open http://http.badssl.com/ in a new tab
  4. Click the lock icon of each tab
  5. Make sure the site info dialogs are properly displayed

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.

Test Plan:

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

Closes #10932

Auditors:

Test Plan:
1. Open https://mixed-script.badssl.com/
2. Open https://mixed.badssl.com/ in a new tab
3. Open http://http.badssl.com/ in a new tab
4. Click the lock icon of each tab
5. Make sure the site info dialogs are properly displayed
@luixxiul luixxiul self-assigned this Sep 13, 2017
@luixxiul luixxiul added the priority/P5 Cosmetic. Spelling, copy, layout. New features (which should also be part of an initiative). label Sep 13, 2017
@luixxiul luixxiul added this to the 0.21.x (Nightly Channel) milestone Sep 13, 2017
[css(styles.siteInfo__wrapper__large)]: (this.props.isBlockedRunInsecureContent || this.props.runInsecureContent)
})}>
className={css(
commonStyles.flyoutDialog,
Copy link
Contributor Author

@luixxiul luixxiul Sep 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Creating <FlyoutDialog> to remove commonStyles.flyoutDialog.

eg.

<Dialog ...>
  <FlyoutDialog custom={
    styles.siteInfo,
    this.props.isBlockedRunInsecureContent && styles.siteInfo_large
  }>
  ...
  </FlyoutDialog>
</Dialog>

Almost done. See: #10977

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a PR for that from you (#10978) should it land first then this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is ok to merge this first.

<span className={cx({
fa: true,
'fa-unlock': true,
[globalStyles.appIcons.unlock]: true,
Copy link
Contributor Author

@luixxiul luixxiul Sep 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if we would create components like <AppIcon unlock custom={styles.secureIcon__fa} /> to replace span and fa classes with cx with normalized components.

#5891

Copy link
Contributor

@cezaraugusto cezaraugusto Sep 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer having the icons instead of a FA class. Food for thought if you want to go ahead with this we could gradually remove them in favor of SVG. Sources can be found here: https://github.com/encharm/Font-Awesome-SVG-PNG

Copy link
Contributor

@cezaraugusto cezaraugusto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@cezaraugusto cezaraugusto merged commit 82d2eac into brave:master Sep 22, 2017
@luixxiul luixxiul deleted the polish-siteInfo branch September 22, 2017 05:09
@bbondy bbondy modified the milestones: 0.21.x (Developer Channel), 0.20.x (Beta Channel) Oct 25, 2017
@luixxiul luixxiul removed the priority/P5 Cosmetic. Spelling, copy, layout. New features (which should also be part of an initiative). label Oct 30, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants