second part of syncing LCARStrek with Firefox 33 windows theme changes

diff --git a/LCARStrek/browser/aboutNetError.css b/LCARStrek/browser/aboutNetError.css
new file mode 100644 (file)
index 0000000..71da6fb
--- /dev/null
+++ b/LCARStrek/browser/aboutNetError.css
@@ -0,0 +1,69 @@
+/* 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/. */
+
+@import url("chrome://global/skin/in-content/common.css");
+
+body {
+  display: flex;
+  box-sizing: padding-box;
+  min-height: 100vh;
+  padding: 0 48px;
+  align-items: center;
+  justify-content: center;
+}
+
+ul, ol {
+  margin: 0;
+  padding: 0;
+  -moz-margin-start: 1em;
+}
+
+ul > li, ol > li {
+  margin-bottom: .5em;
+}
+
+ul {
+  list-style: disc;
+}
+
+#errorPageContainer {
+  min-width: 320px;
+  max-width: 512px;
+}
+
+#errorTitleText {
+  background: url("aboutNetError_info.svg") left 0 no-repeat;
+  background-size: 1.2em;
+  -moz-margin-start: -2em;
+  -moz-padding-start: 2em;
+}
+
+#errorTitleText:-moz-dir(rtl) {
+  background-position: right 0;
+}
+
+#errorTryAgain {
+  margin-top: 1.2em;
+  min-width: 150px
+}
+
+#errorContainer {
+  display: none;
+}
+
+@media (max-width: 675px) {
+  #errorTitleText {
+    padding-top: 0;
+    background-image: none;
+    -moz-padding-start: 0;
+    -moz-margin-start: 0;
+  }
+}
+
+/* Pressing the retry button will cause the cursor to flicker from a pointer to
+ * not-allowed. Override the disabled cursor behaviour since we will never show
+ * the button disabled as the initial state. */
+button:disabled {
+  cursor: pointer;
+}

diff --git a/LCARStrek/browser/aboutNetError_info.svg b/LCARStrek/browser/aboutNetError_info.svg
new file mode 100644 (file)
index 0000000..7a8db7d
--- /dev/null
+++ b/LCARStrek/browser/aboutNetError_info.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100">
+<g fill="#9C9CFF">
+  <circle cx="50" cy="50" r="44" style="stroke: #9C9CFF; stroke-width: 11; fill: transparent;"/>
+  <circle cx="50" cy="24.6" r="6.4"/>
+  <rect x="45" y="39.9" width="10.1" height="41.8"/>
+</g>
+</svg>

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 69a0ceaceb84a91cd4933c04afa3e6a86b556df3..acff1bc704f75f6e662e92806d9de9155b72a57b 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -116,6 +116,18 @@ menubar {
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
 }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
 }
 

+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar) {
+  overflow: -moz-hidden-unscrollable;
+  max-height: 4em;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out;
+}
+
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] {
+  min-height: 0.1px;
+  max-height: 0;
+  transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
+}
+

 @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. */
   /* Indent also due to non-applicable aero rule in original Windows theme. */
 @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. */
   /* Indent also due to non-applicable aero rule in original Windows theme. */


@@ -1611,7 +1623,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   margin: 0;
 }
 
   margin: 0;
 }
 

-/* tabview button & menu item */
+/* tabview menu item */

 
 #menu_tabview {
   list-style-image: url("chrome://browser/skin/tabview/tabview.png");
 
 #menu_tabview {
   list-style-image: url("chrome://browser/skin/tabview/tabview.png");


@@ -1634,6 +1646,20 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   -moz-image-region: rect(1px, 71px, 17px, 55px);
 }
 
   -moz-image-region: rect(1px, 71px, 17px, 55px);
 }
 

+/* undo close tab menu item */
+#alltabs_undoCloseTab {
+  list-style-image: url(chrome://browser/skin/undoCloseTab.png);
+}
+
+@media (min-resolution: 1.25dppx) {
+  #alltabs_undoCloseTab {
+    list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png);
+  }
+  #alltabs_undoCloseTab > .toolbarbutton-icon {
+    width: 16px;
+  }
+}
+

 /* zoom control text (reset) button special case: */
 
 #nav-bar #zoom-reset-button > .toolbarbutton-text {
 /* zoom control text (reset) button special case: */
 
 #nav-bar #zoom-reset-button > .toolbarbutton-text {


@@ -3028,6 +3054,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
 }
 
   list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png");
 }
 

+.popup-notification-icon[popupid="webRTC-sharingScreen"],
+.popup-notification-icon[popupid="webRTC-shareScreen"] {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png);
+}
+

 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url("chrome://browser/skin/pointerLock-64.png");
 }
 .popup-notification-icon[popupid="pointerLock"] {
   list-style-image: url("chrome://browser/skin/pointerLock-64.png");
 }


@@ -3176,6 +3207,16 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png");
 }
 
   list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png");
 }
 

