first part of syncing LCARStrek with Firefox 36 windows theme changes

diff --git a/LCARStrek/browser/aboutNetError.css b/LCARStrek/browser/aboutNetError.css
index c1c37d6af87e4c1acdbb9840d0be96fba4adbe5d..e4db78b3f48e4e41a27c288d97d5700773951b16 100644 (file)
--- a/LCARStrek/browser/aboutNetError.css
+++ b/LCARStrek/browser/aboutNetError.css
@@ -71,3 +71,77 @@ ul {
 button:disabled {
   cursor: pointer;
 }
+
+div#certificateErrorReporting {
+  display: none;
+  float:right;
+  /* Align with the "Try Again" button */
+  margin-top:24px;
+  margin-right:24px;
+}
+
+div#certificateErrorReporting a,
+div#certificateErrorReportingPanel a {
+  background-color: #C09070;
+  color: #000000;
+  border-radius: 300px;
+}
+
+div#certificateErrorReporting a {
+/*  text-decoration: none; */
+}
+
+div#certificateErrorReporting a:hover {
+/*  text-decoration: underline; */
+  background-color: #FFCF00;
+}
+
+span.downArrow {
+  font-size: 0.9em;
+}
+
+div#certificateErrorReportingPanel {
+  /* Hidden until the link is clicked */
+  display: none;
+  background-color: #000000;
+  border: 1px #A09090 solid;
+  /* Don't use top padding because the default p style has top padding, and it
+   * makes the overall div look uneven */
+  padding: 0 12px 12px 12px;
+  position: relative;
+  width: 75%;
+  left: 34%;
+  font-size: 0.9em;
+  top: 8px;
+}
+
+span#hostname {
+  font-weight: bold;
+}
+
+#automaticallyReportInFuture {
+  cursor: pointer;
+}
+
+#reportingState {
+  padding-left: 150px;
+}
+
+#reportSendingMessage {
+  position: relative;
+  display: none;
+}
+
+#reportSentMessage {
+  position: relative;
+  display: none;
+}
+
+button#reportCertificateError {
+  position: relative;
+}
+
+button#reportCertificateErrorRetry {
+  position: relative;
+  display: none;
+}

diff --git a/LCARStrek/browser/aboutWelcomeBack.css b/LCARStrek/browser/aboutWelcomeBack.css
index f38dda1881fd9af4f77393bcf13c78df2b9fdc0d..3e11e8242ac97322ea2e4eca17054c74b3139bc5 100644 (file)
--- a/LCARStrek/browser/aboutWelcomeBack.css
+++ b/LCARStrek/browser/aboutWelcomeBack.css
@@ -4,4 +4,39 @@
 
 #errorPageContainer {
   background-image: url("chrome://global/skin/icons/information-64.png");
+  height: auto;
+}
+
+/* tablist starts out hidden, but JS may make it visible in response to
+   clicks on the radio buttons by setting an "available" attribute.
+*/
+#tabList {
+  display: none;
+}
+
+#tabList[available] {
+  display: -moz-box;
+}
+
+.radioRestoreContainer {
+  display: flex;
+}
+
+.radioRestoreButton {
+  flex: 0 0 auto;
+}
+
+.radioRestoreButton:-moz-focusring {
+  outline: 1px dotted #008484;
+}
+
+.radioChooseLabel {
+  flex: 1 1 auto;
+}
+
+/* We want errorTrailerDesc to have the same padding-top as errorShortDesc
+   has padding-bottom
+*/
+#errorTrailerDesc {
+  padding-top: 1em;
 }

diff --git a/LCARStrek/browser/bad-content-blocked-16@2x.png b/LCARStrek/browser/bad-content-blocked-16@2x.png
new file mode 100644 (file)
index 0000000..d293a92
Binary files /dev/null and b/LCARStrek/browser/bad-content-blocked-16@2x.png differ

diff --git a/LCARStrek/browser/bad-content-blocked-64@2x.png b/LCARStrek/browser/bad-content-blocked-64@2x.png
new file mode 100644 (file)
index 0000000..1a22400
Binary files /dev/null and b/LCARStrek/browser/bad-content-blocked-64@2x.png differ

