From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 17 Jul 2016 22:05:17 +0000 (+0200)
Subject: third part of syncing LCARStrek with Firefox 45-48 windows theme changes
X-Git-Tag: LCARStrek-2.45~10
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=7327c957c10aeaccf57a457a9950ac380a326f29;p=themes.git

third part of syncing LCARStrek with Firefox 45-48 windows theme changes
---

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index c5768c51..b992e398 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -39,6 +39,11 @@ menubar {
 :root {
   /*--backbutton-urlbar-overlap: 5px;*/
 
+  /* icon width + border + horizontal padding (includes the overlap from backbutton-urlbar-overlap) */
+  --forwardbutton-width: 27px;
+  /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) /
+  --forwardbutton-width: 25px;*/
+
   --identity-box-verified-background-color: #000000;
 
   --panel-separator-color: #A09090;
@@ -84,13 +89,6 @@ menubar {
 /*  margin-top: var(--space-above-tabbar);*/
 }
 
-@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) {
-  /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */
-  #toolbar-menubar:not([autohide="true"]) {
-    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
-  }
-}
-
 @media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
   /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #main-window[tabsintitlebar]:not([inFullscreen="true"]) #TabsToolbar {
@@ -1010,12 +1008,12 @@ toolbarpaletteitem[place="palette"] > #save-page-button:hover {
 
 #sync-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #sync-button {
-  -moz-image-region: rect(0, 792px, 18px, 774px);
+  -moz-image-region: rect(0px, 1024px, 32px, 992px);
 }
 
 #sync-button[cui-areatype="menu-panel"]:hover,
 toolbarpaletteitem[place="palette"] > #sync-button:hover {
-  -moz-image-region: rect(32px, 792px, 64px, 774px);
+  -moz-image-region: rect(32px, 1024px, 64px, 992px);
 }
 
 #feed-button[cui-areatype="menu-panel"],
@@ -1530,6 +1528,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope
   margin-top: 3px;
   margin-bottom: 3px;
   border-radius: 0 10000px 10000px 0;
+/*  max-width: calc(var(--forwardbutton-width) + var(--backbutton-urlbar-overlap)) !important; */
 }
 
 #forward-button:-moz-locale-dir(rtl) {
@@ -1541,7 +1540,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #fo
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] {
-  margin-left: -27px !important;
+  margin-left: calc(0px - var(--forwardbutton-width)/* - var(--backbutton-urlbar-overlap)*/);
 }
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] {
@@ -1551,7 +1550,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs])
 
 window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] {
   /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
-  margin-left: -27.01px !important;
+  margin-left: calc(-0.01px - var(--forwardbutton-width)/* - var(--backbutton-urlbar-overlap)*/);
 }
 
 #back-button {
@@ -1948,7 +1947,11 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   transition: opacity 0.15s ease;
 }
 
-#navigator-toolbox:not(:hover) .urlbar-history-dropmarker {
+#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+  transition: none;
+}
+
+#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker {
   opacity: 0;
 }
 
@@ -2125,6 +2128,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   visibility: visible;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
+  list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg);
+  visibility: visible;
+}
+
 /* === END identity-block.inc.css === */
 
 #page-proxy-favicon {
@@ -2730,6 +2738,7 @@ richlistitem[type~="action"][actiontype="tab"][selected="true"] > .ac-url-box >
   height: 16px;
   margin-top: -8px;
   -moz-margin-start: -15px;
+  margin-inline-end: -1px;
   position: relative;
 }
 
@@ -3308,11 +3317,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
-.popup-notification-icon[popupid="webapps-install-progress"],
-.popup-notification-icon[popupid="webapps-install"] {
-  list-style-image: url("chrome://global/skin/icons/webapps-64.png");
-}
-
 .popup-notification-icon[popupid="webRTC-sharingDevices"],
 .popup-notification-icon[popupid="webRTC-shareDevices"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
@@ -3379,11 +3383,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   outline: 1px dotted #008484;
 }
 
-.identity-notification-icon,
-#identity-notification-icon {
-  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
-}
-
 .geo-notification-icon,
 #geo-notification-icon {
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
@@ -3416,10 +3415,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   transform: scaleX(-1);
 }
 
