X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fpreferences%2Fin-content%2Fpreferences.css;h=3a6c7c166f59a2d03107d93057c3b3f310e9bbdf;hp=126c11fb7f0db42017b074bf287595ea0abd434b;hb=b1dfcf3228675c75fda183c9cd0161c9be5d4047;hpb=0bcd55874801a7433d9e74c9377f866abf9d3d1a

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 126c11fb..3a6c7c16 100644
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -2,686 +2,673 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* === BEGIN shared/in-content/preferences.css === */
+/* === BEGIN shared/incontentprefs/preferences.inc.css === */
 
 @namespace html "http://www.w3.org/1999/xhtml";
 
-@font-face {
-  font-family: "Clear Sans";
-  src: url("chrome://browser/content/fonts/ClearSans-Regular.woff") format('woff');
+.main-content {
+  padding: 1.5em 0 0; /* That padding needs to match the upper stripe. */
+  overflow: auto;
+
+  /* This actually results in two black boxes extending to the right and bottom,
+   * leaving the LCARS-gray background only in a top stripe and
+   * a bit larger area on the top left.
+   * The prefpane will overlay that with the rounded shape we want. */
+  background-color: #A09090;
+  background-position: 3em 1.5em, 0px 5em;
+  background-image: linear-gradient(0deg, #000, #000), linear-gradient(0deg, #000, #000);
+  background-repeat: no-repeat;
 }
 
-#dialogBox,
-dialog,
-window,
-prefwindow,
-.windowDialog,
-page {
+#mainPrefPane {
+  padding: 10px 20px 0px;
+  border-radius: 1em 0 0 0;
   background-color: #000000;
+
+  max-width: 800px;
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-size: 1.25rem;
+  color: #FF9F00;
 }
 
 * {
   -moz-user-select: text;
 }
 
+button,
 treecol {
-  /* override the * rule to let the treecol be sortable */
+  /* override the * rule */
   -moz-user-select: none;
 }
 
-caption {
-  -moz-appearance: none;
-  margin: 0;
-}
+/* Category List */
 
-caption > label {
-  font-size: 1.3rem;
-  font-weight: bold;
-  line-height: 22px;
-  margin: 0 !important;
+#categories {
+  max-height: 100vh;
 }
 
-.main-content {
-  padding: 40px 48px 48px;
-  overflow: auto;
+#categories > scrollbox {
+  overflow-x: hidden !important;
 }
 
-prefpane {
-  max-width: 800px;
-  padding: 0;
-  font-family: "Clear Sans", sans-serif;
-  font-size: 1.25rem;
-  line-height: 22px;
-  color: #FF9F00;
+/**
+ * We want the last category to always have non-0 getBoundingClientRect().bottom
+ * so we can use the value to figure out the max-height of the list in
+ * preferences.js, so use collapse instead of display: none; if it's hidden
+ */
+#categories > .category[hidden="true"] {
+  display: -moz-box;
+  visibility: collapse;
 }
 
-prefpane > .content-box {
-  overflow: visible;
+#category-general > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general");
 }
 
-/* groupboxes */
-
-groupbox {
+#category-general:hover > .category-icon,
+#category-general[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-active");
 }
 
-groupbox label {
+#category-search > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search");
 }
 
-/* tabpanels and tabs */
-
-tabpanels {
+#category-search:hover > .category-icon,
+#category-search[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-active");
 }
 
-tabs {
+#category-content > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content");
 }
 
-.tabs-left,
-.tabs-right {
+#category-content:hover > .category-icon,
+#category-content[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active");
 }
 
-tab {
+#category-application > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications");
 }
 
-tab[selected] {
+#category-application:hover > .category-icon,
+#category-application[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-active");
 }
 
-.tab-text {
+#category-privacy > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy");
 }
 
-tab:not([selected]):hover > .tab-middle > .tab-text {
+#category-privacy:hover > .category-icon,
+#category-privacy[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-active");
 }
 
-tab:not([selected]):hover:active > .tab-middle > .tab-text {
+#category-security > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security");
 }
 
-tab[selected] > .tab-middle > .tab-text {
+#category-security:hover > .category-icon,
+#category-security[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-active");
 }
 
-/* buttons and menulists */
-
-button,
-menulist {
+#category-sync > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync");
 }
 
-button:not([disabled]):hover,
-menulist:not([disabled]):hover {
+#category-sync:hover > .category-icon,
+#category-sync[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-active");
 }
 
-button:not([disabled]):hover:active,
-menulist[open="true"]:not([disabled]) {
+#category-advanced > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced");
 }
 
-button[disabled],
-menulist[disabled] {
+#category-advanced:hover > .category-icon,
+#category-advanced[selected] > .category-icon {
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-active");
 }
 
-button > .button-box,
-menulist > .menulist-label-box {
+@media (max-width: 800px) {
+  .category-name {
+    display: none;
+  }
 }
 
-button[type="menu"] > .button-box > .button-menu-dropmarker {
-}
-/*
-.help-button {
-  min-width: 30px;
-  border-radius: 2px;
-  border: 1px solid #C1C1C1;
-  background-color: #FFCB00;
-  background-image: none;
-  box-shadow: none;
-}
+/* header */
 
-.help-button:not([disabled="true"]):hover {
-  background-color: #F4C200;
-  background-image: none;
+#header-advanced {
+  border-bottom: none;
+  padding-bottom: 0;
 }
 
-.help-button:not([disabled="true"]):hover:active {
-  background-color: #EABA00;
-  background-image: none;
+.indent {
+  margin-top: 7px;
+  margin-bottom: 7px;
 }
 
-.close-icon > .button-box,
-.help-button > .button-box {
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-right: 0 !important;
-  padding-left: 0 !important;
-}
-*/
-.help-button > .button-box > .button-icon {
-  width: 26px;
-  height: 26px;
-  background-image: url("chrome://browser/skin/preferences/in-content/help-glyph.png");
-  background-position: center;
-}
+/* General Pane */
 
-@media (min-resolution: 2dppx) {
-  .help-button > .button-box > .button-icon {
-    background-size: 26px 26px;
-    background-image: url("chrome://browser/skin/preferences/in-content/help-glyph@2x.png");
-  }
+#startupTable {
+  border-collapse: collapse;
 }
 
-.help-button > .button-box > .button-text {
-  display: none;
+#startupTable > tr > td {
+  padding: 0; /* remove the padding from html.css */
 }
 
-.spinbuttons-button {
+#startupTable > tr:not(:first-child) > td {
+  padding-top: 0.5em; /* add a spacing between the rows */
 }
 
-.spinbuttons-up {
+#startupTable > tr > .label-cell {
+  text-align: end;
+  width: 0; /* make the column as small as possible */
 }
 
-.spinbuttons-down  {
+#startupTable > tr > .label-cell > label {
+  white-space: nowrap;
 }
 
-.spinbuttons-button > .button-box {
+#startupTable > tr > .content-cell > menulist,
+#startupTable > tr > .content-cell > textbox {
+  width: calc(100% - 8px);
+  margin-left: 4px;
+  margin-right: 4px;
 }
 
-.spinbuttons-up > .button-box > .button-icon {
+#startupTable > tr > .homepage-buttons {
+  display: flex;
+  flex-wrap: wrap;
 }
 
-.spinbuttons-up[disabled] > .button-box > .button-icon {
+#startupTable > tr > .homepage-buttons > .content-cell-item {
+  flex-grow: 1;
 }
 
-.spinbuttons-down > .button-box > .button-icon {
+#useFirefoxSync  {
+  font-size: 90%;
+  -moz-margin-end: 8px !important;
 }
 
-.spinbuttons-down[disabled] > .button-box > .button-icon {
+#getStarted {
+  font-size: 90%;
 }
 
-menulist:not([editable="true"]) > .menulist-dropmarker {
+#isNotDefaultLabel {
+  font-weight: bold;
 }
 
-menulist[disabled]:not([editable="true"]) > .menulist-dropmarker {
+/* Content pane */
+#playDRMContentLink {
+  /* Line up with the buttons in the other grid bits: */
+  margin-left: 4px !important;
+  margin-right: 4px !important;
 }
 
-menulist > menupopup,
-button[type="menu"] > menupopup {
+#defaultFontSizeLabel {
+  /* !important needed to override common !important rule */
+  -moz-margin-start: 4px !important;
 }
 
-menulist > menupopup menu,
-menulist > menupopup menuitem,
-button[type="menu"] > menupopup menu,
-button[type="menu"] > menupopup menuitem {
-}
+/* Applications Pane Styles */
 
-menulist > menupopup > menu[_moz-menuactive="true"],
-menulist > menupopup > menuitem[_moz-menuactive="true"],
-button[type="menu"] > menupopup > menu[_moz-menuactive="true"],
-button[type="menu"] > menupopup > menuitem[_moz-menuactive="true"] {
+#applicationsContent {
+  padding: 15px 0;
 }
 
-menulist > menupopup > menu[selected="true"],
-menulist > menupopup > menuitem[selected="true"],
-button[type="menu"] > menupopup > menu[selected="true"],
-button[type="menu"] > menupopup > menuitem[selected="true"] {
+#filter {
+  -moz-margin-start: 0;
 }
 
-menulist > menupopup menuseparator,
-button[type="menu"] > menupopup menuseparator {
+#handlersView {
+  height: 25em;
 }
 
-/* textboxes */
-
-textbox {
+#handlersView > richlistitem {
+  min-height: 36px !important;
 }
 
-textbox[focused] {
+.typeIcon {
+  -moz-margin-start: 10px !important;
+  -moz-margin-end: 9px !important;
 }
 
-textbox[disabled] {
+.actionIcon {
+  -moz-margin-start: 11px !important;
+  -moz-margin-end: 8px !important;
 }
 
-/* Links */
-
-.text-link,
-.inline-link,
-html|a.inline-link {
+.actionsMenu {
+  min-height: 36px;
 }
 
-.text-link:hover,
-.inline-link:hover {
+.actionsMenu > menupopup > menuitem {
+  -moz-padding-start: 10px !important;
 }
 
-.text-link:hover:active,
-.inline-link:hover:active {
+.actionsMenu > menupopup > menuitem > .menu-iconic-left {
+  -moz-margin-end: 8px !important;
 }
 
-/* Checkboxes and radio buttons */
+/* Privacy pane */
 
-.checkbox-check {
+#doNotTrackInfo,
+#trackingProtectionPBMLearnMore,
+#trackingProtectionLearnMore {
+  -moz-margin-start: 1.5em !important;
+  margin-top: 0;
 }
 
-.checkbox-check[checked] {
+/* Collapse the non-active vboxes in decks to use only the height the
+   active vbox needs */
+#historyPane:not([selectedIndex="1"]) > #historyDontRememberPane,
+#historyPane:not([selectedIndex="2"]) > #historyCustomPane,
+#weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount,
+#weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate,
+#weavePrefsDeck:not([selectedIndex="3"]) > #noFxaAccount,
+#weavePrefsDeck:not([selectedIndex="4"]) > #hasFxaAccount,
+#fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified,
+#fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected {
+  visibility: collapse;
 }
 
-radio {
+/* XXX This style is for bug 740213 and should be removed once that
+   bug has a solution. */
+description > html|a {
+  cursor: pointer;
 }
 
-.radio-check {
+#noFxaAccount {
+  /* Overriding the margins from the base preferences.css theme file.
+     These overrides can be simplified by fixing bug 1027174 */
+  margin: 0;
 }
 
-.radio-check[selected] {
+#weavePrefsDeck > vbox > label,
+#weavePrefsDeck > vbox > groupbox,
+#weavePrefsDeck > vbox > description,
+#weavePrefsDeck > vbox > #pairDevice > label,
+#weavePrefsDeck > #needsUpdate > hbox > #loginError,
+#weavePrefsDeck > #hasFxaAccount > vbox > label,
+#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label {
+  /* no margin-start for elements at the begin of a line */
+  -moz-margin-start: 0;
 }
 
-/* Category List */
-
-#categories {
-  background-color: #A09090;
-  padding-top: 39px;
-  margin: 0;
-  border-radius: 1em 0 0 0;
+#advancedPrefs {
+  padding-bottom: 0; /* no padding needed in inContent prefs */
 }
 
-.category {
-  background-color: #000000;
-  color: #FFCF00;
-  -moz-border-end-width: 0;
-  -moz-padding-start: 15px;
-  -moz-padding-end: 21px;
-  min-height: 40px;
-  transition: background-color 150ms;
+#tabsElement {
+/*  -moz-margin-end: 4px; / add the 4px end-margin of other elements */
 }
 
-.category:hover {
-  background-color: #FFCF00;
-  color: #000000;
+#telemetryLearnMore,
+#FHRLearnMore,
+#crashReporterLearnMore {
+  /* provide some margin between the links and the label text */
+  /* !important is needed to override the rules defined in common.css */
+  -moz-margin-start: 20px !important;
+  /* center the links */
+  margin-top: 8px;
+  margin-bottom: 8px;
 }
 
-.category[selected] {
-  background-color: #008484;
-  color: #000000;
+.text-link {
+  margin-bottom: 0;
 }
 
-.category-name {
-  line-height: 22px;
-  font-family: "Clear Sans", sans-serif;
-  font-size: 1.25rem;
-  padding-bottom: 2px;
-  -moz-padding-start: 9px;
-  margin: 0;
+#showUpdateHistory {
+  -moz-margin-start: 0;
 }
 
-.category-icon {
-  width: 24px;
-  height: 24px;
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.png");
-}
+/**
+ * Dialog
+ */
 
-#category-general > .category-icon {
-  -moz-image-region: rect(0, 24px, 24px, 0);
+#dialogOverlay {
+  background-color: rgba(0,0,0,0.75);
+  visibility: hidden;
 }
 
-#category-general:hover > .category-icon,
-#category-general[selected] > .category-icon {
-  -moz-image-region: rect(24px, 24px, 48px, 0);
+#dialogBox {
+  background-color: #000000;
+  background-clip: content-box;
+  color: #FF9F00;
+  /* font-size: 14px; */
+  border: 1px solid #9C9CFF;
+  border-radius: 10px;
+  display: -moz-box;
+  margin: 0;
+  padding-right: 6px;
+  padding-left: 6px;
 }
 
-#category-content > .category-icon {
-  -moz-image-region: rect(0, 48px,  24px, 24px)
+#dialogBox[resizable="true"] {
+  resize: both;
+  overflow: hidden;
+  min-height: 20em;
+  min-width: 66ch;
 }
 
-#category-content:hover > .category-icon,
-#category-content[selected] > .category-icon {
-  -moz-image-region: rect(24px, 48px, 48px, 24px);
+#dialogBox > .groupbox-title {
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+/*  padding: 3.5px 0;
+  background-color: #F1F1F1; */
 }
 
-#category-application > .category-icon {
-  -moz-image-region: rect(0, 72px,  24px, 48px)
+#dialogTitle {
+  text-align: center;
+  -moz-user-select: none;
 }
 
-#category-application:hover > .category-icon,
-#category-application[selected] > .category-icon {
-  -moz-image-region: rect(24px, 72px, 48px, 48px);
+.close-icon {
+  background-color: transparent !important;
+  border: none;
+  box-shadow: none;
+  padding: 0;
+  height: auto;
+  min-height: 16px;
+  min-width: 0;
 }
 
-#category-privacy > .category-icon {
-  -moz-image-region: rect(0, 96px,  24px, 72px)
+#dialogBox > .groupbox-title > caption {
+  margin: 0;
+  border-radius: 1000px;
+  background-color: #A09090;
 }
 
-#category-privacy:hover > .category-icon,
-#category-privacy[selected] > .category-icon {
-  -moz-image-region: rect(24px, 96px, 48px, 72px);
+#dialogBox > .groupbox-body {
+  -moz-appearance: none;
+  padding: 0;
 }
 
-#category-security > .category-icon {
-  -moz-image-region: rect(0, 120px,  24px, 96px)
+#dialogFrame {
+  -moz-box-flex: 1;
+  /* Default dialog dimensions */
+  height: 20em;
+  width: 66ch;
 }
 
-#category-security:hover > .category-icon,
-#category-security[selected] > .category-icon {
-  -moz-image-region: rect(24px, 120px, 48px, 96px);
+.largeDialogContainer.doScroll {
+  overflow-y: auto;
+  -moz-box-flex: 1;
 }
 
-#category-sync > .category-icon {
-  -moz-image-region: rect(0, 144px, 24px, 120px);
-}
+/**
+ * End Dialog
+ */
 
-#category-sync:hover > .category-icon,
-#category-sync[selected] > .category-icon {
-  -moz-image-region: rect(24px, 144px, 48px, 120px);
-}
+/**
+ * Font dialog menulist fixes
+ */
 
