Commit db43a5ce authored by Mark Striemer's avatar Mark Striemer
Browse files

Bug 1819372 - Part 2: Use moz-button-group in Cookie Banner Reduction panel r=pbz 

Differential Revision: https://phabricator.services.mozilla.com/D173892
parent 7b5861ce

browser/base/content/browser-siteProtections.js

+2 −0
Original line number Diff line number Diff line
@@ -1746,6 +1746,8 @@ var gProtectionsHandler = { 


  onPopupShown(event) {

    if (event.target == this._protectionsPopup) {

      window.ensureCustomElements("moz-button-group");



      PopupNotifications.suppressWhileOpen(this._protectionsPopup);



      window.addEventListener("focus", this, true);

browser/components/controlcenter/content/protectionsPanel.inc.xhtml

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ 
          <description id="cookieBannerView-disable-site-warning" data-l10n-id="protections-panel-cookie-banner-view-cookie-clear-warning"></description>

          <description id="cookieBannerView-enable-site-description" data-l10n-id="protections-panel-cookie-banner-view-turn-on-description"></description>

        </vbox>

        <hbox class="panel-footer protections-popup-cookieBannerView-footer">

        <html:moz-button-group class="panel-footer protections-popup-cookieBannerView-footer">

          <button id="protections-popup-cookieBannerView-cancel"

                    data-l10n-id="protections-panel-cookie-banner-view-cancel"

                    oncommand="gProtectionsHandler._protectionsPopupMultiView.goBack();"
@@ -424,7 +424,7 @@ 
                    oncommand="gProtectionsHandler.onCookieBannerToggleCommand()"

                    default="true"

                    class="subviewbutton panel-subview-footer-button" />

        </hbox>

        </html:moz-button-group>

    </panelview>

  </panelmultiview>

</panel>

toolkit/themes/shared/global-shared.css

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ button.text-link .button-text { 
@media (-moz-platform: windows) {

  /* Swap the primary and secondary action, because Windows

   * platform conventions put the primary action on the left. */

  .panel-footer > button[default] {

  .panel-footer:not(moz-button-group) > button[default] {

    order: -1;

  }

}