+.webRTC-shareScreen-notification-icon,
+#webRTC-shareScreen-notification-icon {
+  list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png);
+}
+
+.webRTC-sharingScreen-notification-icon,
+#webRTC-sharingScreen-notification-icon {
+  list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png);
+}
+

 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
   list-style-image: url("chrome://browser/skin/notification-16.png");
 .web-notifications-notification-icon,
 #web-notifications-notification-icon {
   list-style-image: url("chrome://browser/skin/notification-16.png");


@@ -3441,6 +3482,7 @@ svg|line.box-model-guide-bottom,
 svg|line.box-model-guide-left {
   stroke: #E7ADE7;
   stroke-dasharray: 5 3;
 svg|line.box-model-guide-left {
   stroke: #E7ADE7;
   stroke-dasharray: 5 3;

+  shape-rendering: crispEdges;

 }
 
 /* Highlighter - Node Infobar */
 }
 
 /* Highlighter - Node Infobar */

diff --git a/LCARStrek/browser/devtools/cubic-bezier-swatch.png b/LCARStrek/browser/devtools/cubic-bezier-swatch.png
new file mode 100644 (file)
index 0000000..8a2ca35
Binary files /dev/null and b/LCARStrek/browser/devtools/cubic-bezier-swatch.png differ

diff --git a/LCARStrek/browser/devtools/cubic-bezier-swatch@2x.png b/LCARStrek/browser/devtools/cubic-bezier-swatch@2x.png
new file mode 100644 (file)
index 0000000..2fcba49
Binary files /dev/null and b/LCARStrek/browser/devtools/cubic-bezier-swatch@2x.png differ

diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index ddf02aee861c0aa7f53f02ad0b4ae0f60e37ff15..bdaf21b19d5ce2597172d2ee4ecf4e6cf82286d4 100644 (file)
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -175,7 +175,8 @@
 }
 
 .ruleview-colorswatch,
 }
 
 .ruleview-colorswatch,

-.computedview-colorswatch {
+.computedview-colorswatch,
+.ruleview-bezierswatch {

 /*  box-shadow: 0 0 0 1px #818181; */
 }
 
 /*  box-shadow: 0 0 0 1px #818181; */
 }
 


@@ -392,15 +393,22 @@ div.CodeMirror span.eval-text {
 .devtools-toolbar {
 }
 
 .devtools-toolbar {
 }
 

-/* LCARStrek checkbox colors don't work well against toolbar background */
-.devtools-toolbar > checkbox {
+.devtools-toolbar checkbox {
+  /* LCARStrek checkbox colors don't work well against toolbar background */

   background-color: #000000;
   padding: 2px;
 }
   background-color: #000000;
   padding: 2px;
 }

+.devtools-toolbar checkbox .checkbox-check {
+}
+.devtools-toolbar checkbox .checkbox-label-box {
+}
+.devtools-toolbar checkbox .checkbox-label-box .checkbox-label {
+}

 
 /* Toolbar buttons */
 .devtools-menulist,
 .devtools-toolbarbutton {
 
 /* Toolbar buttons */
 .devtools-menulist,
 .devtools-toolbarbutton {

+/*  transition: background 0.05s ease-in-out; */

 }
 
 .devtools-menulist:-moz-focusring,
 }
 
 .devtools-menulist:-moz-focusring,


@@ -418,6 +426,12 @@ div.CodeMirror span.eval-text {
   min-width: 20px;
 }
 
   min-width: 20px;
 }
 

+#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
+  -moz-padding-start: 5px;
+  -moz-padding-end: 5px;
+  min-width: inherit;
+}
+

 .devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
   display: none;
 }
 .devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
   display: none;
 }


@@ -428,16 +442,16 @@ div.CodeMirror span.eval-text {
 .devtools-toolbarbutton > .toolbarbutton-icon {
 }
 
 .devtools-toolbarbutton > .toolbarbutton-icon {
 }
 

-.devtools-toolbarbutton > .toolbarbutton-menubutton-button {
-  /*-moz-box-orient: horizontal;*/
-}
-

 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {

+/*  -moz-box-orient: horizontal; */

 }
 
 .devtools-toolbarbutton[type=menu-button] {
 }
 
 }
 
 .devtools-toolbarbutton[type=menu-button] {
 }
 

+.devtools-toolbarbutton > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+}
+

 .devtools-menulist > .menulist-dropmarker {
 }
 
 .devtools-menulist > .menulist-dropmarker {
 }
 


@@ -450,29 +464,39 @@ div.CodeMirror span.eval-text {
 }
 
 /* Text-only buttons */
 }
 
 /* Text-only buttons */

-.devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]) {
+.devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
+#toolbox-buttons .devtools-toolbarbutton[text-as-image] {

 /*  background-color: rgba(0, 0, 0, .2); / Splitter */
 }
 
 /* Button States */
 .devtools-toolbarbutton:hover,
 /*  background-color: rgba(0, 0, 0, .2); / Splitter */
 }
 
 /* Button States */
 .devtools-toolbarbutton:hover,