-#webapps-notification-icon {
-  list-style-image: url("chrome://gobal/skin/icons/webapps-16.png");
-}
-
 #plugins-notification-icon {
   list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
 }
@@ -3709,9 +3704,7 @@ notification[value="translation"] {
 
 /* Bookmarks roots menu-items */
 #subscribeToPageMenuitem:not([disabled]),
-#subscribeToPageMenupopup,
-#BMB_subscribeToPageMenuitem:not([disabled]),
-#BMB_subscribeToPageMenupopup {
+#subscribeToPageMenupopup {
   list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
 }
 
diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css
index 4336b20e..36debc66 100644
--- a/LCARStrek/browser/controlcenter/panel.css
+++ b/LCARStrek/browser/controlcenter/panel.css
@@ -11,6 +11,7 @@
 
 /* Show the right elements for the right connection states. */
 #identity-popup[connection=not-secure] [when-connection~=not-secure],
+#identity-popup[connection=secure-cert-user-overridden] [when-connection~=secure-cert-user-overridden],
 #identity-popup[connection=secure-ev] [when-connection~=secure-ev],
 #identity-popup[connection=secure] [when-connection~=secure],
 #identity-popup[connection=chrome] [when-connection~=chrome],
@@ -82,15 +83,9 @@
 
 #identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews {
   background: var(--panel-arrowcontent-background);
-  border-bottom-right-radius: 3.5px;
   padding: 0;
 }
 
-#identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 3.5px;
-}
-
 .identity-popup-section:not(:first-child) {
   border-top: 1px solid var(--panel-separator-color);
 }
@@ -99,14 +94,19 @@
 #identity-popup-security-content,
 #identity-popup-permissions-content,
 #tracking-protection-content {
-  padding: 0.5em 0 1em;
-  -moz-padding-start: calc(2em + 24px);
-  -moz-padding-end: 1em;
   background-repeat: no-repeat;
   background-position: 1em 1em;
   background-size: 24px auto;
 }
 
+#identity-popup-security-content,
+#identity-popup-permissions-content,
+#tracking-protection-content {
+  padding: 0.5em 0 1em;
+  -moz-padding-start: calc(2em + 24px);
+  -moz-padding-end: 1em;
+}
+
 #identity-popup-securityView:-moz-locale-dir(rtl),
 #identity-popup-security-content:-moz-locale-dir(rtl),
 #identity-popup-permissions-content:-moz-locale-dir(rtl),
@@ -214,7 +214,6 @@
 /* SECURITY SUBVIEW */
 
 #identity-popup-securityView {
-  padding-bottom: 2em;
   overflow: hidden;
 }
 
@@ -276,7 +275,7 @@
 
 #identity-popup-securityView-footer {
   margin-top: 1em;
-  background-color: hsla(210,4%,10%,.07);
+  background-color: #402000;
 }
 
 #identity-popup-securityView-footer > button {
diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css
index 65e86d04..047f5122 100644
--- a/LCARStrek/browser/customizableui/panelUIOverlay.css
+++ b/LCARStrek/browser/customizableui/panelUIOverlay.css
@@ -193,8 +193,8 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
-/*  line-height: 1.1;*/
-  max-height: 2.2em;
+/*  line-height: 1.2;*/
+  max-height: 2.4em;
 }
 
 .panelUI-grid .toolbarbutton-1:not([auto-hyphens="off"]) > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
@@ -205,7 +205,7 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
 .panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
 .panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-multiline-text {
   position: absolute;
-  clip: rect(auto, auto, 2.3em, auto);
+  clip: rect(-0.1em, auto, 2.6em, auto);
 }
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-text,
@@ -234,6 +234,11 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
   max-width: 30em;
 }
 
+/* Give WebExtension stand-alone panels extra width for Chrome compatibility */
+.cui-widget-panel[viewId^=PanelUI-webext-] .panel-mainview {
+  max-width: 800px;
+}
+
 panelview:not([mainview]) .toolbarbutton-text,
 .cui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
