From: Robert Kaiser <kairo@kairo.at>
Date: Fri, 28 Nov 2014 20:51:05 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/themes
X-Git-Tag: LCARStrek-2.31~6
X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=42f880d7999a96ab6998882d52ab5b0113a23285;hp=0ce39495f0573b7510aed05e977249c4182b372c

Merge branch 'master' of linz:/srv/git/themes
---

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index e7559224..a681345e 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -899,6 +899,7 @@ menuitem.bookmark-item {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
+#loop-call-button[state="disabled"] > .toolbarbutton-badge-container,
 #loop-call-button[disabled="true"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 36px, 18px, 18px);
 }
@@ -1255,6 +1256,7 @@ toolbarpaletteitem[place="palette"] > #loop-call-button > .toolbarbutton-badge-c
   -moz-image-region: rect(0, 160px, 32px, 128px);
 }
 
+#loop-call-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container,
 #loop-call-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 64px, 32px, 32px);
 }
@@ -3083,7 +3085,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://global/skin/icons/webapps-64.png");
 }
 
-.popup-notification-icon[popupid="mixed-content-blocked"],
 .popup-notification-icon[popupid="bad-content"] {
   list-style-image: url("chrome://browser/skin/bad-content-blocked-64.png");
 }
@@ -3224,8 +3225,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   }
 }
 
-.mixed-content-blocked-notification-icon,
-#mixed-content-blocked-notification-icon,
 .bad-content-blocked-notification-icon,
 #bad-content-blocked-notification-icon {
   list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png");
@@ -4106,6 +4105,105 @@ html|*#gcli-output-frame {
   background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
 }
 