+#toolbox-buttons .devtools-toolbarbutton[text-as-image]:hover,

 .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]):hover {
 /*  background: rgba(0, 0, 0, .3); / Splitters */
 }
 
 .devtools-toolbarbutton:hover:active,
 .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]):hover {
 /*  background: rgba(0, 0, 0, .3); / Splitters */
 }
 
 .devtools-toolbarbutton:hover:active,

+#toolbox-buttons .devtools-toolbarbutton[text-as-image]:hover:active,

 .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]):hover:active {
 /*  background: rgba(0, 0, 0, .4); / Splitters */
 }
 
 /* Menu type buttons and checked states */
 .devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]):hover:active {
 /*  background: rgba(0, 0, 0, .4); / Splitters */
 }
 
 /* Menu type buttons and checked states */

-.theme-dark .devtools-menulist[open=true],
-.theme-dark .devtools-toolbarbutton[open=true],
-.theme-dark .devtools-toolbarbutton[open=true]:hover,
-.theme-dark .devtools-toolbarbutton[open=true]:hover:active,
-.theme-dark .devtools-toolbarbutton[checked=true],
-.theme-dark .devtools-toolbarbutton[checked=true]:hover {
-/*  background: rgba(29, 79, 115, .7); /*Select highlight blue /
+.devtools-toolbarbutton[checked=true],
+#toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
+/*  background: rgba(29, 79, 115, .7); / Select highlight blue /
+  color: #f5f7fa;*/
+}
+
+.devtools-menulist[open=true],
+.devtools-toolbarbutton[open=true],
+.devtools-toolbarbutton[open=true]:hover,
+.devtools-toolbarbutton[open=true]:hover:active,
+.devtools-toolbarbutton[checked=true],
+.devtools-toolbarbutton[checked=true]:hover,
+#toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
+/*  background: rgba(29, 79, 115, .8); / Select highlight blue /

   color: #f5f7fa; */
 }
 
   color: #f5f7fa; */
 }
 

diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index 57cf8b38dba3c4fe72eade03e7b0bb460966ff07..61be1a37d9be5e8954d1ff77921f140095dcc607 100644 (file)
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -564,7 +564,6 @@ window {
 #resume {
   list-style-image: url("chrome://browser/skin/devtools/debugger-pause.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 #resume {
   list-style-image: url("chrome://browser/skin/devtools/debugger-pause.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);

-/*  transition: background 0.15s ease-in-out; */

 }
 
 #resume:hover {
 }
 
 #resume:hover {


@@ -572,13 +571,7 @@ window {
 }
 
 #resume[checked=true] {
 }
 
 #resume[checked=true] {

-/*  background: none; */

   list-style-image: url("chrome://browser/skin/devtools/debugger-play.png");
   list-style-image: url("chrome://browser/skin/devtools/debugger-play.png");

-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#resume[checked=true]:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);

 }
 
 @media (min-resolution: 2dppx) {
 }
 
 @media (min-resolution: 2dppx) {


@@ -593,11 +586,6 @@ window {
 
   #resume[checked=true] {
     list-style-image: url(debugger-play@2x.png);
 
   #resume[checked=true] {
     list-style-image: url(debugger-play@2x.png);

-    -moz-image-region: rect(0px, 32px, 32px, 0);
-  }
-
-  #resume[checked=true]:hover {
-    -moz-image-region: rect(0px, 64px, 32px, 32px);

   }
 }
 
   }
 }
 

diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css
index 6f545d35578ff15582f303db2f0fe9395d7e6a51..df694709e25536b55c0edf0d701a1701ee5feec3 100644 (file)
--- a/LCARStrek/browser/devtools/ruleview.css
+++ b/LCARStrek/browser/devtools/ruleview.css
@@ -60,7 +60,8 @@
   visibility: hidden;
 }
 
   visibility: hidden;
 }
 

-.ruleview-rule[uneditable=true] .ruleview-colorswatch {
+.ruleview-rule[uneditable=true] .ruleview-colorswatch,
+.ruleview-rule[uneditable=true] .ruleview-bezierswatch {

   cursor: default;
 }
 
   cursor: default;
 }
 


@@ -139,7 +140,8 @@
   -moz-margin-start: 35px;
 }
 
   -moz-margin-start: 35px;
 }
 

-.ruleview-colorswatch {
+.ruleview-colorswatch,
+.ruleview-bezierswatch {

   cursor: pointer;
   border-radius: 50%;
   width: 1em;
   cursor: pointer;
   border-radius: 50%;
   width: 1em;


@@ -166,6 +168,18 @@
   z-index: -1;
 }
 
   z-index: -1;
 }
 

+.ruleview-bezierswatch {
+  background: url("chrome://browser/skin/devtools/cubic-bezier-swatch.png");
+  background-size: 1em;
+}
+
+@media (min-resolution: 2dppx) {
+  .ruleview-bezierswatch {
+    background: url("chrome://browser/skin/devtools/cubic-bezier-swatch@2x.png");
+    background-size: 1em;
+  }
+}
+

 .ruleview-overridden {
   text-decoration: line-through;
 }
 .ruleview-overridden {
   text-decoration: line-through;
 }