@@ -651,17 +656,20 @@ PanelUI-remotetabs-instruction-label,
   color: #A09090;
 }
 
-/* The boxes with "instructions" get extra padding for space around the
-   illustration and buttons */
+/* The boxes with "instructions" get extra top and bottom padding for space
+   around the illustration and buttons */
 .PanelUI-remotetabs-instruction-box {
-  padding: 30px 15px 15px 15px;
+  padding-bottom: 30px;
+  padding-top: 15px;
 }
 
 .PanelUI-remotetabs-prefs-button {
 /*
   -moz-appearance: none;
   background-color: #0096dd;
-  color: white;
+  / !important for the color as an OSX specific rule when a lightweight theme
+     is used for buttons in the toolbox overrides. See bug 1238531 for details /
+  color: white !important;
   border-radius: 2px;
   margin-top: 10px;
   margin-bottom: 10px;
@@ -708,7 +716,7 @@ PanelUI-remotetabs-instruction-label,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane,
 #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane {
-  min-height: 30em;
+  min-height: 33em;
 }
 
 #PanelUI-remotetabs-tabslist > label[itemtype="client"] {
diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
index 1534b699..d87aa7e4 100644
--- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
+++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css
@@ -2,6 +2,11 @@
  * 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 allDownloadsViewOverlay.inc.css === */
+
+/*** View and outer controls ***/
+
+
 #downloadsRichListBox {
   /** The default listbox appearance comes with an unwanted margin. **/
   -moz-appearance: none;
@@ -9,8 +14,10 @@
   border: none;
 }
 
+/*** List items ***/
+
 #downloadsRichListBox > richlistitem.download {
-  height: 6em;
+  height: var(--downloads-item-height);
   padding: 5px 8px;
 }
 
@@ -47,6 +54,14 @@
   list-style-image: url("chrome://browser/skin/downloads/buttons.png");
 }
 
+/* === END allDownloadsViewOverlay.inc.css === */
+
+/*** List items ***/
+
+:root {
+  --downloads-item-height: 6em;
+}
+
 /*** Highlighted list items ***/
 
 richlistitem.download:not([selected]):hover {
diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css
index c27b724a..31c02e6c 100644
--- a/LCARStrek/browser/downloads/downloads.css
+++ b/LCARStrek/browser/downloads/downloads.css
@@ -2,6 +2,8 @@
  * 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 downloads.inc.css === */
+
 /*** Panel and outer controls ***/
 
 #downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent {
@@ -27,61 +29,42 @@
   max-width: 40ch;
 }
 
-#downloadsHistory {
+#downloadsSummary {
+  padding: 8px 38px 8px 12px;
   cursor: pointer;
-  margin: 4px !important;
-  color: #3333FF;
-}
-
-#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus {
-  outline: 1px #008484 dotted;
-  outline-offset: -1px;
+  -moz-user-focus: normal;
 }
 
-#downloadsHistory > .button-box {
-  border: none;
+#downloadsSummary > .downloadTypeIcon {
+  list-style-image: url("chrome://browser/skin/downloads/download-summary.png");
 }
 
-#downloadsFooter {
+#downloadsSummaryDescription {
+  color: #3333FF;
 }
 
-#downloadsFooter:hover {
+#downloadsHistory {
+  cursor: pointer;
+  margin: 4px !important;
+  color: #3333FF;
 }
 
-#downloadsFooter:hover:active {
+#downloadsHistory > .button-box {
 }
 
-/*** Downloads Summary and List items ***/
+/*** List items and similar elements in the summary ***/
 
 #downloadsSummary,
 richlistitem[type="download"] {
-  height: 7em;
+  height: var(--downloads-item-height);
   -moz-padding-end: 0;
   color: inherit;
 }
 
