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

Remove adblock.less & Rename custom classNames on switchControl.js #9043

Merged
merged 2 commits into from
Jun 2, 2017
Merged

Remove adblock.less & Rename custom classNames on switchControl.js #9043

merged 2 commits into from
Jun 2, 2017

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented May 25, 2017

customRightTextClassName

Closes #9042
Addresses #7321

Test Plan:

  1. Open about:adblock
  2. Open devtool
  3. Make sure there is 15 px margin-left on the switches

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).

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

@luixxiul luixxiul added this to the 0.16.100 milestone May 25, 2017
@luixxiul luixxiul self-assigned this May 25, 2017
@luixxiul luixxiul mentioned this pull request May 26, 2017
@luixxiul luixxiul modified the milestones: 0.16.200, 0.16.100 May 26, 2017
@@ -37,6 +37,7 @@ class AdBlockItem extends ImmutableComponent {
<SwitchControl id={this.props.resource.get('uuid')}
rightText={this.props.resource.get('title')}
className={`switch-${this.props.resource.get('uuid')}`}
customRightText={css(styles.adblockLists__adblockItem__switchControl)}
Copy link
Member

Choose a reason for hiding this comment

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

This name is a bit misleading for passing in styles, Maybe call it customRightTextStyle?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would agree. I'm fixing other custom* with this PR later.

Suguru Hirahara added 2 commits May 27, 2017 00:02
Closes #9042
Addresses #7321

Test Plan:
1. Open about:adblock
2. Open devtool
3. Make sure there is 15 px margin-left on the switches
Addresses #7321

Auditors:

Test Plan:
1. npm run test -- --grep='Bravery Panel'
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 5022028 into brave:master Jun 2, 2017
@luixxiul luixxiul deleted the aboutAdblock-aphrodite branch June 2, 2017 04:26
@luixxiul luixxiul mentioned this pull request Jun 7, 2017
7 tasks
@luixxiul
Copy link
Contributor Author

luixxiul commented Jun 7, 2017

I confirmed pulling the two commits to 0.17 branch fixed the conflicts for #9078.

https://github.com/brave/browser-laptop/pull/9043/files#diff-f9e9c72cdac7b145336979a3e76f20ebR195

@luixxiul luixxiul changed the title Remove adblock.less Remove adblock.less & Rename custom classNames on switchControl.js Jun 7, 2017
bsclifton pushed a commit that referenced this pull request Jun 7, 2017
* Remove adblock.less

Closes #9042
Addresses #7321
@luixxiul luixxiul modified the milestones: 0.17.x (Frozen, only critical adds from here), 0.18.x Jun 7, 2017
luixxiul added a commit that referenced this pull request Jun 8, 2017
Based on the case here: #9043
@luixxiul luixxiul mentioned this pull request Jun 8, 2017
8 tasks
@srirambv
Copy link
Collaborator

Not seeing the fix on 0.17.3
image

@luixxiul
Copy link
Contributor Author

because the margin is this one:

screenshot 2017-06-21 12 05 56

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.

4 participants