Commit 0f57fbec authored by Henry Wilkes's avatar Henry Wilkes Committed by Pier Angelo Vendrame
Browse files

fixup! BB 40717: Hide Windows SSO in settings 

BB 44745: Use data-hidden-from-search rather than CSS to hide SSO
settings.

This will ensure that this patch can be dropped alongside upstream's
markup when it switches entirely to the config approach.
parent 23046f19

browser/components/preferences/privacy.inc.xhtml

+3 −1
Changes for browser/components/preferences/privacy.inc.xhtml: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ 
                 data-l10n-attrs="hidden"

                 flex="1"/>

#ifdef XP_WIN

    <hbox id="windows-sso" align="center">

    <hbox id="windows-sso" align="center" hidden="true" data-hidden-from-search="true">

      <checkbox data-l10n-id="forms-windows-sso"

                preference="network.http.windows-sso.enabled"

                class="tail-with-learn-more"/>
@@ -518,6 +518,8 @@ 
      />

    </hbox>

    <description id="windows-sso-caption" class="indent tip-caption"

           hidden="true"

           data-hidden-from-search="true"

           data-l10n-id="forms-windows-sso-desc"/>

#endif

  </vbox>

browser/themes/shared/preferences/preferences.css

+0 −7
Changes for browser/themes/shared/preferences/preferences.css: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -619,13 +619,6 @@ html|label[disabled] { 
  margin-inline-start: 0;

}



@media (-moz-platform: windows) {

  #windows-sso,

  #windows-sso-caption {

    display: none;

  }

}



/**

 * Dialog

 */