-#category-advanced > .category-icon {
-  -moz-image-region: rect(0, 168px, 24px, 144px)
+#defaultFontType,
+#serif,
+#sans-serif,
+#monospace {
+  min-width: 30ch;
 }
 
-#category-advanced:hover > .category-icon,
-#category-advanced[selected] > .category-icon {
-  -moz-image-region: rect(24px, 168px, 48px, 144px);
+/**
+ * Sync migration
+ */
+#sync-migrate-upgrade-description {
+  /* description elts need a min-width to wrap correctly - bug 630864? */
+  min-width: 100px
 }
 
-/* header */
-
-.header {
-  margin-bottom: 15px;
+#sync-migration {
+  border: 1px solid #9C9CFF;
+  background-color: #000000;
+  color: #A09090;
+  text-shadow: none;
+  margin: 5px 0 0 0;
+  animation: fadein 3000ms;
 }
 
-.header-icon {
-  width: 40px;
-  max-height: 40px;
-  -moz-margin-end: 20px;
-  list-style-image: url("chrome://browser/skin/preferences/in-content/header.png");
+@keyframes fadein {
+  from { opacity: 0; }
+  to   { opacity: 1; }
 }
 
-.header-name {
-  font-size: 2.5rem;
-  font-weight: normal;
-  line-height: 40px;
-  margin: 0;
-}
+/**
+ * Sync
+ */
 
-#header-general > .header-icon {
-  -moz-image-region: rect(0, 40px, 40px, 0);
+#fxaProfileImage {
+  max-width: 60px;
+  border-radius: 50%;
+  list-style-image: url(chrome://browser/skin/fxa/default-avatar.png);
+  margin-inline-end: 15px;
 }
 
-#header-content > .header-icon {
-  -moz-image-region: rect(0, 80px, 40px, 40px);
+#fxaProfileImage.actionable {
+  cursor: pointer;
 }
 