+/* FxOS custom mode with additional buttons and phone look'n feel */
+
+/* Hide devtools manual resizer */
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizehandle,
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarH,
+.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarV {
+  display: none;
+}
+
+/* Gives responsive mode a phone look'n feel */
+.browserStack[responsivemode].fxos-mode {
+  padding: 60px 15px 0;
+
+  border-radius: 25px / 20px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border: 1px solid #FFFFFF;
+  border-bottom-width: 0;
+
+  background-color: #353535;
+
+  box-shadow: 0 3px 0.7px 1px #777777, 0 5px rgba(0, 0, 0, 0.4) inset;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
+  min-width: 320px;
+}
+
+.devtools-responsiveui-hardware-buttons {
+  -moz-appearance: none;
+  padding: 20px;
+
+  border: 1px solid #FFFFFF;
+  border-bottom-left-radius: 25px;
+  border-bottom-right-radius: 25px;
+  border-top-width: 0;
+
+  box-shadow: 0 3px 0.7px 1px #777777, 0 -7px rgba(0, 0, 0, 0.4) inset;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
+}
+
+.devtools-responsiveui-home-button {
+  width: 40px;
+  height: 30px;
+  list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png");
+}
+
+.devtools-responsiveui-sleep-button {
+  -moz-appearance: none;
+  /* compensate browserStack top padding */
+  margin-top: -67px;
+  margin-right: 10px;
+
+  min-width: 10px;
+  width: 50px;
+  height: 5px;
+
+  border: 1px solid #444;
+  border-top-right-radius: 12px;
+  border-top-left-radius: 12px;
+  border-bottom-color: transparent;
+
+  background-image: linear-gradient(to top, #111 11%, #333 56%);
+}
+
+.devtools-responsiveui-sleep-button:hover:active {
+  background-image: linear-gradient(to top, #aaa 11%, #ddd 56%);
+}
+
+.devtools-responsiveui-volume-buttons {
+  margin-left: -29px;
+}
+
+.devtools-responsiveui-volume-up-button,
+.devtools-responsiveui-volume-down-button {
+  -moz-appearance: none;
+  border: 1px solid red;
+  min-width: 8px;
+  height: 40px;
+
+  border: 1px solid #444;
+  border-right-color: transparent;
+
+  background-image: linear-gradient(to right, #111 11%, #333 56%);
+}
+
+.devtools-responsiveui-volume-up-button:hover:active,
+.devtools-responsiveui-volume-down-button:hover:active {
+  background-image: linear-gradient(to right, #aaa 11%, #ddd 56%);
+}
+
+.devtools-responsiveui-volume-up-button {
+  border-top-left-radius: 12px;
+}
+
+.devtools-responsiveui-volume-down-button {
+  border-bottom-left-radius: 12px;
+}
+
 @media (min-resolution: 2dppx) {
   .devtools-responsiveui-resizebarV {
     background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
@@ -4741,12 +4839,13 @@ notification.pluginVulnerable .messageImage {
 }
 
 #customization-header {
-  font-size: 1.5em;
-  line-height: 1.5em;
+  font-size: 1.75em;
+  line-height: 1.75em;
   color: #9C9CFF;
-  font-weight: lighter;
-  margin-bottom: 1em;
-  padding: 15px 15px 0;
+  font-weight: 200;
+  margin: 25px 25px 12px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #A09090;
 }
 
 #customization-panel-container {
@@ -4933,6 +5032,90 @@ toolbarpaletteitem[place="toolbar"] {
   margin-right: 0;
 }
 
+#customization-lwtheme-menu > .panel-arrowcontainer > .panel-arrowcontent {
+  -moz-box-orient: vertical;
+  /* Make the panel padding uniform across all platforms due to the
+     styling of the section headers and footer. */
+  padding: 10px;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-icon {
+  width: 32px;
+  height: 32px;
+}
+
+.customization-lwtheme-menu-theme {
+  -moz-appearance: none;
+  margin: 0 -5px 5px;
+  padding-top: 0;
+  -moz-padding-end: 5px;
+  padding-bottom: 0;
+  -moz-padding-start: 0;
+}
+
+.customization-lwtheme-menu-theme[active="true"] {
+  background-color: #008484;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-icon {
+  margin: 5px;
+}
+
+.customization-lwtheme-menu-theme > .toolbarbutton-text {
+  text-align: start;
+}
+
+#customization-lwtheme-menu-header,
+#customization-lwtheme-menu-recommended {
+  padding: 10px;
+  margin-bottom: 5px;
+}
+
+#customization-lwtheme-menu-header,
+#customization-lwtheme-menu-recommended,
+#customization-lwtheme-menu-footer {
+  background-color: #A09090;
+  color: #000000;
+  margin-right: -10px;
+  margin-left: -10px;
+}
+
+#customization-lwtheme-menu-header {
+  margin-top: -10px;
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+
+#customization-lwtheme-menu-recommended {
+}
+
+#customization-lwtheme-menu-footer {
+  margin-bottom: -10px;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+
+.customization-lwtheme-menu-footeritem {
+  -moz-appearance: none;
+  -moz-box-flex: 1;
+  background-color: #C09070;
+  color: #000000;
+  border: 1px solid transparent;
+  padding: 10px;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+.customization-lwtheme-menu-footeritem:hover {
+  background-color: #FFCF00;
+}
+
+#customization-lwtheme-menu-footer:not(:hover) > .customization-lwtheme-menu-footeritem:first-child {
+}
+
+#customization-lwtheme-menu-footer:hover > .customization-lwtheme-menu-footeritem:first-child {
+}
+
 /* === END customizeMode.inc.css === */
 
 /* === BEGIN customizeTip.inc.css === */
diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css
index 26ee2bc1..ebf9e32d 100644
--- a/LCARStrek/browser/customizableui/panelUIOverlay.css
+++ b/LCARStrek/browser/customizableui/panelUIOverlay.css
@@ -240,7 +240,7 @@ panelview:not([mainview]) .toolbarbutton-text,
 
 #PanelUI-contents {
   display: block;
-  flex: 1 0 auto;
+  flex: 1 0 main-size;
   margin-left: auto;
   margin-right: auto;
   max-width: 22.35em;
@@ -868,13 +868,13 @@ toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button
 
 toolbarbutton[panel-multiview-anchor="true"] {
   background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png");
-  background-position: right 5px center;
+  background-position: right calc((22.35em / 3 - 0.1px) / 2 - 38px + 2px) center;
   background-repeat: no-repeat;
 }
 
 toolbarbutton[panel-multiview-anchor="true"]:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png");
-  background-position: left 5px center;
+  background-position: left calc((22.35em / 3 - 0.1px) / 2 - 38px + 2px) center;
 }
 
 toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
@@ -1247,10 +1247,6 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 /*  padding-top: 4px;*/
 }
 
-#BMB_bookmarksPopup .menu-text {
-/*  color: #000;*/
-}
-
 /* bookmark panel separator */
 #BMB_bookmarksPopup menuseparator {
   padding-top: 0;
@@ -1290,6 +1286,10 @@ menuitem[type="checkbox"].subviewbutton {
   height: 18px;
 }
 
+menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
+/*  transform: scaleX(-1); */
+}
+
 .widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   padding: 0 6px;
 }
@@ -1302,10 +1302,6 @@ menuitem[type="checkbox"].subviewbutton {
   -moz-padding-start: 0;
 }
 
