fifth and last part of syncing LCARStrek with Firefox 38 windows theme changes (inclu...

diff --git a/LCARStrek/browser/ToolbarFx.png b/LCARStrek/browser/ToolbarFx.png
index 3c51871d08706805f3e5794d606403603a5f040b..86f45695adbb35fad33983195853f2727a2ed69b 100644 (file)
Binary files a/LCARStrek/browser/ToolbarFx.png and b/LCARStrek/browser/ToolbarFx.png differ

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 7dbd3dfcb06ac568df2f889a3e385f55955316bf..7039ca815480c75823a937f48e5b5297f0f93de4 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -497,8 +497,8 @@ menuitem.bookmark-item {
           #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button),
-
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+          #pocket-button),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
@@ -944,6 +944,15 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 738px, 36px, 720px);
 }
 
+#pocket-button[cui-areatype="toolbar"] {
+  -moz-image-region: rect(0, 774px, 18px, 756px);
+}
+
+#pocket-button[cui-areatype="toolbar"]:hover,
+#pocket-button[cui-areatype="toolbar"][open] {
+  -moz-image-region: rect(18px, 774px, 36px, 756px);
+}
+
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
@@ -963,14 +972,16 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton,
           #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button)[cui-areatype="menu-panel"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+          #pocket-button)[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
           #social-share-button, #open-file-button, #find-button, #developer-button,
           #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button) {
+          #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button,
+                                                #pocket-button) {
   list-style-image: var(--menupanel-list-style-image);
 }
 
@@ -1277,6 +1288,15 @@ toolbarpaletteitem[place="palette"] > #webide-button:hover {
   -moz-image-region: rect(32px, 960px, 64px, 928px);
 }
 
+#pocket-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #pocket-button {
+  -moz-image-region: rect(0px, 992px, 32px, 960px);
+}
+
+#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
+  -moz-image-region: rect(32px, 992px, 64px, 960px);
+}
+
 toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
@@ -3559,6 +3579,12 @@ notification[value="loop-sharing-notification"] .messageImage {
   -moz-image-region: auto;
 }
 
+#panelMenu_pocket,
+#menu_pocket,
+#BMB_pocket {
+  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
+}
+
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {

diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css
index 478d3c1f5826b2fb2c0e1d7d3eecf0809dd9a0a6..fdf63e9a96eaf621dc738c7e863c85c3b9c765ab 100644 (file)
--- a/LCARStrek/browser/customizableui/panelUIOverlay.css
+++ b/LCARStrek/browser/customizableui/panelUIOverlay.css
@@ -222,6 +222,11 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
   max-width: 30em;
 }
 
+/* Bug 1164419 - increase Pocket panel size to accomidate wider Russian text. */
+panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-viewstack > .panel-mainview:not([panelid="PanelUI-popup"]) {
+  max-width: 33em; /* standaloneSubviewWidth + 3 */
+}
+
 panelview:not([mainview]) .toolbarbutton-text,
 .cui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
@@ -232,6 +237,11 @@ panelview:not([mainview]) .toolbarbutton-text,
   padding: 0;
 }
 
+.cui-widget-panel[viewId="PanelUI-pocketView"] > .panel-arrowcontainer > .panel-arrowcontent {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
 .cui-widget-panel.cui-widget-panelWithFooter > .panel-arrowcontainer > .panel-arrowcontent {
   padding-bottom: 0;
 }
@@ -1129,7 +1139,9 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 #customizationui-widget-multiview > .panel-viewcontainer,
 #customizationui-widget-multiview > .panel-viewcontainer > .panel-viewstack,
 #PanelUI-panicView > .panel-subview-body,
-#PanelUI-panicView {
+#PanelUI-panicView,
+#PanelUI-pocketView > .panel-subview-body,
+#PanelUI-pocketView {
   overflow: visible;
   color: #FF9F00;
 }

diff --git a/LCARStrek/browser/menuPanelFx.png b/LCARStrek/browser/menuPanelFx.png
index 906b0804a00855777e41e81305f54a719b99e3e8..fa7262c29a3f1d29356f82f6be3739ab08c859f8 100644 (file)
Binary files a/LCARStrek/browser/menuPanelFx.png and b/LCARStrek/browser/menuPanelFx.png differ

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index ecfb6bab05a688739a2027a16ba7d1012c036e47..373ea31d26b2ea03a03396ff97ac77a8ec1c3ae6 100644 (file)
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -343,6 +343,9 @@ description > html|a {
 #telemetryLearnMore,
 #FHRLearnMore,
 #crashReporterLearnMore {
+  /* provide some margin between the links and the label text */
+  /* !important is needed to override the rules defined in common.css */
+  -moz-margin-start: 20px !important;
   /* center the links */
   margin-top: 8px;
   margin-bottom: 8px;
@@ -440,6 +443,17 @@ description > html|a {
  * End Dialog
  */
 
+/**
+ * Font dialog menulist fixes
+ */
+
+#defaultFontType,
+#serif,
+#sans-serif,
+#monospace {
+  min-width: 30ch;
+}
+
 /**
  * Sync migration
  */

diff --git a/LCARStrek/browser/reader-tour.png b/LCARStrek/browser/reader-tour.png
new file mode 100644 (file)
index 0000000..2c6f8ed
Binary files /dev/null and b/LCARStrek/browser/reader-tour.png differ

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

diff --git a/LCARStrek/browser/readinglist/icons.svg b/LCARStrek/browser/readinglist/icons.svg
index d152cd792e4207ab3b2725a7c7ba5c0185c3dcc1..9bebaf19dfd16ba613926e35ae7501d8a602d85b 100644 (file)
--- a/LCARStrek/browser/readinglist/icons.svg
+++ b/LCARStrek/browser/readinglist/icons.svg
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 16 16"
+     viewBox="0 0 14 14"
      xml:space="preserve">
 
   <defs>
@@ -26,21 +26,21 @@
 
     <mask id="plus-mask">
       <rect width="100%" height="100%" fill="white"/>
-      <rect x="4" y="7.5" width="8" height="1"/>
-      <rect x="7.5" y="4" width="1" height="8"/>
+      <rect x="3" y="6" width="8" height="2"/>
+      <rect x="6" y="3" width="2" height="8"/>
     </mask>
 
     <mask id="minus-mask">
       <rect width="100%" height="100%" fill="white"/>
-      <rect x="4" y="7.5" width="8" height="1"/>
+      <rect x="3" y="6" width="8" height="2"/>
     </mask>
 
     <g id="addpage-shape">
-      <circle cx="8" cy="8" r="7" mask="url(#plus-mask)"/>
+      <circle cx="7" cy="7" r="6" mask="url(#plus-mask)"/>
     </g>
 
     <g id="removepage-shape">
-      <circle cx="8" cy="8" r="7" mask="url(#minus-mask)"/>
+      <circle cx="7" cy="7" r="6" mask="url(#minus-mask)"/>
     </g>
 
   </defs>