-#header-application > .header-icon {
-  -moz-image-region: rect(0, 120px, 40px, 80px);
+#fxaProfileImage.actionable:hover {
+  box-shadow: 0px 0px 0px 1px #FFCF00;
 }
 
-#header-privacy > .header-icon {
-  -moz-image-region: rect(0, 160px, 40px, 120px);
+#fxaProfileImage.actionable:hover:active {
+  box-shadow: 0px 0px 0px 1px #FF9F00;
 }
 
-#header-security > .header-icon {
-  -moz-image-region: rect(0, 200px, 40px, 160px);
+#noFxaAccount {
+  /* Overriding the margins from the base preferences.css theme file.
+     These overrides can be simplified by fixing bug 1027174 */
+  margin: 0;
+  padding-top: 15px;
 }
 
-#header-sync > .header-icon {
-  -moz-image-region: rect(0, 240px, 40px, 200px);
+#fxaContentWrapper {
+  -moz-box-flex: 1;
 }
 
-#header-advanced > .header-icon {
-  -moz-image-region: rect(0, 280px, 40px, 240px);
+#noFxaGroup {
+  -moz-box-flex: 1;
+  margin: 0;
 }
 
-@media (min-resolution: 2dppx) {
-  .header-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/header@2x.png");
-  }
-
-  #header-general > .header-icon {
-    -moz-image-region: rect(0, 80px, 80px, 0);
-  }
-
-  #header-content > .header-icon {
-    -moz-image-region: rect(0, 160px, 80px, 80px);
-  }
-
-  #header-application > .header-icon {
-    -moz-image-region: rect(0, 240px, 80px, 160px);
-  }
-
-  #header-privacy > .header-icon {
-    -moz-image-region: rect(0, 320px, 80px, 240px);
-  }
-
-  #header-security > .header-icon {
-    -moz-image-region: rect(0, 400px, 80px, 320px);
-  }
-
-  #header-sync > .header-icon {
-    -moz-image-region: rect(0, 480px, 80px, 400px);
-  }
-
-  #header-advanced > .header-icon {
-    -moz-image-region: rect(0, 560px, 80px, 480px);
-  }
+#fxaContentWrapper {
+  padding-right: 15px;
 }
 