-.subviewbutton.bookmark-item > .toolbarbutton-icon {
-  -moz-margin-start: 3px;
-}
-
 /* subviewbutton entries for social sidebars have images that come from external
 /* sources, and are not guaranteed to be the size we want, so force the size on
 /* those icons. */
diff --git a/LCARStrek/browser/devtools/app-manager/device.css b/LCARStrek/browser/devtools/app-manager/device.css
index 5699c575..77c70eb6 100644
--- a/LCARStrek/browser/devtools/app-manager/device.css
+++ b/LCARStrek/browser/devtools/app-manager/device.css
@@ -192,7 +192,7 @@ button {
 }
 
 .permission-table-header > div:first-child {
-  text-align: left;
+  text-align: start;
   padding-left: 10px;
   flex-basis: 30%;
 }
@@ -231,7 +231,7 @@ button {
 }
 
 .permission > div:first-child {
-  text-align: left;
+  text-align: start;
   padding: 3px 10px;
   flex-basis: 30%;
   font-weight: bold;
@@ -278,7 +278,7 @@ button {
   display: flex;
   padding: 15px 10px;
   display: block;
-  text-align: left;
+  text-align: start;
   flex-grow: 1;
 }
 
diff --git a/LCARStrek/browser/devtools/command-frames.png b/LCARStrek/browser/devtools/command-frames.png
new file mode 100755
index 00000000..03facefc
Binary files /dev/null and b/LCARStrek/browser/devtools/command-frames.png differ
diff --git a/LCARStrek/browser/devtools/command-frames@2x.png b/LCARStrek/browser/devtools/command-frames@2x.png
new file mode 100755
index 00000000..e09015a7
Binary files /dev/null and b/LCARStrek/browser/devtools/command-frames@2x.png differ
diff --git a/LCARStrek/browser/devtools/commandline.css b/LCARStrek/browser/devtools/commandline.css
index cae01b8d..6f918cbd 100644
--- a/LCARStrek/browser/devtools/commandline.css
+++ b/LCARStrek/browser/devtools/commandline.css
@@ -137,7 +137,7 @@
 
 .gcli-menu-more {
   font-size: 80%;
-  text-align: right;
+  text-align: end;
   -moz-padding-end: 8px;
 }
 
diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css
index 72b61f3c..e1c389e9 100644
--- a/LCARStrek/browser/devtools/common.css
+++ b/LCARStrek/browser/devtools/common.css
@@ -91,7 +91,7 @@ notification {
 }
 
 .devtools-autocomplete-listbox > richlistitem > .autocomplete-count {
-  text-align: right;
+  text-align: end;
 }
 
 /* Rest of the dark and light theme */
@@ -181,10 +181,18 @@ notification {
   min-width: 100px;
   max-width: 400px;
 }
+.devtools-tooltip[clamped-dimensions-no-max-or-min-height] {
+  min-width: 400px;
+  max-width: 400px;
+}
 .devtools-tooltip[clamped-dimensions] .panel-arrowcontent,
-.devtools-tooltip[clamped-dimensions-no-min-height] .panel-arrowcontent {
+.devtools-tooltip[clamped-dimensions-no-min-height] .panel-arrowcontent,
+.devtools-tooltip[clamped-dimensions-no-max-or-min-height] .panel-arrowcontent {
   overflow: hidden;
 }
+.devtools-tooltip[wide] {
+  max-width: 600px;
+}
 
 /* Tooltip: Simple Text */
 
diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index 279ce70f..0a4151a2 100644
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -432,6 +432,15 @@ div.CodeMirror span.eval-text {
   min-width: inherit;
 }
 
+/* Command buttons with menupopups should be styled slightly differently -
+   no background color and a bit more narrow */
+#toolbox-buttons .devtools-toolbarbutton:not([text-as-image]):not(:hover):not([open=true]) {
+  background: transparent;
+}
+#toolbox-buttons .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker {
+  padding: 0 2px;
+}
+
 .devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
   display: none;
 }
@@ -634,20 +643,7 @@ div.CodeMirror span.eval-text {
   -moz-border-end-width: 0;
 }
 