diff --git a/LCARStrek/browser/devtools/styleeditor.css b/LCARStrek/browser/devtools/styleeditor.css
index cda30c3fbfff0f420b8d3e85e1f953c74f79460e..6c142455c807d23e0e46546e174bc293a8955402 100644 (file)
--- a/LCARStrek/browser/devtools/styleeditor.css
+++ b/LCARStrek/browser/devtools/styleeditor.css
@@ -107,8 +107,8 @@ window:not([windowtype]) {
 }
 
 .stylesheet-sidebar {
 }
 
 .stylesheet-sidebar {

-  width: 237px;
-  -moz-border-start: 1px solid;
+  max-width: 400px;
+  min-width: 100px;

 
   border-color: #9C9CFF; /* Splitters */
 }
 
   border-color: #9C9CFF; /* Splitters */
 }


@@ -152,11 +152,6 @@ window:not([windowtype]) {
   background-position: -24px 8px;
 }
 
   background-position: -24px 8px;
 }
 

-#style-editor-options {
-  width: 20px;
-  overflow: hidden;
-}
-

 .splitview-nav > li > .stylesheet-enabled:focus,
 .splitview-nav > li:hover > .stylesheet-enabled {
   outline: 0;
 .splitview-nav > li > .stylesheet-enabled:focus,
 .splitview-nav > li:hover > .stylesheet-enabled {
   outline: 0;

diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css
index 84012a0537edbb4e4ee3070547edd5b2f1fb27bd..056424c1e61bd041ee92a018d6386218bb6ab2b9 100644 (file)
--- a/LCARStrek/browser/devtools/webconsole.css
+++ b/LCARStrek/browser/devtools/webconsole.css
@@ -225,6 +225,10 @@ a {
   border-color: #FFCF00;
 }
 
   border-color: #FFCF00;
 }
 

+.message:hover {
+  background-color: #404000;
+}
+

 .message[severity=error] {
   background-color: #FF0000;
 }
 .message[severity=error] {
   background-color: #FF0000;
 }

diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css
index 4494587435fbaea3e953d90321068f6d7aaf1a5e..b38d582fb65a1b08b9f555ce7e93e2fe254194e4 100644 (file)
--- a/LCARStrek/browser/devtools/widgets.css
+++ b/LCARStrek/browser/devtools/widgets.css
@@ -208,6 +208,12 @@
   color: #000000;
 }
 
   color: #000000;
 }
 

+.breadcrumbs-widget-item > .button-box {
+  border: none;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+

 .breadcrumbs-widget-item:not([checked]) {
   background-image: -moz-element(#breadcrumb-separator-normal);
   background-repeat: no-repeat;
 .breadcrumbs-widget-item:not([checked]) {
   background-image: -moz-element(#breadcrumb-separator-normal);
   background-repeat: no-repeat;


@@ -796,10 +802,6 @@
   cursor: grabbing;
 }
 
   cursor: grabbing;
 }
 

-.graph-widget-canvas ~ * {
-  pointer-events: none;
-}
-

 /* Line graph widget */
 
 .line-graph-widget-canvas {
 /* Line graph widget */
 
 .line-graph-widget-canvas {


@@ -814,6 +816,7 @@
   top: 0;
   left: 0;
   border-right: 1px solid #9C9CFF;
   top: 0;
   left: 0;
   border-right: 1px solid #9C9CFF;

+  pointer-events: none;

 }
 
 .line-graph-widget-gutter-line {
 }
 
 .line-graph-widget-gutter-line {


@@ -845,6 +848,7 @@
   transform: translateY(-50%);
   font-size: 80%;
   z-index: 1;
   transform: translateY(-50%);
   font-size: 80%;
   z-index: 1;

+  pointer-events: none;

 }
 
 .line-graph-widget-tooltip::before {
 }
 
 .line-graph-widget-tooltip::before {


@@ -922,6 +926,7 @@
   left: 8px;
   color: #A09090;
   font-size: 80%;
   left: 8px;
   color: #A09090;
   font-size: 80%;

+  pointer-events: none;

 }
 
 .bar-graph-widget-legend-item {
 }
 
 .bar-graph-widget-legend-item {


@@ -941,6 +946,7 @@
   border: 1px solid #9C9CFF;
   border-radius: 1px;
   -moz-margin-end: 4px;
   border: 1px solid #9C9CFF;
   border-radius: 1px;
   -moz-margin-end: 4px;

+  pointer-events: none;

 }
 
 .bar-graph-widget-legend-item > [view="label"] {
 }
 
 .bar-graph-widget-legend-item > [view="label"] {

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index c5346dc113f871942b05160eb6d4993e07bfb198..0fdaa3cd5d4363df01463d99ab13ca24500a48b1 100644 (file)
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -599,6 +599,26 @@ description > html|a {
   background-color: #F1F1F1;*/
 }
 
   background-color: #F1F1F1;*/
 }
 

+#weavePrefsDeck {
+  -moz-margin-start: 60px;
+}
+
+#noFxaAccount {
+  /* Overriding the margins from the base preferences.css theme file.
+     These overrides can be simplified by fixing bug 1027174 */
+  margin: 0;
+}
+
+#weavePrefsDeck > vbox > label,
+#weavePrefsDeck > vbox > groupbox,
+#weavePrefsDeck > vbox > description,
+#weavePrefsDeck > vbox > #pairDevice > label,
+#weavePrefsDeck > #needsUpdate > hbox > #loginError,
+#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP) > label {
+  /* no margin-start for elements at the begin of a line */
+  -moz-margin-start: 0;
+}
+

 #advancedPrefs {
   padding-bottom: 0; /* no padding needed in inContent prefs */
 }
 #advancedPrefs {
   padding-bottom: 0; /* no padding needed in inContent prefs */
 }