-.indent {
-  margin-top: 7px;
-  margin-bottom: 7px;
+#noFxaGroup > vbox,
+#fxaGroup {
+  -moz-box-align: start;
 }
 
-/* General Pane */
-/*
-filefield {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  padding: 0;
+#syncStatusMessage {
+  visibility: collapse;
+  opacity: 0;
+  transition: opacity 1s linear;
+  padding: 14px 8px 14px 14px;
+  border-radius: 2px;
 }
 
-.fileFieldContentBox {
-  background-color: transparent;
+#syncStatusMessage[message-type] {
+  visibility: visible;
+  opacity: 1;
 }
 
-.fileFieldIcon {
-  -moz-margin-start: 10px;
-  -moz-margin-end: 0;
+#syncStatusMessage[message-type="verify-success"] {
+  background-color: #008484;
 }
 
-.fileFieldLabel {
-  -moz-margin-start: -26px;
-  -moz-padding-start: 36px;
+#syncStatusMessage[message-type="verify-error"] {
+  background-color: #FF0000;
 }
-*/
 
-/* Applications Pane Styles */
-
-#applicationsContent {
-  -moz-margin-start: 60px;
-  padding: 15px 0;
+#syncStatusMessage[message-type="migration"] {
+  background-color: #FF9F00;
 }
 