-#downloadsSummary {
-  padding: 8px 38px 8px 12px;
-  cursor: pointer;
-  -moz-user-focus: normal;
-}
-
-#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsSummary:focus {
-  outline: 1px #008484 dotted;
-  outline-offset: -5px;
-}
-
-#downloadsSummary > .downloadTypeIcon {
-  list-style-image: url("chrome://browser/skin/downloads/download-summary.png");
-}
-
-#downloadsSummaryDescription {
-  color: #3333FF;
-}
-
 richlistitem[type="download"] {
   margin: 0;
-  border-bottom: 1px dotted #9C9CFF;
+  /*border-top: 1px solid var(--downloads-item-border-top-color);*/
+  border-bottom: 1px solid var(--downloads-item-border-bottom-color);
   background: transparent;
   padding: 8px;
 }
@@ -90,12 +73,6 @@ richlistitem[type="download"]:first-child {
 /*  border-top: 1px solid transparent;*/
 }
 
-#downloadsListBox:-moz-focusring > richlistitem[type="download"][selected] {
-  outline: 1px #008484 dotted;
-  outline-offset: -1px;
-  /*-moz-outline-radius: 3px;*/
-}
-
 .downloadTypeIcon {
   -moz-margin-end: 8px;
   /* Prevent flickering when changing states. */
@@ -109,7 +86,7 @@ richlistitem[type="download"]:first-child {
 
 /* We hold .downloadTarget, .downloadProgress and .downloadDetails inside of
    a vbox with class .downloadContainer. We set the font-size of the entire
-   container to 90% because:
+   container to --downloads-item-font-size-factor because:
 
    1) This is the size that we want .downloadDetails to be
    2) The container's width is set by localizers by &downloadDetails.width;,
@@ -123,22 +100,23 @@ richlistitem[type="download"]:first-child {
  */
 #downloadsSummaryDetails,
 .downloadContainer {
-  font-size: 90%;
+  font-size: calc(100% * var(--downloads-item-font-size-factor));
 }
 
 #downloadsSummaryDescription,
 .downloadTarget {
-  margin-bottom: 6px;
+  margin-bottom: var(--downloads-item-target-margin-bottom);
   cursor: inherit;
 }
 
 .downloadTarget {
-  font-size: calc(100%/0.9);
+  font-size: calc(100% / var(--downloads-item-font-size-factor));
 }
 
 #downloadsSummaryDetails,
 .downloadDetails {
-  opacity: 0.6;
+  margin-top: var(--downloads-item-details-margin-top);
+  opacity: var(--downloads-item-details-opacity);
   cursor: inherit;
 }
 
@@ -153,16 +131,66 @@ richlistitem[type="download"]:first-child {
 }
 
 .downloadButton > .button-box {
-  border: 1px solid transparent;
   padding: 0;
 }
 
+
+/* === END downloads.inc.css === */
+
+/*** Panel and outer controls ***/
+
+#downloadsFooter {
+}
+
+#downloadsFooter:hover {
+}
+
+#downloadsFooter:hover:active {
+}
+
+#downloadsPanel[keyfocus] #downloadsSummary:focus,
+#downloadsPanel[keyfocus] #downloadsHistory:focus {
+  outline: 1px #008484 dotted;
+  outline-offset: -1px;
+}
+
+#downloadsPanel[keyfocus] #downloadsSummary:focus {
+  outline-offset: -5px;
+}
+
+#downloadsHistory > .button-box {
+  /* Hide the border so we don't display an inner focus ring. */
+  border: none;
+}
+
+/*** List items and similar elements in the summary ***/
+
+:root {
+  --downloads-item-height: 7em;
+  /*--downloads-item-border-top-color: hsla(0,0%,100%,.3);*/
+  --downloads-item-border-bottom-color: #9C9CFF;
+  --downloads-item-font-size-factor: 0.9;
+  --downloads-item-target-margin-bottom: 6px;
+  --downloads-item-details-margin-top: 0;
+  --downloads-item-details-opacity: 0.6;
+}
+
+.downloadButton > .button-box {
+  border: 1px solid transparent;
+}
+
 #downloadsPanel[keyfocus] .downloadButton:focus > .button-box {
   border: 1px dotted #008484;
 }
 
 /*** Highlighted list items ***/
 
+#downloadsListBox:-moz-focusring > richlistitem[type="download"][selected] {
+  outline: 1px #008484 dotted;
+  outline-offset: -1px;
+  /*-moz-outline-radius: 3px;*/
+}
+
 /* #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { */
 #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"]:hover {
   border-radius: 3px;