@@ -641,6 +661,10 @@ description > html|a {
   min-width: 66ch;
 }
 
   min-width: 66ch;
 }
 

+#dialogTitle {
+  -moz-margin-start: 5px !important;
+}
+

 .close-icon {
   background-color: transparent !important;
   border: none;
 .close-icon {
   background-color: transparent !important;
   border: none;


@@ -658,7 +682,7 @@ description > html|a {
 #dialogFrame {
   -moz-box-flex: 1;
   /* Default dialog dimensions */
 #dialogFrame {
   -moz-box-flex: 1;
   /* Default dialog dimensions */

-  height: 30em;
+  height: 20em;

   width: 66ch;
 }
 
   width: 66ch;
 }
 

diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css
index 2c5e3c163f5739e20b73188df6cb6f6a5951a0cb..df3add6e47fa37ee523b536093108b289da040b2 100644 (file)
--- a/LCARStrek/browser/preferences/preferences.css
+++ b/LCARStrek/browser/preferences/preferences.css
@@ -188,11 +188,3 @@ label.small {
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }
 #noFxaAccount > label:first-child {
   margin-bottom: 0.6em;
 }

-
-#fxa-pweng-help-link > label {
-  margin: 0;
-}
-
-#fxa-pweng-help-link > image {
-  list-style-image: url("chrome://global/skin/icons/question-16.png");
-}

diff --git a/LCARStrek/browser/undoCloseTab.png b/LCARStrek/browser/undoCloseTab.png
new file mode 100644 (file)
index 0000000..44c6215
Binary files /dev/null and b/LCARStrek/browser/undoCloseTab.png differ

diff --git a/LCARStrek/browser/undoCloseTab@2x.png b/LCARStrek/browser/undoCloseTab@2x.png
new file mode 100644 (file)
index 0000000..3275f4f
Binary files /dev/null and b/LCARStrek/browser/undoCloseTab@2x.png differ

diff --git a/LCARStrek/browser/webRTC-shareScreen-16.png b/LCARStrek/browser/webRTC-shareScreen-16.png
new file mode 100644 (file)
index 0000000..25a5730
Binary files /dev/null and b/LCARStrek/browser/webRTC-shareScreen-16.png differ

diff --git a/LCARStrek/browser/webRTC-shareScreen-16@2x.png b/LCARStrek/browser/webRTC-shareScreen-16@2x.png
new file mode 100644 (file)
index 0000000..7e3b5e7
Binary files /dev/null and b/LCARStrek/browser/webRTC-shareScreen-16@2x.png differ

diff --git a/LCARStrek/browser/webRTC-shareScreen-64.png b/LCARStrek/browser/webRTC-shareScreen-64.png
new file mode 100644 (file)
index 0000000..6cdf432
Binary files /dev/null and b/LCARStrek/browser/webRTC-shareScreen-64.png differ

diff --git a/LCARStrek/browser/webRTC-shareScreen-64@2x.png b/LCARStrek/browser/webRTC-shareScreen-64@2x.png
new file mode 100644 (file)
index 0000000..f02dd5f
Binary files /dev/null and b/LCARStrek/browser/webRTC-shareScreen-64@2x.png differ

diff --git a/LCARStrek/browser/webRTC-sharingScreen-16.png b/LCARStrek/browser/webRTC-sharingScreen-16.png
new file mode 100644 (file)
index 0000000..d06e3f9
Binary files /dev/null and b/LCARStrek/browser/webRTC-sharingScreen-16.png differ

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

diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
new file mode 100644 (file)
index 0000000..2696d12
--- /dev/null
+++ b/LCARStrek/global/in-content/common.css
@@ -0,0 +1,627 @@
+/* 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 common.inc.css === */
+
+@namespace html "http://www.w3.org/1999/xhtml";
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+/*
+html|body,
+xul|page {
+  font: message-box;
+  -moz-appearance: none;
+  background-color: #f1f1f1;
+  color: #424e5a;
+}
+
+html|body {
+  font-size: 15px;
+  font-weight: normal;
+  margin: 0;
+}
+
+html|h1 {
+  font-size: 2.5em;
+  font-weight: lighter;
+  line-height: 1.2;
+  margin: 0;
+  margin-bottom: .5em;
+}
+
+xul|caption {
+  -moz-appearance: none;
+  margin: 0;
+}
+
+xul|caption > xul|label {
+  font-size: 1.3rem;
+  font-weight: bold;
+  line-height: 22px;
+  margin: 0 !important;
+}
+
+*|*.main-content {
+  padding: 40px 48px 48px;
+  overflow: auto;
+}
+
+xul|prefpane > xul|*.content-box {
+  overflow: visible;
+}
+*/
+/* groupboxes */
+/*
+xul|groupbox {
+  -moz-appearance: none;
+  border: none;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  -moz-margin-end: 0;
+  -moz-padding-start: 0;
+  -moz-padding-end: 0;
+  font-size: 1.25rem;
+}
+
+xul|groupbox xul|label {
+  / !important needed to override toolkit !important rule /
+  -moz-margin-start: 0 !important;
+  -moz-margin-end: 0 !important;
+}
+*/
+/* tabpanels and tabs */
+/*
+xul|tabpanels {
+  -moz-appearance: none;
+  font-size: 1.25rem;
+  line-height: 22px;
+  border: none;
+  padding: 0;
+  background-color: transparent;
+}
+
+xul|tabs {
+  margin-bottom: 15px;
+  border-top: 1px solid #c1c1c1;
+  border-bottom: 1px solid #c1c1c1;
+  background-color: #fbfbfb;
+}
+
+xul|*.tabs-left,
+xul|*.tabs-right {
+  border-bottom: none;
+}
+
+xul|tab {
+  -moz-appearance: none;
+  margin-top: 0;
+  padding: 0 20px;
+  min-height: 44px;
+  color: #424f5a;
+  background-color: #fbfbfb;
+  border-width: 0;
+  transition: background-color 50ms ease 0s;
+}
+
+xul|tab:hover {
+  background-color: #ebebeb;
+}
+
+xul|tab[selected] {
+  background-color: #ebebeb;
+  box-shadow: inset 0 -4px 0 0 #ff9500;
+}
+
+xul|*.tab-text {
+  font-size: 1.3rem;
+  line-height: 22px;
+}
+*/
+/* html buttons */
+/*
+html|button {
+  padding: 3px;
+  / * override forms.css * /
+  font: inherit;
+}
+*/
+/* xul buttons and menulists */
+/*
+*|button,
+xul|colorpicker[type="button"],
+xul|menulist {
+  -moz-appearance: none;
+  height: 30px;
+  color: #333;
+  line-height: 20px;
+  text-shadow: 0 1px 1px #fefffe;
+  border: 1px solid #c1c1c1;
+  -moz-border-top-colors: none !important;
+  -moz-border-right-colors: none !important;
+  -moz-border-bottom-colors: none !important;
+  -moz-border-left-colors: none !important;
+  border-radius: 2px;
+  background-color: #fbfbfb;
+}
+
+html|button:enabled:hover,
+xul|button:not([disabled="true"]):hover,
+xul|colorpicker[type="button"]:not([disabled="true"]):hover,
+xul|menulist:not([disabled="true"]):hover {
+  background-color: #ebebeb;
+}
+
+html|button:enabled:hover:active,
+xul|button:not([disabled="true"]):hover:active,
+xul|colorpicker[type="button"]:not([disabled="true"]):hover:active,
+xul|menulist[open="true"]:not([disabled="true"]) {
+  background-color: #dadada;
+}
+
+html|button:disabled,
+xul|button[disabled="true"],
+xul|colorpicker[type="button"][disabled="true"],
+xul|menulist[disabled="true"] {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+
+xul|colorpicker[type="button"] {
+  padding: 6px;
+  width: 50px;
+}
+
+xul|button > xul|*.button-box,
+xul|menulist > xul|*.menulist-label-box {
+  padding-right: 10px !important;
+  padding-left: 10px !important;
+}
+
+xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
+  -moz-appearance: none;
+  margin: 1px 0;
+  -moz-margin-start: 10px;
+  padding: 0;
+  width: 10px;
+  height: 16px;
+  border: none;
+  background-color: transparent;
+  list-style-image: url("chrome://global/skin/in-content/dropdown.png");
+}
+
+xul|*.help-button {
+  min-width: 30px;
+  border-radius: 2px;
+  border: 1px solid #c1c1c1;
+  background-color: #ffcb00;
+  background-image: none;
+  box-shadow: none;
+}
+
+xul|*.help-button:not([disabled="true"]):hover {
+  background-color: #f4c200;
+  background-image: none;
+}
+
+xul|*.help-button:not([disabled="true"]):hover:active {
+  background-color: #eaba00;
+  background-image: none;
+}
+
+xul|*.close-icon > xul|*.button-box,
+xul|*.help-button > xul|*.button-box {
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-right: 0 !important;
+  padding-left: 0 !important;
+}
+
+xul|*.help-button > xul|*.button-box > xul|*.button-icon {
+  width: 26px;
+  height: 26px;
+  background-image: url("chrome://global/skin/in-content/help-glyph.png");
+  background-position: center;
+}
+
+@media (min-resolution: 2dppx) {
+  xul|*.help-button > xul|*.button-box > xul|*.button-icon {
+    background-size: 26px 26px;
+    background-image: url("chrome://global/skin/in-content/help-glyph@2x.png");
+  }
+}
+
+xul|*.help-button > xul|*.button-box > xul|*.button-text {
+  display: none;
+}
+
+xul|*.spinbuttons-button {
+  -moz-margin-start: 10px !important;
+  -moz-margin-end: 2px !important;
+}
+
+xul|*.spinbuttons-up {
+  margin-top: 2px !important;
+  border-radius: 1px 1px 0 0;
+}
+
+xul|*.spinbuttons-down  {
+  margin-bottom: 2px !important;
+  border-radius: 0 0 1px 1px;
+}
+
+xul|*.spinbuttons-button > xul|*.button-box {
+  padding: 1px 5px 2px !important;
+}
+
+xul|*.spinbuttons-up > xul|*.button-box > xul|*.button-icon {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
+}
+
+xul|*.spinbuttons-up[disabled="true"] > xul|*.button-box > xul|*.button-icon {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif");
+}
+
+xul|*.spinbuttons-down > xul|*.button-box > xul|*.button-icon {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
+}
+
+xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
+  -moz-appearance: none;
+  -moz-margin-end: 10px;
+  padding: 0;
+  border: none;
+  background-color: transparent;
+  list-style-image: url("chrome://global/skin/in-content/dropdown.png");
+}
+
+xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
+  list-style-image: url("chrome://global/skin/in-content/dropdown-disabled.png")
+}
+
+@media (min-resolution: 2dppx) {
+  xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker,
+  xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
+    list-style-image: url("chrome://global/skin/in-content/dropdown@2x.png");
+  }
+
+  xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
+    list-style-image: url("chrome://global/skin/in-content/dropdown-disabled@2x.png")
+  }
+
+  xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon,
+  xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker > xul|*.dropmarker-icon {
+    width: 10px;
+    height: 16px;
+  }
+}
+
+xul|menulist > xul|menupopup,
+xul|button[type="menu"] > xul|menupopup {
+  -moz-appearance: none;
+  border: 1px solid rgba(23,50,77,0.4);
+  border-radius: 2px;
+  background-color: #fff;
+}
+
+xul|menulist > xul|menupopup xul|menu,
+xul|menulist > xul|menupopup xul|menuitem,
+xul|button[type="menu"] > xul|menupopup xul|menu,
+xul|button[type="menu"] > xul|menupopup xul|menuitem {
+  -moz-appearance: none;
+  font-size: 1.25rem;
+  line-height: 22px;
+  height: 40px;
+  color: #333;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 30px;
+}
+
+xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"],
+xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
+  color: #333;
+  background-color: transparent;
+  background-image: linear-gradient(rgba(76,177,255,0.25), rgba(23,146,229,0.25));
+}
+
+xul|menulist > xul|menupopup > xul|menu[selected="true"],
+xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
+  color: #fff;
+  background-image: linear-gradient(#4cb1ff, #1792e5);
+}
+
+xul|menulist > xul|menupopup xul|menuseparator,
+xul|button[type="menu"] > xul|menupopup xul|menuseparator {
+  -moz-appearance: none;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0;
+  border-top: 1px solid rgba(23,50,77,0.4);
+  border-bottom: none;
+}
+*/
+/* textboxes */
+/*
+*|textbox {
+  -moz-appearance: none;
+  height: 30px;
+  color: #333;
+  line-height: 20px;
+  text-shadow: 0 1px 1px #fefffe;
+  padding-right: 10px;
+  padding-left: 10px;
+  border: 1px solid #c1c1c1;
+  -moz-border-top-colors: none !important;
+  -moz-border-right-colors: none !important;
+  -moz-border-bottom-colors: none !important;
+  -moz-border-left-colors: none !important;
+  border-radius: 2px;
+  background-color: #fff;
+}
+
+html|textbox:focus,
+xul|textbox[focused] {
+  border-color: #0095dd;
+}
+
+html|textbox:disabled,
+xul|textbox[disabled="true"] {
+  opacity: 0.5;
+}
+*/
+/* Links */
+/*
+html|a,
+xul|*.text-link,
+xul|*.inline-link {
+  font-size: 1.25rem;
+  line-height: 22px;
+  color: #0095dd;
+  text-decoration: none;
+}
+
+html|a:hover,
+xul|*.text-link:hover,
+xul|*.inline-link:hover {
+  color: #4cb1ff;
+  text-decoration: none;
+}
+
+html|a:hover:active,
+xul|*.text-link:hover:active,
+xul|*.inline-link:hover:active {
+  color: #ff9500;
+  text-decoration: none;
+}
+*/
+/* Checkboxes and radio buttons */
+/*
+xul|checkbox {
+  -moz-margin-start: 0;
+}
+
+xul|*.checkbox-check {
+  -moz-appearance: none;
+  width: 23px;
+  height: 23px;
+  border-radius: 2px;
+  border: 1px solid #c1c1c1;
+  -moz-margin-end: 10px;
+  background-color: #f1f1f1;
+  background-image: linear-gradient(#fff, rgba(255,255,255,0.8));
+  background-position: center center;
+  background-repeat: no-repeat;
+  box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
+}
+
+xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check {
+  border-color: #0095dd;
+}
+
+xul|*.checkbox-check[checked] {
+  background-image: url("chrome://global/skin/in-content/check.png"),
+                    / * !important needed to override toolkit !important rule * /
+                    linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
+}
+
+xul|checkbox[disabled="true"] > xul|*.checkbox-check {
+  opacity: 0.5;
+}
+
+xul|*.checkbox-label-box {
+  -moz-margin-start: -1px; / * negative margin for the transparent border * /
+  -moz-padding-start: 0;
+}
+
+@media (min-resolution: 2dppx) {
+  xul|*.checkbox-check[checked] {
+    background-size: 12px 12px, auto;
+    background-image: url("chrome://global/skin/in-content/check@2x.png"),
+                      linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
+  }
+}
+
+xul|*.radio-check {
+  -moz-appearance: none;
+  width: 23px;
+  height: 23px;
+  border: 1px solid #c1c1c1;
+  border-radius: 50%;
+  -moz-margin-end: 10px;
+  background-color: #f1f1f1;
+  background-image: linear-gradient(#fff, rgba(255,255,255,0.80));
+  box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
+}
+
+xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
+  border-color: #0095dd;
+}
+
+xul|*.radio-check[selected] {
+  background-image: radial-gradient(circle, rgb(23,146,229),
+                    rgb(76,177,255) 5.5px, rgba(76,177,255,0.2) 6px,
+                    transparent 6px),
+                    linear-gradient(rgb(255,255,255), rgba(255,255,255,0.8));
+}
+
+xul|radio[disabled="true"] > xul|*.radio-check {
+  opacity: 0.5;
+}
+
+xul|*.radio-label-box {
+  -moz-margin-start: -1px; / * negative margin for the transparent border *  /
+  -moz-margin-end: 10px;
+  -moz-padding-start: 0;
+}
+*/
+/* Category List */
+/*
+xul|*#categories {
+  -moz-appearance: none;
+  background-color: #424f5a;
+  padding-top: 39px;
+  margin: 0;
+}
+
+xul|*.category {
+  -moz-appearance: none;
+  color: #c1c1c1;
+  -moz-border-end-width: 0;
+  -moz-padding-start: 15px;
+  -moz-padding-end: 21px;
+  min-height: 40px;
+  transition: background-color 150ms;
+}
+
+xul|*.category:hover {
+  background-color: #5e6972;
+}
+
+xul|*.category[selected] {
+  background-color: #343f48;
+  color: #f2f2f2;
+  box-shadow: inset 4px 0 0 0 #ff9500;
+}
+
+xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {
+  border-top: 1px #ffffff dotted;
+  border-bottom: 1px #ffffff dotted;
+}
+
+*|*.category-name {
+  line-height: 22px;
+  font-size: 1.25rem;
+  padding-bottom: 2px;
+  -moz-padding-start: 9px;
+  margin: 0;
+}
+
+*|*.category-icon {
+  width: 24px;
+  height: 24px;
+}
+*/
+/* header */
+/*
+*|*.header {
+  border-bottom: 1px solid #c8c8c8;
+  margin-bottom: 15px;
+  padding-bottom: 15px;
+}
+
+*|*.header-name {
+  font-size: 2.5rem;
+  font-weight: normal;
+  line-height: 40px;
+  margin: 0;
+}
+*/
+/* File fields */
+/*
+xul|filefield {
+  -moz-appearance: none;
+  background-color: transparent;
+  border: none;
+  padding: 0;
+}
+
+xul|*.fileFieldContentBox {
+  background-color: transparent;
+}
+
+xul|*.fileFieldIcon {
+  -moz-margin-start: 10px;
+  -moz-margin-end: 0;
+}
+
+xul|*.fileFieldLabel {
+  -moz-margin-start: -26px;
+  -moz-padding-start: 36px;
+}
+
+xul|textbox:-moz-locale-dir(rtl),
+xul|*.fileFieldLabel:-moz-locale-dir(rtl),
+xul|textbox + xul|button:-moz-locale-dir(ltr),
+xul|filefield + xul|button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+xul|textbox:-moz-locale-dir(ltr),
+xul|*.fileFieldLabel:-moz-locale-dir(ltr),
+xul|textbox + xul|button:-moz-locale-dir(rtl),
+xul|filefield + xul|button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+xul|textbox + xul|button,
+xul|filefield + xul|button {
+  -moz-border-start: none;
+}
+*/
+/* === END common.inc.css === */
+/*
+xul|caption {
+  background-color: transparent;
+}
+
+xul|button,
+xul|colorpicker[type="button"],
+xul|menulist {
+  margin: 2px 4px;
+}
+
+xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
+  margin-top: 1px;
+  margin-bottom: 1px;
+}
+
+xul|checkbox {
+  -moz-padding-start: 0;
+}
+
+xul|radio {
+  -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
+  -moz-margin-start: 0;
+  -moz-padding-start: 0;
+}
+
+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;
+}
+*/
\ No newline at end of file