-#filter {
-  -moz-margin-start: 0;
+#syncStatusMessageWrapper {
+  -moz-box-flex: 1;
+  padding-right: 5px;
 }
 
-#handlersView {
-  -moz-margin-start: 0;
-  font-size: 1.25rem;
-  line-height: 22px;
-  border: none; /*1px solid #9C9CFF;*/
-  margin: 0;
-  overflow-y: auto;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+#syncStatusMessageTitle, #syncStatusMessageDescription {
+  color: #9C9CFF;
 }
 
-#handersView > listheader > treecol {
-  border-radius: 0;
+#syncStatusMessage[message-type="migration"] #syncStatusMessageTitle {
+  display: none;
 }
 
-#typeColumn,
-#actionColumn {
-  font-family: "Clear Sans", sans-serif;
-  line-height: 20px;
-/*  color: #737980;
-  height: 36px;
-  padding: 0 10px;
-  background-color: #F7F7F7;
-  border: 1px solid #CCCCCC;
-  -moz-border-top-colors: none;
-  -moz-border-right-colors: none;
-  -moz-border-bottom-colors: none;
-  -moz-border-left-colors: none;
-*/
+#syncStatusMessageTitle {
+  font-weight: bold !important;
+  font-size: 16px;
+  line-height: 157%;
+  margin: 0 0 20px;
 }
 