-.devtools-sidebar-tabs > tabs > tab:first-of-type {
-  -moz-margin-start: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-}
-
-.devtools-sidebar-tabs > tabs > tab:not(:last-of-type) {
-}
-
-.devtools-sidebar-tabs:-moz-locale-dir(rtl) > tabs > tab {
-}
-
-.devtools-sidebar-tabs > tabs > tab {
+.devtools-sidebar-tabs > tabs > tab:first-child {
 }
 
 .devtools-sidebar-tabs > tabs > tab:hover {
@@ -665,12 +661,7 @@ div.CodeMirror span.eval-text {
 .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] {
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected]:hover {
-}
-
+.devtools-sidebar-tabs > tabs > tab[selected],
 .devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
 }
 
@@ -754,7 +745,8 @@ div.CodeMirror span.eval-text {
 
 .command-button:hover > image,
 .command-button:hover:active > image,
-.command-button[checked=true] > image {
+.command-button[checked=true] > image,
+.command-button[open=true] > image {
   background-position: -16px center;
 }
 
@@ -782,6 +774,10 @@ div.CodeMirror span.eval-text {
   background-image: url("chrome://browser/skin/devtools/command-pick.png");
 }
 
+#command-button-frames > image {
+  background-image: url("chrome://browser/skin/devtools/command-frames.png");
+}
+
 #command-button-splitconsole > image {
   background-image: url("chrome://browser/skin/devtools/command-console.png");
 }
@@ -815,6 +811,10 @@ div.CodeMirror span.eval-text {
     background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
   }
 
+  #command-button-frames > image {
+    background-image: url("chrome://browser/skin/devtools/command-frames@2x.png");
+  }
+
   #command-button-splitconsole > image {
     background-image: url("chrome://browser/skin/devtools/command-console@2x.png");
   }
diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index 61be1a37..78829cb9 100644
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -187,6 +187,10 @@ window {
   color: #FF9F00; /* Light foreground text */
 }
 
+.trace-item.black-boxed {
+  color: #A09090;
+}
+
 .trace-item.selected-matching {
   background-color: #004242; /* Select highlight blue at 40% alpha */
 }
diff --git a/LCARStrek/browser/devtools/inspector.css b/LCARStrek/browser/devtools/inspector.css
index cb1b5409..c86492b5 100644
--- a/LCARStrek/browser/devtools/inspector.css
+++ b/LCARStrek/browser/devtools/inspector.css
@@ -292,7 +292,8 @@ window {
 
 #devtools-tooltip-events-container {
   margin: -4px; /* Compensate for the .panel-arrowcontent padding. */
-  max-width: 390px;
+  max-width: 590px;
+  overflow-y: auto;
 }
 
 .event-header {
@@ -353,12 +354,19 @@ window {
   margin-bottom: 0;
 }
 
-.event-tooltip-attributes-container {
+.event-tooltip-attributes-box {
   background-color: #000000;
   color: #9C9CFF;
 }
 
 .event-tooltip-attributes-container {
+  display: flex;
+  flex-shrink: 0;
+  flex-grow: 1;
+  justify-content: flex-end;
+}
+
+.event-tooltip-attributes-box {
   display: flex;
   flex-shrink: 0;
   align-items: center;
diff --git a/LCARStrek/browser/devtools/responsiveui-home.png b/LCARStrek/browser/devtools/responsiveui-home.png
new file mode 100644
index 00000000..43379d0e
Binary files /dev/null and b/LCARStrek/browser/devtools/responsiveui-home.png differ
diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css
index df694709..32443e5e 100644
--- a/LCARStrek/browser/devtools/ruleview.css
+++ b/LCARStrek/browser/devtools/ruleview.css
@@ -8,7 +8,7 @@
 
 .ruleview-rule-source {
   -moz-padding-start: 5px;
-  text-align: right;
+  text-align: end;
   float: right;
   -moz-user-select: none;
 }
diff --git a/LCARStrek/browser/devtools/storage.css b/LCARStrek/browser/devtools/storage.css
new file mode 100644
index 00000000..a800b3f7
--- /dev/null
+++ b/LCARStrek/browser/devtools/storage.css
@@ -0,0 +1,48 @@
+/* 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/. */
+
+/* Storage Host Tree */
+
+#storage-tree {
+  min-width: 220px;
+  max-width: 500px;
+  overflow: auto;
+}
+
+.theme-dark #storage-tree {
+  background: #000000; /* Toolbars */
+}
+
+#storage-tree .tree-widget-item[type="store"]:after {
+  background-image: url("chrome://browser/skin/devtools/filetype-store.svg");
+  background-size: 18px 18px;
+  background-position: -1px 0;
+}
+
+/* Columns with date should have a min width so that date is visible */
+#expires, #lastAccessed, #creationTime {
+  min-width: 150px;
+}
+
+/* Variables View Sidebar */
+
+#storage-sidebar {
+  max-width: 500px;
+  min-width: 250px;
+}
+
+/* Responsive sidebar */
+@media (max-width: 700px) {
+  #storage-tree {
+    max-width: 100%;
+  }
+
+  #storage-table #path {
+    display: none;
+  }
+
+  #storage-table .table-widget-cell {
+    min-width: 100px;
+  }
+}
diff --git a/LCARStrek/browser/devtools/tool-storage.svg b/LCARStrek/browser/devtools/tool-storage.svg
new file mode 100644
index 00000000..66d94cb8
--- /dev/null
+++ b/LCARStrek/browser/devtools/tool-storage.svg
@@ -0,0 +1,7 @@
+<svg width="16" xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 16 16" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 16 16">
+<g fill="#000000">
+<path d="m1.3,12.5v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6,0-6.6-2.7-6.6-2.7z"/>
+<path d="m14.7,3.4c0-1.4-3-2.5-6.7-2.5s-6.7,1.1-6.7,2.5c0,.2 0,.3 .1,.5-.1-.3-.1-.4-.1-.4v1.5c0,0 0,2.7 6.7,2.7 6.7,0 6.8-2.7 6.8-2.7v-1.6c0,.1 0,.2-.1,.5-0-.2-0-.3-0-.5z"/>
+<path d="m1.3,8.7v-2.4c0,0 0,2.5 6.7,2.5 6.7,0 6.7-2.5 6.7-2.5v2.4c0,0 0,2.7-6.8,2.7-6.6-0-6.6-2.7-6.6-2.7z"/>
+</g>
+</svg>
diff --git a/LCARStrek/browser/devtools/webaudioeditor.css b/LCARStrek/browser/devtools/webaudioeditor.css
index a93d2fc2..82c11107 100644
--- a/LCARStrek/browser/devtools/webaudioeditor.css
+++ b/LCARStrek/browser/devtools/webaudioeditor.css
@@ -40,7 +40,26 @@ svg {
   stroke-width: 1px;
   fill: none;
 
-  stroke: #9C9CFF; /* Grey foreground text */
+  stroke: #A09090; /* Grey foreground text */
+}
+
+/* AudioParam connection edges */
+g.edgePath.param-connection {
+  stroke-dasharray: 5,5;
+}
+
+.edgePath.param-connection path {
+  stroke: #A09090; /* Grey foreground text */
+}
+
+/* Labels in AudioParam connection should have background that match
+ * the main background so there's whitespace around the label, on top of the
+ * dotted lines. */
+g.edgeLabel rect {
+  fill: #000000;
+}
+g.edgeLabel tspan {
+  fill: #9C9CFF; /* Grey foreground text */
 }
 
 /* Audio Nodes */