diff --git a/LCARStrek/browser/bad-content-unblocked-16@2x.png b/LCARStrek/browser/bad-content-unblocked-16@2x.png
new file mode 100644 (file)
index 0000000..9692a0f
Binary files /dev/null and b/LCARStrek/browser/bad-content-unblocked-16@2x.png differ

diff --git a/LCARStrek/browser/bad-content-unblocked-64@2x.png b/LCARStrek/browser/bad-content-unblocked-64@2x.png
new file mode 100644 (file)
index 0000000..450e015
Binary files /dev/null and b/LCARStrek/browser/bad-content-unblocked-64@2x.png differ

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f2c416df55b82ba29312bc9df0927e11c4bd4bce..2c5602a4fc779052159f6c5c8119f42f3af5ed2e 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1476,7 +1476,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri
   -moz-padding-end: 5px;*/
 }
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) {
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) {
 /*  padding-left: 5px;
   padding-right: 5px;*/
 }
@@ -1528,7 +1528,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   width: 32px;
 }
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
 /*  -moz-padding-end: 17px;*/
 }
@@ -4321,15 +4321,6 @@ html|*#gcli-output-frame {
 
 /* Social toolbar item */
 
-#social-provider-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  list-style-image: url("chrome://browser/skin/social/services-16.png");
-}
-
-#social-provider-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 #social-notification-icon-mentions {
   background-color: #000000;
   border-radius: 3px;

diff --git a/LCARStrek/browser/devedition.css b/LCARStrek/browser/devedition.css
index e0032240a4d20db4ff57f8f73ba48ffa503adbcb..d1d1e597d66ee5918001a187990c6ee3d456ad1b 100644 (file)
--- a/LCARStrek/browser/devedition.css
+++ b/LCARStrek/browser/devedition.css
@@ -1,3 +1,6 @@
 /* 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/. */
+
+/* devedition.css is loaded in browser.xul after browser.css when it is
+   preffed on. */

diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css
new file mode 100644 (file)
index 0000000..a3e77c6
--- /dev/null
+++ b/LCARStrek/browser/devtools/performance.css
@@ -0,0 +1,437 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+/* CSS Variables specific to this panel that aren't defined by the themes */
+.theme-dark,
+.theme-light {
+  --cell-border-color: #A09090;
+  --focus-cell-border-color: #9C9CFF;
+  --row-alt-background-color: #403400;
+  --row-hover-background-color: #544400;
+}
+
+/* Toolbar */
+
+#performance-toolbar > tabs,
+#performance-toolbar {
+  -moz-border-end-color: var(--theme-splitter-color);
+}
+
+#performance-toolbar-controls-detail-views > toolbarbutton {
+  min-width: 0;
+}
+
+#performance-toolbar-controls-detail-views .toolbarbutton-text {
+  -moz-padding-start: 4px;
+  -moz-padding-end: 8px;
+}
+
+/* Recording Notice */
+
+#performance-view .notice-container {
+  font-size: 120%;
+  background-color: var(--theme-toolbar-background);
+  color: var(--theme-body-color);
+  padding-bottom: 20vh;
+}
+
+#performance-view .notice-container button {
+  min-width: 30px;
+  min-height: 28px;
+  margin: 0;
+}
+
+/* Overview Panel */
+
+.record-button {
+  list-style-image: url(profiler-stopwatch.svg);
+}
+
+.record-button[checked] {
+  list-style-image: url(profiler-stopwatch-checked.svg);
+}
+
+.record-button[locked] {
+  pointer-events: none;
+}
+
+.record-button .button-icon {
+  margin: 0;
+}
+
+.record-button .button-text {
+  display: none;
+}
+
+/* Details Panel */
+
+#select-waterfall-view {
+  list-style-image: url(performance-icons.svg#details-waterfall);
+}
+
+#select-js-calltree-view,
+#select-memory-calltree-view {
+  list-style-image: url(performance-icons.svg#details-call-tree);
+}
+
+#select-js-flamegraph-view,
+#select-memory-flamegraph-view {
+  list-style-image: url(performance-icons.svg#details-flamegraph);
+}
+
+/* Profile call tree */
+
+.call-tree-cells-container {
+  /* Hack: force hardware acceleration */
+  transform: translateZ(1px);
+  overflow: auto;
+}
+
+.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="allocations"],
+.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="self-allocations"],
+.call-tree-cells-container[categories-hidden] .call-tree-category {
+  display: none;
+}
+
+.call-tree-header {
+  font-size: 90%;
+  padding-top: 2px !important;
+  padding-bottom: 2px !important;
+}
+
+.call-tree-header[type="duration"],
+.call-tree-cell[type="duration"],
+.call-tree-header[type="self-duration"],
+.call-tree-cell[type="self-duration"] {
+  width: 6vw;
+}
+
+.call-tree-header[type="percentage"],
+.call-tree-cell[type="percentage"],
+.call-tree-header[type="self-percentage"],
+.call-tree-cell[type="self-percentage"] {
+  width: 5vw;
+}
+
+.call-tree-header[type="samples"],
+.call-tree-cell[type="samples"] {
+  width: 4.5vw;
+}
+
+.call-tree-header[type="allocations"],
+.call-tree-cell[type="allocations"],
+.call-tree-header[type="self-allocations"],
+.call-tree-cell[type="self-allocations"] {
+  width: 7vw;
+}
+
+.call-tree-header[type="function"],
+.call-tree-cell[type="function"] {
+  -moz-box-flex: 1;
+}
+
+.call-tree-header,
+.call-tree-cell {
+  -moz-box-align: center;
+  overflow: hidden;
+  padding: 1px 4px;
+  color: var(--theme-body-color);
+  -moz-border-end-color: var(--cell-border-color);
+}
+
+.call-tree-header:not(:last-child),
+.call-tree-cell:not(:last-child) {
+  -moz-border-end-width: 1px;
+  -moz-border-end-style: solid;
+}
+
+.call-tree-header:not(:last-child) {
+  text-align: center;
+}
+
+.call-tree-cell:not(:last-child) {
+  text-align: end;
+}
+
+.call-tree-header {
+  background-color: var(--theme-tab-toolbar-background);
+}
+
+.call-tree-item:last-child:not(:focus) {
+  border-bottom: 1px solid var(--cell-border-color);
+}
+
+.call-tree-item:nth-child(2n) {
+  background-color: var(--row-alt-background-color);
+}
+
+.call-tree-item:hover {
+  background-color: var(--row-hover-background-color);
+}
+
+.call-tree-item:focus {
+  background-color: var(--theme-selection-background);
+}
+
+.call-tree-item:focus label {
+  color: var(--theme-selection-color) !important;
+}
+
+.call-tree-item:focus .call-tree-cell {
+  -moz-border-end-color: var(--focus-cell-border-color);
+}
+
+.call-tree-item:not([origin="content"]) .call-tree-name,
+.call-tree-item:not([origin="content"]) .call-tree-url,
+.call-tree-item:not([origin="content"]) .call-tree-line,
+.call-tree-item:not([origin="content"]) .call-tree-column {
+  /* Style chrome and non-JS nodes differently. */
+  opacity: 0.6;
+}
+
+.call-tree-url {
+  -moz-margin-start: 4px !important;
+  cursor: pointer;
+}
+
+.call-tree-url:hover {
+  text-decoration: underline;
+}
+
+.call-tree-url {
+  color: var(--theme-highlight-blue);
+}
+
+.call-tree-line {
+  color: var(--theme-highlight-orange);
+}
+
+.call-tree-column {
+  color: var(--theme-highlight-orange);
+  opacity: 0.6;
+}
+
+.call-tree-host {
+  -moz-margin-start: 8px !important;
+  font-size: 90%;
+  color: var(--theme-content-color2);
+}
+
+.call-tree-name[value=""],
+.call-tree-url[value=""],
+.call-tree-line[value=""],
+.call-tree-column[value=""],
+.call-tree-host[value=""] {
+  display: none;
+}
+
+.call-tree-zoom {
+  -moz-appearance: none;
+  background-color: transparent;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 11px;
+  min-width: 11px;
+  -moz-margin-start: 8px !important;
+  cursor: zoom-in;
+  opacity: 0;
+}
+
+.theme-dark .call-tree-zoom {
+  background-image: url(magnifying-glass.png);
+}
+
+.theme-light .call-tree-zoom {
+  background-image: url(magnifying-glass-light.png);
+}
+
+@media (min-resolution: 2dppx) {
+  .theme-dark .call-tree-zoom {
+    background-image: url(magnifying-glass@2x.png);
+  }
+
+  .theme-light .call-tree-zoom {
+    background-image: url(magnifying-glass-light@2x.png);
+  }
+}
+
+.call-tree-item:hover .call-tree-zoom {
+  transition: opacity 0.3s ease-in;
+  opacity: 1;
+}
+
+.call-tree-item:hover .call-tree-zoom:hover {
+  opacity: 0;
+}
+
+.call-tree-category {
+  transform: scale(0.75);
+  transform-origin: center right;
+}
+
+/**
+ * Details Waterfall Styles
+ */
+
+.waterfall-list-contents {
+  /* Hack: force hardware acceleration */
+  transform: translateZ(1px);
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+.waterfall-header-contents {
+  overflow-x: hidden;
+}
+
+.waterfall-background-ticks {
+  /* Background created on a <canvas> in js. */
+  /* @see browser/devtools/timeline/widgets/waterfall.js */
+  background-image: -moz-element(#waterfall-background);
+  background-repeat: repeat-y;
+  background-position: -1px center;
+}
+
+.waterfall-marker-container[is-spacer] {
+  pointer-events: none;
+}
+
+.waterfall-marker-container:not([is-spacer]):nth-child(2n) {
+  background-color: #403400;
+}
+
+.waterfall-marker-container:hover {
+  background-color: #FFCF00 !important;
+}
+
+.waterfall-marker-item {
+  overflow: hidden;
+}
+
+.waterfall-sidebar {
+  -moz-border-end: 1px solid var(--theme-splitter-color);
+}
+
+.waterfall-marker-container:hover > .waterfall-sidebar {
+  background-color: transparent;
+}
+
+.waterfall-header-name {
+  padding: 2px 4px;
+  font-size: 90%;
+}
+
+.waterfall-header-tick {
+  width: 100px;
+  font-size: 9px;
+  transform-origin: left center;
+  color: var(--theme-body-color);
+}
+
+.waterfall-header-tick:not(:first-child) {
+  -moz-margin-start: -100px !important; /* Don't affect layout. */
+}
+
+.waterfall-marker-bullet {
+  width: 8px;
+  height: 8px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 6px;
+  border: 1px solid;
+  border-radius: 1px;
+}
+
+.waterfall-marker-name {
+  font-size: 95%;
+  padding-bottom: 1px !important;
+}
+
+.waterfall-marker-bar {
+  height: 9px;
+  border: 1px solid;
+  border-radius: 1px;
+  transform-origin: left center;
+}
+
+.waterfall-marker-container.selected > .waterfall-sidebar,
+.waterfall-marker-container.selected > .waterfall-marker-item {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
+}
+
+.waterfall-marker-container.selected .waterfall-marker-bullet,
+.waterfall-marker-container.selected .waterfall-marker-bar {
+  border-color: initial !important;
+}
+
+.waterfall-marker-location {
+   color: #3333FF;
+}
+
+.waterfall-marker-location:hover,
+.waterfall-marker-location:focus {
+   text-decoration: underline;
+}
+
+#waterfall-details {
+  -moz-padding-start: 8px;
+  -moz-padding-end: 8px;
+  padding-top: 2vh;
+  overflow: auto;
+}
+
+.marker-details-bullet {
+  width: 8px;
+  height: 8px;
+  border: 1px solid;
+  border-radius: 1px;
+}
+
+#waterfall-details > * {
+  padding-top: 3px;
+}
+
+.marker-details-labelname {
+  -moz-padding-end: 4px;
+}
+
+.marker-details-type {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+.marker-details-duration {
+  font-weight: bold;
+}
+
+/* Recording items */
+
+.recording-item {
+  padding: 4px;
+}
+
+.recording-item-title {
+  font-size: 110%;
+}
+
+.recording-item-footer {
+  padding-top: 4px;
+  font-size: 90%;
+}
+
+.recording-item-save {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.recording-item-duration,
+.recording-item-save {
+  color: var(--theme-body-color-alt);
+}
+
+#recordings-list .selected label {
+  /* Text inside a selected item should not be custom colored. */
+  color: inherit !important;
+}

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index e3251d630a16e0e586632f1724a2916a892eb8d0..4ad8747ffe925de80da2296552a7357944437fc4 100644 (file)
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -357,6 +357,17 @@ description > html|a {
   margin-bottom: 8px;
 }
 
+#trackingProtectionImage {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png");
+}
+
+@media (min-resolution: 2dppx) {
+  #trackingProtectionImage {
+    list-style-image: url("chrome://browser/skin/bad-content-blocked-16@2x.png");
+  }
+}
 
 /**
  * Sub-dialog

diff --git a/LCARStrek/browser/tabbrowser/pendingpaint.png b/LCARStrek/browser/tabbrowser/pendingpaint.png
new file mode 100644 (file)
index 0000000..97290e9
Binary files /dev/null and b/LCARStrek/browser/tabbrowser/pendingpaint.png differ

diff --git a/LCARStrek/global/in-content/info-pages.css b/LCARStrek/global/in-content/info-pages.css
new file mode 100644 (file)
index 0000000..e21ddeb
--- /dev/null
+++ b/LCARStrek/global/in-content/info-pages.css
@@ -0,0 +1,85 @@
+@import url("chrome://global/skin/in-content/common.css");\r
+/* Body and container */\r
+body {\r
+  display: flex;\r
+  box-sizing: padding-box;\r
+  min-height: 100vh;\r
+  padding-top: 0;\r
+  padding-bottom: 0;\r
+  -moz-padding-start: calc(48px + 4.6em);\r
+  -moz-padding-end: 48px;\r
+  align-items: center;\r
+  justify-content: center;\r
+}\r
+\r
+.container {\r
+  min-width: 13em;\r
+  max-width: 52em;\r
+}\r
+\r
+/* Typography */\r
+.title {\r
+  background-image: url("chrome://browser/skin/aboutNetError_info.svg");\r
+  background-position: left 0;\r
+  background-repeat: no-repeat;\r
+  background-size: 1.6em;\r
+  -moz-margin-start: -2.3em;\r
+  -moz-padding-start: 2.3em;\r
+  font-size: 2.5em;\r
+}\r
+\r
+.title:-moz-dir(rtl) {\r
+  background-position: right 0;\r
+}\r
+\r
+.title-text {\r
+  border-bottom: 1px solid #A09090;\r
+  font-size: inherit;\r
+  padding-bottom: 0.4em;\r
+}\r
+\r
+@media (max-width: 675px) {\r
+  body {\r
+    padding: 0 48px;\r
+  }\r
+\r
+  .title {\r
+    background-image: none !important;\r
+    -moz-padding-start: 0;\r
+    -moz-margin-start: 0;\r
+  }\r
+\r
+  .title-text {\r
+    padding-top: 0;\r
+  }\r
+}\r
+\r
+ul, ol {\r
+  margin: 0;\r
+  padding: 0;\r
+  -moz-margin-start: 1em;\r
+}\r
+\r
+ul > li, ol > li {\r
+  margin-bottom: .5em;\r
+}\r
+\r
+ul {\r
+  list-style: disc;\r
+}\r
+\r
+/* Buttons */\r
+.button-container {\r
+  margin-top: 1.2em;\r
+}\r
+\r
+.button-container > button {\r
+  min-width: 150px;\r
+}\r
+\r
+/* Trees */\r
+tree {\r
+  min-height: 12em;\r
+  margin-top: 1.2em;\r
+  width: 100%;\r
+}
\ No newline at end of file