-#typeColumn:-moz-locale-dir(ltr),
-#actionColumn:-moz-locale-dir(rtl) {
-  border-top-left-radius: 5px;
+#syncStatusMessageDescription {
+  font-size: 14px;
+  line-height: 158%;
+  margin: 0 !important;
 }
 
-#typeColumn:-moz-locale-dir(rtl),
-#actionColumn:-moz-locale-dir(ltr) {
-  border-top-right-radius: 5px;
-}
-/*
-#typeColumn:hover,
-#actionColumn:hover {
-  border-color: #737980;
+#syncStatusMessageClose {
+  margin: 0px;
 }
 
-#typeColumn:hover:active,
-#actionColumn:hover:active {
-  padding: 0 10px;
-  border-color: #0096DC;
+#fxaSyncEngines > vbox:first-child {
+  margin-right: 80px;
 }
-*/
-#typeColumn > .treecol-sortdirection[sortDirection=ascending],
-#actionColumn > .treecol-sortdirection[sortDirection=ascending],
-#typeColumn > .treecol-sortdirection[sortDirection=descending],
-#actionColumn > .treecol-sortdirection[sortDirection=descending] {
+
+#fxaSyncComputerName {
+  margin-inline-start: 0px;
+  -moz-box-flex: 1;
 }
 
