Commit 1e5001e0 authored by henry's avatar henry Committed by henry
Browse files

BB 44522: Modify the about dialog. 



We hide the Firefox-specific elements and apply some common styling
rules.


(cherry picked from commit 06d6d7b068b6d6d9346567e3ddb44982e1aae9ca)

Co-authored-by: default avatarHenry Wilkes <henry@torproject.org>
parent 9c93cb89

browser/base/content/aboutDialog.css

+39 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,10 @@ 
  }

  }

}

}





/* #releasenotes is moved to the same line as #aboutDialogHelpLink and

 * #submit-feedback, so we also want #aboutDialogHelpLink to have a starting

 * margin. */

#releasenotes:not([hidden]) ~ #aboutDialogHelpLink,

#submit-feedback {

#submit-feedback {

  margin-inline-start: 0.9em;

  margin-inline-start: 0.9em;

}

}
@@ -169,3 +173,38 @@ 
    content: url("chrome://global/skin/icons/loading.svg");

    content: url("chrome://global/skin/icons/loading.svg");

  }

  }

}

}



/* Common Base Browser rules. */



/* Hide Firefox elements. */

#communityExperimentalDesc,

#communityDesc,

#contributeDesc,

.bottom-link:not(.visible-bottom-link) {

  /* NOTE: Anything hidden here should also be removed from the aria-describedby

   * of the dialog element. */

  display: none;

}



#aboutDialogContainer {

  background-color: var(--about-dialog-background-color);

  color: var(--about-dialog-text-color);

  color-scheme: var(--about-dialog-color-scheme);

}



#rightBox {

  background-size: auto;

  margin-inline: 30px;

}



#bottomBox {

  background-color: var(--about-dialog-background-color-bottom);

  padding: 15px 10px 15px;

}



#trademark {

  font-size: xx-small;

  text-align: center;

  color: var(--about-dialog-text-color-trademark);

  margin-block: 10px;

}

browser/base/content/aboutDialog.xhtml

+6 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
        data-l10n-id="aboutDialog-title"

        data-l10n-id="aboutDialog-title"

#endif

#endif

        role="dialog"

        role="dialog"

        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"

        aria-describedby="version distribution distributionId trademark"

        >

        >

#ifdef XP_MACOSX

#ifdef XP_MACOSX

#include macWindow.inc.xhtml

#include macWindow.inc.xhtml
@@ -101,9 +101,13 @@ 
              <!-- This HBOX is duplicated above without class="update" -->

              <!-- This HBOX is duplicated above without class="update" -->

              <hbox align="baseline">

              <hbox align="baseline">

                <label id="version" class="update"/>

                <label id="version" class="update"/>

                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>

              </hbox>

              </hbox>

              <description class="text-blurb">

              <description class="text-blurb">

                <!-- Place release notes on the same line as the help and

                   - feedback links. We do not want the release notes on the

                   - same line as the version because it may overflow.

                   - See tor-browerr#42720. -->

                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>

                <label id="aboutDialogHelpLink" is="text-link" data-l10n-id="aboutdialog-help-user"/>

                <label id="aboutDialogHelpLink" is="text-link" data-l10n-id="aboutdialog-help-user"/>

                <label id="submit-feedback" is="text-link" data-l10n-id="aboutdialog-submit-feedback"/>

                <label id="submit-feedback" is="text-link" data-l10n-id="aboutdialog-submit-feedback"/>

              </description>

              </description>