@@ -77,6 +96,10 @@ g.selected text {
  * Inspector Styles
  */
 
+#web-audio-inspector-title {
+  margin: 6px;
+}
+
 .web-audio-inspector .error {
   background-image: url("alerticon-warning.png");
   background-size: 13px 12px;
diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css
index 290f575a..6698d27e 100644
--- a/LCARStrek/browser/devtools/webconsole.css
+++ b/LCARStrek/browser/devtools/webconsole.css
@@ -32,24 +32,24 @@ a {
 
 .message {
   display: flex;
-  flex: 0 0 auto;
+  flex: none;
   padding: 0 7px;
   width: 100%;
   box-sizing: border-box;
 }
 
 .message > .timestamp {
-  flex: 0 0 auto;
+  flex: none;
   color: #8050B0;
   margin: 4px 6px 0 0;
 }
 
 .message > .indent {
-  flex: 0 0 auto;
+  flex: none;
 }
 
 .message > .icon {
-  flex: 0 0 auto;
+  flex: none;
   margin: 3px 6px 0 0;
   padding: 0 4px;
   height: 1em;
@@ -78,10 +78,14 @@ a {
   margin: 3px;
 }
 
+.message-body-wrapper .table-widget-body {
+  overflow: visible;
+}
+
 /* The red bubble that shows the number of times a message is repeated */
 .message-repeats {
   -moz-user-select: none;
-  flex: 0 0 auto;
+  flex: none;
   margin: 2px 6px;
   padding: 0 6px;
   height: 1.25em;
@@ -99,7 +103,7 @@ a {
 
 .message-location {
   display: flex;
-  flex: 0 0 auto;
+  flex: none;
   align-self: flex-start;
   justify-content: flex-end;
   width: 10em;
@@ -122,7 +126,7 @@ a {
 }
 
 .message-location > .line-number {
-  flex: 0 0 auto;
+  flex: none;
 }
 
 .hud-msg-node[selected="true"] > .webconsole-timestamp,
@@ -141,7 +145,7 @@ a {
 
 .message-flex-body > .message-body {
   display: block;
-  flex: 1 1 auto;
+  flex: 1 1 main-size;
   vertical-align: middle;
 }
 
@@ -241,6 +245,13 @@ a {
   color: #000000;
 }
 
+.theme-selected .console-string,
+.theme-selected .cm-number,
+.theme-selected .cm-variable,
+.theme-selected .kind-ArrayLike {
+  color: #000000 !important; /* Selection Text Color */
+}
+
 .message[category=network] > .indent {
   -moz-border-end: solid #FF0000 6px;
 }
@@ -254,11 +265,11 @@ a {
 }
 
 .message[category=network] .method {
-  flex: 0 0 auto;
+  flex: none;
 }
 
 .message[category=network]:not(.navigation-marker) .url {
-  flex: 1 1 auto;
+  flex: 1 1 main-size;
   /* Make sure the URL is very small initially, let flex change width as needed. */
   width: 100px;
   min-width: 5em;
@@ -268,7 +279,7 @@ a {
 }
 
 .message[category=network] .status {
-  flex: 0 0 auto;
+  flex: none;
   -moz-margin-start: 6px;
 }
 
@@ -446,7 +457,11 @@ a {
   border: 1px solid #A09090;
   border-radius: 3px;
 }
- 
+
+.consoletable {
+  margin: 5px 0 0 0;
+}
+
 .message[severity=error] .stacktrace {
   background-color: #000000;
 }
@@ -468,7 +483,7 @@ a {
 
 .stacktrace .function {
   display: block;
-  flex: 1 1 auto;
+  flex: 1 1 main-size;
 }
 
 .cm-s-mozilla a[class] {
diff --git a/LCARStrek/browser/devtools/webconsole_networkpanel.css b/LCARStrek/browser/devtools/webconsole_networkpanel.css
index 4a8db600..4477b178 100644
--- a/LCARStrek/browser/devtools/webconsole_networkpanel.css
+++ b/LCARStrek/browser/devtools/webconsole_networkpanel.css
@@ -48,7 +48,7 @@ h1 .info {
   padding-right: 4px;
   color: #FF9F00;
   white-space: nowrap;
-  text-align: right;
+  text-align: end;
   vertical-align: top;
   width: 10%;
 }
diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css
index 2a0f70cf..7e3c1807 100644
--- a/LCARStrek/browser/devtools/widgets.css
+++ b/LCARStrek/browser/devtools/widgets.css
@@ -1232,6 +1232,7 @@
   padding: 10px 20px;
   font-size: medium;
   background: transparent;
+  pointer-events: none;
 }
 
 /* Tree Item */
diff --git a/LCARStrek/browser/mask.png b/LCARStrek/browser/mask.png
new file mode 100644
index 00000000..00b1c3d5
Binary files /dev/null and b/LCARStrek/browser/mask.png differ
diff --git a/LCARStrek/browser/mask@2x.png b/LCARStrek/browser/mask@2x.png
new file mode 100644
index 00000000..86d48e0c
Binary files /dev/null and b/LCARStrek/browser/mask@2x.png differ
diff --git a/LCARStrek/browser/newtab/controls.png b/LCARStrek/browser/newtab/controls.png
deleted file mode 100644
index c1d52d95..00000000
Binary files a/LCARStrek/browser/newtab/controls.png and /dev/null differ
diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css
index 1e42d934..ab7ef715 100644
--- a/LCARStrek/browser/newtab/newTab.css
+++ b/LCARStrek/browser/newtab/newTab.css
@@ -154,10 +154,6 @@
   bottom: 0 !important;
 }
 
-.newtab-site[type=sponsored] .newtab-title {
-  -moz-padding-end: 24px;
-}
-
 .newtab-site:hover .newtab-title {
   background-color: #FFCF00;
 }
diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 24bed38f..397f8a54 100644
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -10,26 +10,10 @@
 dialog,
 window,
 prefwindow,
-.windowDialog,
-page {
+.windowDialog {
   background-color: #000000;
 }
 
-* {
-  -moz-user-select: text;
-}
-
-treecol {
-  /* override the * rule to let the treecol be sortable */
-  -moz-user-select: none;
-}
-
-caption {
-}
-
-caption > label {
-}
-
 .main-content {
   padding: 1.5em 0 0; /* That padding needs to match the upper stripe. */
   overflow: auto;
@@ -56,218 +40,6 @@ prefpane {
   color: #FF9F00;
 }
 
-prefpane > .content-box {
-  max-width: 800px;
-  overflow: visible;
-}
-
-/* groupboxes */
-
-groupbox {
-}
-
-groupbox label {
-}
-
-/* tabpanels and tabs */
-
-tabpanels {
-}
-
-tabs {
-}
-
-.tabs-left,
-.tabs-right {
-}
-
-tab {
-}
-
-tab[selected] {
-}
-
-.tab-text {
-}
-
-tab:not([selected]):hover > .tab-middle > .tab-text {
-}
-
-tab:not([selected]):hover:active > .tab-middle > .tab-text {
-}
-
-tab[selected] > .tab-middle > .tab-text {
-}
-
-/* buttons and menulists */
-
-button,
-menulist {
-}
-
-button:not([disabled]):hover,
-menulist:not([disabled]):hover {
-}
-
-button:not([disabled]):hover:active,
-menulist[open="true"]:not([disabled]) {
-}
-
-button[disabled],
-menulist[disabled] {
-}
-
-button > .button-box,
-menulist > .menulist-label-box {
-}
-
-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;
-}
-
-.help-button:not([disabled="true"]):hover {
-  background-color: #F4C200;
-  background-image: none;
-}
-
-.help-button:not([disabled="true"]):hover:active {
-  background-color: #EABA00;
-  background-image: none;
-}
-
-.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;
-}
-
-@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");
-  }
-}
-
-.help-button > .button-box > .button-text {
-  display: none;
-}
-
-.spinbuttons-button {
-}
-
-.spinbuttons-up {
-}
-
-.spinbuttons-down  {
-}
-
-.spinbuttons-button > .button-box {
-}
-
-.spinbuttons-up > .button-box > .button-icon {
-}
-
-.spinbuttons-up[disabled] > .button-box > .button-icon {
-}
-
-.spinbuttons-down > .button-box > .button-icon {
-}
-
-.spinbuttons-down[disabled] > .button-box > .button-icon {
-}
-
-menulist:not([editable="true"]) > .menulist-dropmarker {
-}
-
-menulist[disabled]:not([editable="true"]) > .menulist-dropmarker {
-}
-
-menulist > menupopup,
-button[type="menu"] > menupopup {
-}
-
-menulist > menupopup menu,
-menulist > menupopup menuitem,
-button[type="menu"] > menupopup menu,
-button[type="menu"] > menupopup menuitem {
-}
-
-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"] {
-}
-
-menulist > menupopup > menu[selected="true"],
-menulist > menupopup > menuitem[selected="true"],
-button[type="menu"] > menupopup > menu[selected="true"],
-button[type="menu"] > menupopup > menuitem[selected="true"] {
-}
-
-menulist > menupopup menuseparator,
-button[type="menu"] > menupopup menuseparator {
-}
-
-/* textboxes */
-
-textbox {
-}
-
-textbox[focused] {
-}
-
-textbox[disabled] {
-}
-
-/* Links */
-
-.text-link,
-.inline-link,
-html|a.inline-link {
-}
-
-.text-link:hover,
-.inline-link:hover {
-}
-
-.text-link:hover:active,
-.inline-link:hover:active {
-}
-
-/* Checkboxes and radio buttons */
-
-.checkbox-check {
-}
-
-.checkbox-check[checked] {
-}
-
-radio {
-}
-
-.radio-check {
-}
-
-.radio-check[selected] {
-}
-
 /* Category List */
 
 #categories {
@@ -382,53 +154,22 @@ radio {
 
 /* header */
 
-.header {
-  border-bottom: 1px solid #A09090;
-  margin-bottom: 15px;
-  padding-bottom: 15px;
-}
-
 #header-advanced {
   border-bottom: none;
   padding-bottom: 0;
 }
 
-.header-name {
-  font-size: 2.5rem;
-  font-weight: normal;
-  line-height: 40px;
-  margin: 0;
-}
-
 .indent {
   margin-top: 7px;
   margin-bottom: 7px;
 }
 
 /* General Pane */
-/*
-filefield {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  padding: 0;
-}
 
-.fileFieldContentBox {
-  background-color: transparent;
+#isNotDefaultLabel {
+  font-weight: bold;
 }
 
-.fileFieldIcon {
-  -moz-margin-start: 10px;
-  -moz-margin-end: 0;
-}
-
-.fileFieldLabel {
-  -moz-margin-start: -26px;
-  -moz-padding-start: 36px;
-}
-*/
-
 /* Applications Pane Styles */
 
 #applicationsContent {
@@ -451,12 +192,6 @@ filefield {
   height: 500px;
 }
 
-#handlersView > listheader {
-  border: none;
-  background: transparent;
-  padding: 0;
-}
-
 #handlersView > listheader > treecol {
 }
 
@@ -466,6 +201,12 @@ filefield {
   border-bottom: 1px solid #9C9CFF;
 }
 
+#handlersView > listheader {
+  background: transparent;
+  border: 0;
+  padding: 0;
+}
+
 #typeColumn,
 #actionColumn {
   line-height: 20px;
@@ -566,7 +307,8 @@ description > html|a {
 #weavePrefsDeck > vbox > description,
 #weavePrefsDeck > vbox > #pairDevice > label,
 #weavePrefsDeck > #needsUpdate > hbox > #loginError,
-#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP) > label {
+#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label,
+#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-small) > label {
   /* no margin-start for elements at the begin of a line */
   -moz-margin-start: 0;
 }
@@ -639,11 +381,6 @@ description > html|a {
   width: 66ch;
 }
 
-/* needs to be removed with bug 1035625 */
-:-moz-any(dialog, window, prefwindow) resizer {
-  display: none;
-}
-
 tree:not(#rejectsTree) {
   min-height: 15em;
 }
diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css
index df3add6e..b3200726 100644
--- a/LCARStrek/browser/preferences/preferences.css
+++ b/LCARStrek/browser/preferences/preferences.css
@@ -79,6 +79,12 @@ label.small {
   margin: 6px;
 }
 
+/* General Pane */
+
+#isNotDefaultLabel {
+  font-weight: bold;
+}
+
 /* Content Pane */
 #translationAttributionImage {
   width: 70px;
diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
index 5e9baf32..3cd62d97 100644
--- a/LCARStrek/global/in-content/common.css
+++ b/LCARStrek/global/in-content/common.css
@@ -217,7 +217,7 @@ xul|*.help-button > xul|*.button-box {
   padding-right: 0 !important;
   padding-left: 0 !important;
 }
-
+*/
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
   width: 26px;
   height: 26px;
@@ -235,7 +235,7 @@ xul|*.help-button > xul|*.button-box > xul|*.button-icon {
 xul|*.help-button > xul|*.button-box > xul|*.button-text {
   display: none;
 }
-
+/*
 xul|*.spinbuttons-button {
   -moz-margin-start: 10px !important;
   -moz-margin-end: 2px !important;
@@ -379,30 +379,30 @@ xul|textbox[disabled="true"] {
 }
 */
 /* Links */
-/*
+
 html|a,
 xul|*.text-link,
 xul|*.inline-link {
-  font-size: 1.25rem;
-  line-height: 22px;
-  color: #0095dd;
+/*  font-size: 1.25rem;
+  line-height: 22px;*/
+  color: #3333FF;
   text-decoration: none;
 }
 
 html|a:hover,
 xul|*.text-link:hover,
 xul|*.inline-link:hover {
-  color: #4cb1ff;
-  text-decoration: none;
+  color: #FFCF00;
+  text-decoration: underline;
 }
 
 html|a:hover:active,
 xul|*.text-link:hover:active,
 xul|*.inline-link:hover:active {
-  color: #ff9500;
-  text-decoration: none;
+  color: #FF9F00;
+  text-decoration: underline;
 }
-*/
+
 /* Checkboxes and radio buttons */
 /*
 xul|checkbox {
@@ -531,11 +531,11 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
 }
 */
 /* header */
-/*
+
 *|*.header {
-  border-bottom: 1px solid #c8c8c8;
+/*  border-bottom: 1px solid #A09090;
   margin-bottom: 15px;
-  padding-bottom: 15px;
+  padding-bottom: 15px; */
 }
 
 *|*.header-name {
@@ -544,7 +544,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
   line-height: 40px;
   margin: 0;
 }
-*/
+
 /* File fields */
 /*
 xul|filefield {
@@ -620,10 +620,9 @@ xul|*.radio-icon,
 xul|*.checkbox-icon {
   -moz-margin-end: 0;
 }
-
+*/
 html|a:-moz-focusring,
 xul|*.text-link:-moz-focusring,
 xul|*.inline-link:-moz-focusring {
-  border: 1px dotted -moz-DialogText;
+  border: 1px dotted #3333FF;
 }
-*/
\ No newline at end of file
diff --git a/LCARStrek/browser/preferences/in-content/help-glyph.png b/LCARStrek/global/in-content/help-glyph.png
similarity index 100%
rename from LCARStrek/browser/preferences/in-content/help-glyph.png
rename to LCARStrek/global/in-content/help-glyph.png
diff --git a/LCARStrek/browser/preferences/in-content/help-glyph@2x.png b/LCARStrek/global/in-content/help-glyph@2x.png
similarity index 100%
rename from LCARStrek/browser/preferences/in-content/help-glyph@2x.png
rename to LCARStrek/global/in-content/help-glyph@2x.png