-#typeColumn > .treecol-sortdirection[sortDirection=descending],
-#actionColumn > .treecol-sortdirection[sortDirection=descending] {
+#tosPP-small-ToS {
+  margin-bottom: 1em;
 }
 
-#handlersView > richlistitem {
-  min-height: 40px !important;
+#fxaLoginRejectedWarning {
+  list-style-image: url("chrome://browser/skin/warning.svg");
+  margin: 4px 8px 0px 0px;
 }
 
-.typeIcon {
-  -moz-margin-start: 10px !important;
-  -moz-margin-end: 9px !important;
+#noFxaCaption {
+  font-weight: bold;
+  margin-bottom: 11px;
 }
 
-.actionIcon {
-  -moz-margin-start: 11px !important;
-  -moz-margin-end: 8px !important;
+.fxaSyncIllustration {
+  margin-top: 35px;
 }
 
-.actionsMenu {
-  height: 40px;
-  max-height: 40px;
+#syncOptions caption {
+  margin-bottom: 11px;
 }
 
-.actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 10px !important;
+#fxaSyncComputerName {
+  margin-left: 0px;
 }
 
-.actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-margin-end: 8px !important;
+#noFxaDescription {
+  margin-bottom: 20px !important;
 }
 
-/* XXX This style is for bug 740213 and should be removed once that
-   bug has a solution. */
-description > html|a {
-  cursor: pointer;
+.separator {
+  border-bottom: 1px solid var(--in-content-header-border-color);
 }
 
-#offlineAppsList,
-#syncEnginesList {
-/*  -moz-appearance: none;
-  color: #737980;
-  padding: 10px;
-  border: 1px solid rgba(23,50,77,0.4);
+.fxaAccountBox {
+  border: 1px solid #A09090;
   border-radius: 5px;
-  background-color: #F1F1F1;*/
+  padding: 14px 20px 14px 14px;
 }
 
-#advancedPrefs {
-  padding-bottom: 0; /* no padding needed in inContent prefs */
+#signedOutAccountBoxTitle {
+  font-weight: bold;
 }
 
-#encryptionPanel {
-  margin-top: 15px;
-  -moz-margin-start: 60px;
+.fxaAccountBoxButtons {
+  margin-bottom: 0 !important;
+  margin-top: 11px;
 }
 
-#telemetryLearnMore,
-#FHRLearnMore,
-#crashReporterLearnMore {
-  /* center the links */
-  margin-top: 8px;
-  margin-bottom: 8px;
+.fxaAccountBoxButtons > * {
+  -moz-box-flex: 1;
 }
 
+.fxaAccountBoxButtons > button {
+  text-align: center;
+  padding-left: 11px;
+  padding-right: 11px;
+  margin: 0;
+  min-width: 0;
+}
 
-/**
- * Sub-dialog
- */
-
-#dialogOverlay {
-  background-color: rgba(0,0,0,0.75);
-  visibility: hidden;
+.fxaAccountBoxButtons > button:first-child {
+  margin-right: 14px !important;
 }
 
-#dialogBox {
-  border: 1px solid #9C9CFF;
-  display: -moz-box;
-  margin: 0;
-  padding-right: 6px;
-  padding-left: 6px;
+.fxaSyncIllustration {
+  width: 231px;
+  list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png)
 }
 