diff --git a/LCARStrek/browser/feeds/subscribe-ui.css b/LCARStrek/browser/feeds/subscribe-ui.css
index 09b0d1a7..f1650036 100644
--- a/LCARStrek/browser/feeds/subscribe-ui.css
+++ b/LCARStrek/browser/feeds/subscribe-ui.css
@@ -5,25 +5,3 @@
 .alwaysUse {
   padding: 5px;
 }
-
-.handlersMenuPopup > menuitem {
-  -moz-padding-start: 23px;
-}
-
-.handlersMenuPopup > menuitem.menuitem-iconic {
-  -moz-padding-start: 2px;
-}
-
-.handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
-  display: -moz-box;
-  min-width: 16px;
-  -moz-padding-end: 2px;
-}
-
-.chooseApplicationMenuItem {
-  list-style-image: url("chrome://browser/skin/preferences/application.png");
-}
-
-.handlersMenuList > menupopup:-moz-dir(rtl) {
-  direction: rtl;
-}
diff --git a/LCARStrek/browser/feeds/subscribe.css b/LCARStrek/browser/feeds/subscribe.css
index e996cf97..b9d450eb 100644
--- a/LCARStrek/browser/feeds/subscribe.css
+++ b/LCARStrek/browser/feeds/subscribe.css
@@ -3,6 +3,20 @@ html {
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
 }
 
+#subscribeUsingDescription,
+#subscribeButton {
+  display: block;
+}
+
+#subscribeUsingDescription {
+  margin-bottom: 0.5em;
+}
+
+#subscribeButton {
+  margin-top: 0.5em;
+  margin-inline-start: auto;
+}
+
 #feedBody {
   border: 1px solid #9C9CFF;
   padding: 2em;
@@ -16,6 +30,11 @@ html {
   border-radius: 10px;
   margin: -3em auto 0 auto;
   background-color: #FFCF00;
+  display: flex;
+}
+
+#feedHeaderContainerSpacer {
+  flex-grow: 1;
 }
 
 #feedHeader {
@@ -66,6 +85,7 @@ html {
 
 #feedSubscribeLine {
   padding-top: 0.2em;
+  padding-inline-start: 0.5em;
 }
 
 /* Don't print subscription UI */
diff --git a/LCARStrek/browser/fxa/ios.png b/LCARStrek/browser/fxa/ios.png
new file mode 100644
index 00000000..c5a102d2
Binary files /dev/null and b/LCARStrek/browser/fxa/ios.png differ
diff --git a/LCARStrek/browser/fxa/ios@2x.png b/LCARStrek/browser/fxa/ios@2x.png
new file mode 100644
index 00000000..ca826f32
Binary files /dev/null and b/LCARStrek/browser/fxa/ios@2x.png differ
diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 468466f8..432b6223 100644
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -282,11 +282,12 @@ treecol {
 
 /* Privacy pane */
 
-#doNotTrackInfo,
+.doNotTrackLearnMore,
 #trackingProtectionPBMLearnMore,
 #trackingProtectionLearnMore {
   -moz-margin-start: 1.5em !important;
   margin-top: 0;
+  font-weight: normal;
 }
 
 /* Collapse the non-active vboxes in decks to use only the height the
@@ -358,6 +359,10 @@ description > html|a {
   -moz-margin-start: 0;
 }
 
+#fxaProfileImage {
+  -moz-user-focus: normal;
+}
+
 /**
  * Dialog
  */
@@ -697,7 +702,8 @@ description > html|a {
 }
 
 .fxaMobilePromo {
-  margin-bottom: 31px;
+  margin-bottom: 20px;
+  margin-top: 25px;
 }
 
 #fxaLoginRejectedWarning {
@@ -710,9 +716,22 @@ description > html|a {
   margin-bottom: 27.5px;
 }
 
