Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1501986 - Update exception button styling in control center. r=johannh

Browse Source 
Change the styling of the create/remove exception button in the control center.

Differential Revision: https://phabricator.services.mozilla.com/D10312

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Erica Wright 2018-11-01 13:48:40 +00:00
parent 793c508af5
commit e1144da8c4
4 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/components/controlcenter/content/panel.inc.xul
View File

@ -107,18 +107,18 @@
<button id="tracking-action-unblock"
class="panel-button tracking-protection-button"
label="&trackingProtection.unblock4.label;"
accesskey="&trackingProtection.unblock4.accesskey;"
label="&trackingProtection.unblock5.label;"
accesskey="&trackingProtection.unblock5.accesskey;"
oncommand="ContentBlocking.disableForCurrentPage(); gIdentityHandler.recordClick('unblock');" />
<button id="tracking-action-unblock-private"
class="panel-button tracking-protection-button"
label="&trackingProtection.unblockPrivate4.label;"
accesskey="&trackingProtection.unblockPrivate4.accesskey;"
label="&trackingProtection.unblockPrivate5.label;"
accesskey="&trackingProtection.unblockPrivate5.accesskey;"
oncommand="ContentBlocking.disableForCurrentPage(); gIdentityHandler.recordClick('unblock_private');" />
<button id="tracking-action-block"
class="panel-button tracking-protection-button"
label="&trackingProtection.block5.label;"
accesskey="&trackingProtection.block5.accesskey;"
label="&trackingProtection.block6.label;"
accesskey="&trackingProtection.block6.accesskey;"
oncommand="ContentBlocking.enableForCurrentPage(); gIdentityHandler.recordClick('block');" />
<label id="identity-popup-content-blocking-report-breakage"
onclick="ContentBlocking.showReportBreakageSubview(); gIdentityHandler.recordClick('report_breakage');"

16
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -1011,18 +1011,18 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY contentBlocking.breakageReportView.sendReport.label "Send Report">
<!ENTITY contentBlocking.breakageReportView.cancel.label "Cancel">
<!-- LOCALIZATION NOTE (trackingProtection.unblock3.label, trackingProtection.unblock3.accesskey):
<!-- LOCALIZATION NOTE (trackingProtection.unblock5.label, trackingProtection.unblock5.accesskey):
The associated button with this label and accesskey is only shown when opening the control
center while looking at a site with trackers in NON-private browsing mode. -->
<!ENTITY trackingProtection.unblock4.label "Disable Blocking For This Site">
<!ENTITY trackingProtection.unblock4.accesskey "D">
<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate3.label, trackingProtection.unblockPrivate3.accesskey):
<!ENTITY trackingProtection.unblock5.label "Turn off blocking for this site">
<!ENTITY trackingProtection.unblock5.accesskey "T">
<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate6.label, trackingProtection.unblockPrivate6.accesskey):
The associated button with this label and accesskey is only shown when opening the control
center while looking at a site with trackers in PRIVATE browsing mode. -->
<!ENTITY trackingProtection.unblockPrivate4.label "Disable Blocking Temporarily">
<!ENTITY trackingProtection.unblockPrivate4.accesskey "D">
<!ENTITY trackingProtection.block5.label "Enable Blocking For This Site">
<!ENTITY trackingProtection.block5.accesskey "E">
<!ENTITY trackingProtection.unblockPrivate5.label "Turn off blocking temporarily">
<!ENTITY trackingProtection.unblockPrivate5.accesskey "T">
<!ENTITY trackingProtection.block6.label "Turn on blocking for this site">
<!ENTITY trackingProtection.block6.accesskey "T">
<!ENTITY trackingProtection.reload2.label "Reload Page">
<!ENTITY trackingProtection.reload2.accesskey "R">

1
browser/themes/osx/controlcenter/panel.css
View File

@ -9,7 +9,6 @@
box-shadow: var(--focus-ring-box-shadow);
}
.tracking-protection-button,
#identity-popup-securityView-body > button {
min-height: 30px;
}

38
browser/themes/shared/controlcenter/panel.inc.css
View File

@ -462,8 +462,46 @@ description#identity-popup-content-verifier,
/* Content Blocking action button */
.tracking-protection-button {
list-style-image: url(chrome://browser/skin/tracking-protection.svg);
-moz-appearance: none;
margin: 1em 0 0;
display: none;
height: 32px;
background-color: var(--arrowpanel-dimmed);
}
.tracking-protection-button:hover {
background-color: var(--arrowpanel-dimmed-further);
}
.tracking-protection-button:hover:active {
background-color: var(--arrowpanel-dimmed-even-further);
}
.tracking-protection-button:-moz-focusring {
box-shadow: var(--focus-ring-box-shadow);
}
#tracking-action-block {
background-color: #8000d7;
color: #fff;
}
#tracking-action-block:hover {
background-color: #7100be;
}
#tracking-action-block:hover:active {
background-color: #6200a4;
}
#tracking-action-block .button-icon {
fill-opacity: 1;
}
#tracking-action-unblock,
#tracking-action-unblock-private {
list-style-image: url(chrome://browser/skin/tracking-protection-disabled.svg);
}
#identity-popup-content-blocking-report-breakage {