-#dialogBox[resizable="true"] {
-  resize: both;
-  overflow: hidden;
-  min-height: 30em;
-  min-width: 66ch;
+#fxaEmailAddress1,
+#fxaEmailAddress2,
+#fxaEmailAddress3 {
+  word-break: break-all;
 }
 
-.close-icon {
-  background-color: transparent !important;
-  border: none;
-  box-shadow: none;
-  height: 18px;
-  padding: 0;
-  min-width: 18px;
+.fxaFirefoxLogo {
+  list-style-image: url(chrome://browser/skin/fxa/logo.png);
+  max-width: 64px;
+  margin-inline-end: 14px;
 }
 
-#dialogBox > .groupbox-body {
-  -moz-appearance: none;
-  padding: 0;
+.fxaMobilePromo {
+  margin-bottom: 31px;
 }
 
-#dialogFrame {
-  -moz-box-flex: 1;
-  /* Default dialog dimensions */
-  height: 30em;
-  width: 66ch;
+#fxaLoginRejectedWarning {
+  list-style-image: url(chrome://browser/skin/warning.svg);
+  filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
+  margin: 4px 8px 0px 0px;
 }
 
-/* needs to be removed with bug 1035625 */
-:-moz-any(dialog, window, prefwindow) resizer {
-  display: none;
+#syncOptions {
+  margin-bottom: 27.5px;
 }
 
-tree:not(#rejectsTree) {
-  min-height: 15em;
+.androidLink,
+.iOSLink {
+  margin: 0;
 }
 
-:-moz-any(dialog, window, prefwindow) groupbox {
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px;
+#tosPP-small {
+  margin-top: 20px;
+  margin-bottom: 20px;
 }
 
-/**
- * End sub-dialog
- */
+@media (min-resolution: 1.1dppx) {
+  .fxaSyncIllustration {
+    list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
+  }
+  .fxaFirefoxLogo {
+    list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
+  }
+  #fxaProfileImage {
+    list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
+  }
+}
 
-/* === END shared/in-content/preferences.css === */
+/* === END shared/incontentprefs/preferences.inc.css === */
 
 caption {
 }
@@ -697,64 +684,4 @@ caption {
 
   checkbox[checked]::before {
   }
-
-  .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons@2x.png");
-  }
-
-  #category-general > .category-icon {
-    -moz-image-region: rect(0, 48px, 48px, 0);
-  }
-
-  #category-general[selected] > .category-icon {
-    -moz-image-region: rect(48px, 48px, 96px, 0);
-  }
-
-  #category-content > .category-icon {
-    -moz-image-region: rect(0, 96px, 48px, 48px);
-  }
-
-  #category-content[selected] > .category-icon {
-    -moz-image-region: rect(48px, 96px, 96px, 48px);
-  }
-
-  #category-application > .category-icon {
-    -moz-image-region: rect(0, 144px, 48px, 96px);
-  }
-
-  #category-application[selected] > .category-icon {
-    -moz-image-region: rect(48px, 144px, 96px, 96px);
-  }
-
-  #category-privacy > .category-icon {
-    -moz-image-region: rect(0, 192px, 48px, 144px);
-  }
-
-  #category-privacy[selected] > .category-icon {
-    -moz-image-region: rect(48px, 192px, 96px, 144px);
-  }
-
-  #category-security > .category-icon {
-    -moz-image-region: rect(0, 240px, 48px, 192px);
-  }
-
-  #category-security[selected] > .category-icon {
-    -moz-image-region: rect(48px, 240px, 96px, 192px);
-  }
-
-  #category-sync > .category-icon {
-    -moz-image-region: rect(0, 288px, 48px, 240px);
-  }
-
-  #category-sync[selected] > .category-icon {
-    -moz-image-region: rect(48px, 288px, 96px, 240px);
-  }
-
-  #category-advanced > .category-icon {
-    -moz-image-region: rect(0, 336px, 48px, 288px);
-  }
-
-  #category-advanced[selected] > .category-icon {
-    -moz-image-region: rect(48px, 336px, 96px, 288px);
-  }
 }