+.androidLink {
+  background-image: url("chrome://browser/skin/fxa/android.png");
+}
+
+.iOSLink {
+  background-image: url("chrome://browser/skin/fxa/ios.png");
+}
+
 .androidLink,
 .iOSLink {
-  margin: 0;
+  margin: 0 0 0 2px;
+  padding-left: 28px;
+  padding-top: 6px;
+  height: 28px;
+  background-repeat: no-repeat;
+  background-size: 24px 28px;
 }
 
 #tosPP-small {
@@ -721,6 +740,12 @@ description > html|a {
 }
 
 @media (min-resolution: 1.1dppx) {
+  .androidLink {
+    background-image: url("chrome://browser/skin/fxa/android@2x.png");
+  }
+  .iOSLink {
+    background-image: url("chrome://browser/skin/fxa/ios@2x.png");
+  }
   .fxaSyncIllustration {
     list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
   }
diff --git a/LCARStrek/browser/syncedtabs/sidebar.css b/LCARStrek/browser/syncedtabs/sidebar.css
new file mode 100644
index 00000000..02ccb6ef
--- /dev/null
+++ b/LCARStrek/browser/syncedtabs/sidebar.css
@@ -0,0 +1,350 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 sidebar.inc.css === */
+
+/* These styles are intended to mimic XUL trees and the XUL search box. */
+
+html {
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  margin: 0;
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  color: #FF9F00;
+  -moz-user-select: none;
+}
+
+/* The content-container holds the non-scrollable header and the scrollable
+   content area.
+*/
+.content-container {
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+}
+
+/* The content header is not scrollable */
+.content-header {
+  flex: 0 1 auto;
+}
+
+/* The main content area is scrollable and fills the rest of the area */
+.content-scrollable {
+  flex: 1 1 auto;
+  overflow: auto;
+}
+
+.emptyListInfo {
+  cursor: default;
+  padding: 3em 1em;
+  text-align: center;
+}
+
+.list,
+.item-tabs-list {
+  display: flex;
+  flex-flow: column;
+  flex-grow: 1;
+}
+
+.item.client {
+  opacity: 1;
+  max-height: unset;
+  display: unset;
+}
+
+.item.client.closed .item-tabs-list {
+  display: none;
+}
+
+.item {
+  display: inline-block;
+  opacity: 1;
+  flex: 1;
+  min-width: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  outline: none;
+  color: #FF9F00;
+}
+
+.item.selected > .item-title-container {
+  background-color: #A09090;
+  color: #000000;
+  font-weight: bold;
+}
+
+.item.selected:focus > .item-title-container {
+  background-color: #008484;
+  color: #000000;
+}
+
+.client .item.tab > .item-title-container {
+  padding-inline-start: 35px;
+}
+
+.item.tab > .item-title-container {
+  padding-inline-start: 20px;
+}
+
+.item.tab > .item-title-container > .item-icon-container {
+  background-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+.item.tab > .item-title-container > .item-icon-container {
+    background-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+}
+
+.item-icon-container {
+  min-width: 16px;
+  max-width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+  margin-right: 5px;
+  margin-left: 5px;
+  background-size: 16px 16px;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.item-title-container {
+  display: flex;
+  flex-flow: row;
+  overflow: hidden;
+  flex-grow: 1;
+  padding: 1px 0px 1px 0px;
+}
+
+.item-title {
+  flex-grow: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin: 0px;
+  line-height: 1.3;
+}
+
+.item[hidden] {
+  opacity: 0;
+  max-height: 0;
+  transition: opacity 150ms ease-in-out, max-height 150ms ease-in-out 150ms;
+}
+
+.item.empty .item-title-container {
+  color: #A09090;
+}
+
+.client .item.empty > .item-title-container {
+  padding-inline-start: 35px;
+}
+
+.text-input-box {
+  display: flex;
+  flex-flow: row nowrap;
+}
+
+.textbox-input-box {
+  display: flex;
+  flex-direction: row;
+}
+
+.tabsFilter {
+  flex: 1;
+  /* min-width of anything to override the implicit "-moz-min-content" value.
+     0px is safe as the sidebar itself has a constrained size meaning we will
+     never actually hit this minimum
+  */
+  min-width: 0px;
+}
+
+.sync-state > p {
+  padding-inline-end: 10px;
+  padding-inline-start: 10px;
+  color: #9C9CFF;
+}
+
+.text-link {
+  color: #336699;
+  cursor: pointer;
+}
+
+.text-link:hover {
+  text-decoration: underline;
+}
+
+.text-link,
+.text-link:focus {
+  margin: 0px;
+  padding: 0px;
+  border: 0px;
+}
+
+.deck .sync-state {
+  display: none;
+  opacity: 0;
+  transition: opacity 1.5s;
+  border-top: 1px solid #A09090;
+}
+
+.deck .sync-state.tabs-container {
+  border-top: 0px;
+}
+
+.deck .sync-state.selected {
+  display: unset;
+  opacity: 100;
+}
+
+.sidebar-search-container.tabs-container:not(.selected) {
+  display: none;
+}
+
+.textbox-search-clear:not([disabled]) {
+  cursor: default;
+}
+
+.textbox-search-icons .textbox-search-clear,
+.filtered .textbox-search-icons .textbox-search-icon {
+  display: none;
+}
+
+.filtered .textbox-search-icons .textbox-search-clear {
+  display: block;
+}
+
+/* === END sidebar.inc.css === */
+
+/* These styles are intended to mimic XUL trees and the XUL search box. */
+
+html {
+  background-color: #000000;
+}
+
+.item {
+  -moz-padding-end: 0;
+}
+
+.item-title {
+  margin: 1px 0 0;
+}
+
+.item-title {
+  -moz-margin-end: 6px;
+}
+
+.search-box {
+/*  -moz-appearance: textfield; */
+  cursor: text;
+  margin: 2px 4px;
+  padding: 2px 2px 3px;
+  -moz-padding-start: 4px;
+  color: #E7ADE7;
+  border: 1px solid #9C9CFF;
+}
+
+.textbox-search-icon {
+  width: 16px;
+  height: 16px;
+  background-image: url(chrome://global/skin/icons/search.png);
+  background-repeat: no-repeat;
+  display: block;
+}
+
+.textbox-search-icon:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.textbox-search-icon[searchbutton]:not([disabled]) {
+  cursor: pointer;
+}
+
+.textbox-search-clear {
+  width: 16px;
+  height: 16px;
+  background-image: url(chrome://global/skin/icons/search.png);
+  background-repeat: no-repeat;
+  background-position: 0 -16px;
+}
+
+.textbox-search-clear:not([disabled]) {
+  cursor: default;
+}
+
+.textbox-search-icon:not([disabled]) {
+  cursor: text;
+}
+/*
+.textbox-search-clear:not([disabled]):hover ,
+.textbox-search-icon:not([disabled]):hover {
+  background-position: -16px 0;
+}
+
+.textbox-search-clear:not([disabled]):hover:active ,
+.textbox-search-icon:not([disabled]):hover:active {
+  background-position: -32px 0;
+}
+*/
+.client .item.tab > .item-title-container {
+  padding-inline-start: 26px;
+}
+.item.tab > .item-title-container {
+  padding-inline-start: 14px;
+}
+
+.item-icon-container {
+  min-width: 16px;
+  max-width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+  margin-right: 5px;
+  background-size: 16px 16px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.item-twisty-container {
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  padding-top: 5px;
+  width: 9px; /* The image's width is 9 pixels */
+  height: 9px;
+}
+
+.item.client .item-twisty-container {
+  background-image: url("chrome://global/skin/tree/twisty.svg#open");
+}
+
+.item.client.closed .item-twisty-container {
+  background-image: url("chrome://global/skin/tree/twisty.svg#clsd");
+}
+
+.item.client .item-twisty-container:hover {
+  background-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
+}
+
+.item.client.closed .item-twisty-container:hover {
+  background-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
+}
+
+.item.client .item-twisty-container:-moz-dir(rtl) {
+  background-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
+}
+
+.item.client.closed .item-twisty-container:-moz-dir(rtl) {
+  background-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
+}
+
+.item.client .item-twisty-container:hover:-moz-dir(rtl) {
+  background-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
+}
+
+.item.client.closed .item-twisty-container:hover:-moz-dir(rtl) {
+  background-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
+}