From 6adbc9a6eeca29d3da3ca7d12ae845818e045eaa Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Sun, 31 Mar 2013 03:24:05 +0200
Subject: [PATCH] finish updating LCARStrek for changes in Firefox 20 cycle

---
 LCARStrek/browser/FxToolbar.png           | Bin 1887 -> 1922 bytes
 LCARStrek/browser/browser.css             | 228 ++++++++++------------
 LCARStrek/browser/downloads/downloads.css |   5 +
 LCARStrek/browser/searchbar.css           |   5 -
 4 files changed, 106 insertions(+), 132 deletions(-)

diff --git a/LCARStrek/browser/FxToolbar.png b/LCARStrek/browser/FxToolbar.png
index effd72616a88f3da086ce2f032c05305f49ad47c..928aeb7b68d00298410f84c21c258fa23722af67 100644
GIT binary patch
delta 1889
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
KoLd~Da{dQEQJQ=J

delta 1831
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
T&Ep^aIf%WrvlZ3S|JMHiOuUb(

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 778c8b88..db21aa45 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -792,8 +792,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent;
 }
 
-/* stop button */
-
 #stop-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
@@ -806,8 +804,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-/* reload button */
-
 #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
@@ -820,8 +816,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-/* home button */
-
 #home-button.bookmark-item {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
@@ -837,55 +831,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 90px, 54px, 72px);
 }
 
-/* tabview button */
-
-#tabview-button,
-#menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
-}
-
-#tabview-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
-
-#tabview-button[groups="0"] {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#tabview-button[groups="1"] {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#tabview-button[groups="2"] {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#tabview-button[groups="3"] {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
-#menu_tabview {
-  -moz-image-region: rect(1px, 89px, 17px, 73px);
-}
-
-#menu_tabview[groups="0"] {
-  -moz-image-region: rect(1px, 17px, 17px, 1px);
-}
-
-#menu_tabview[groups="1"] {
-  -moz-image-region: rect(1px, 35px, 17px, 19px);
-}
-
-#menu_tabview[groups="2"] {
-  -moz-image-region: rect(1px, 53px, 17px, 37px);
-}
-
-#menu_tabview[groups="3"] {
-  -moz-image-region: rect(1px, 71px, 17px, 55px);
-}
-
-/* download manager button */
-
 #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
@@ -902,9 +847,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin: 0;
 }
 
-/* history sidebar button */
-
-#webrtc-status-button /* temporary placeholder (bug 824825) */,
 #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
@@ -917,8 +859,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 126px, 54px, 108px);
 }
 
-/* bookmark sidebar & menu buttons */
-
 #bookmarks-button,
 #bookmarks-menu-button {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
@@ -944,8 +884,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
-/* print button */
-
 #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
@@ -958,8 +896,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 162px, 54px, 144px);
 }
 
-/* toolbar new tab button */
-
 #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
@@ -972,8 +908,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 180px, 54px, 162px);
 }
 
-/* new window button */
-
 #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
@@ -986,8 +920,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 198px, 54px, 180px);
 }
 
-/* cut button */
-
 #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
@@ -1000,8 +932,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 216px, 54px, 198px);
 }
 
-/* copy button */
-
 #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
@@ -1014,8 +944,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 234px, 54px, 216px);
 }
 
-/* paste button */
-
 #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
@@ -1028,8 +956,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 252px, 54px, 234px);
 }
 
-/* fullscreen button */
-
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
@@ -1042,8 +968,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 270px, 54px, 252px);
 }
 
-/* zoom controls */
-
 #zoom-out-button {
   -moz-image-region: rect(0, 288px, 18px, 270px);
   -moz-margin-end: 0;
@@ -1069,8 +993,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 306px, 54px, 288px);
 }
 
-/* sync button */
-
 #sync-button:not([status]) {
   list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 324px, 18px, 306px);
@@ -1085,8 +1007,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-/* feed button */
-
 #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
@@ -1095,6 +1015,66 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 342px, 54px, 324px);
 }
 
+#webrtc-status-button {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+
+#webrtc-status-button:not([disabled="true"]):hover,
+#webrtc-status-button[open="true"] {
+  -moz-image-region: rect(18px, 360px, 36px, 342px);
+}
+
+#webrtc-status-button[disabled="true"] {
+  -moz-image-region: rect(36px, 360px, 54px, 342px);
+}
+
+/* tabview button & menu item */
+
+#tabview-button,
+#menu_tabview {
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+}
+
+#tabview-button {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#tabview-button[groups="0"] {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#tabview-button[groups="1"] {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#tabview-button[groups="2"] {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#tabview-button[groups="3"] {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#menu_tabview {
+  -moz-image-region: rect(1px, 89px, 17px, 73px);
+}
+
+#menu_tabview[groups="0"] {
+  -moz-image-region: rect(1px, 17px, 17px, 1px);
+}
+
+#menu_tabview[groups="1"] {
+  -moz-image-region: rect(1px, 35px, 17px, 19px);
+}
+
+#menu_tabview[groups="2"] {
+  -moz-image-region: rect(1px, 53px, 17px, 37px);
+}
+
+#menu_tabview[groups="3"] {
+  -moz-image-region: rect(1px, 71px, 17px, 55px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
@@ -1261,11 +1241,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   padding: 0;
 }
 
-.urlbar-icon:-moz-system-metric(touch-enabled) {
-  -moz-margin-end: 1px !important;
-  padding: 0 3px !important;
-}
-
 .urlbar-icon:hover {
 }
 
@@ -1882,10 +1857,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
-.tab-close-button:-moz-system-metric(touch-enabled) {
-  transform: scale(1.2);
-}
-
 .tab-close-button:hover,
 .tab-close-button:hover[selected="true"] {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1898,22 +1869,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
-@media (-moz-touch-enabled) {
-  .tabbrowser-arrowscrollbox > .scrollbutton-up,
-  .tabbrowser-arrowscrollbox > .scrollbutton-down,
-  #TabsToolbar .toolbarbutton-1 {
-    min-width: 8.1mozmm;
-  }
-
-  .tabs-newtab-button {
-    min-width: 10mozmm;
-  }
-
-  .tab-content {
-    min-height: calc(6.8mozmm - 7px); /* subtract borders from the desired height */
-  }
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
   margin: 0;
@@ -2293,6 +2248,13 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://mozapps/skin/plugins/notifyPluginBlocked.png");
 }
 
+#notification-popup-box[hidden] {
+  /* Override display:none to make the pluginBlockedNotification animation work
+     when showing the notification repeatedly. */
+  display: -moz-box;
+  visibility: collapse;
+}
+
 #blocked-plugins-notification-icon[showing] {
   animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
 }
@@ -2306,11 +2268,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   }
 }
 
-#webRTC-sharingDevices-notification-icon,
 #webRTC-shareDevices-notification-icon {
   list-style-image: url("chrome://browser/skin/webRTC-shareDevice-16.png");
 }
 
+#webRTC-sharingDevices-notification-icon {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
+}
+
 #identity-popup-container {
   min-width: 280px;
 }
@@ -2865,6 +2830,10 @@ html|*#gcli-output-frame {
   display: none;
 }
 
+#developer-toolbar-toolbox-button > .toolbarbutton-icon {
+  -moz-margin-end: 0;
+}
+
 .developer-toolbar-button {
   min-width: 78px;
   min-height: 21px;
@@ -2905,28 +2874,27 @@ html|*#gcli-output-frame {
   display: none;
 }
 
-#social-toolbar-item > .toolbarbutton-1 {
-}
-
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1 {
-}
-
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1:first-child {
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1,
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .social-notification-container > .toolbarbutton-1 {
+  padding-left: 0;
+  padding-right: 0;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1:last-child {
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item {
+  margin-left: 5px;
+  margin-right: 5px;
 }
 
-.social-notification-icon-hbox {
-  pointer-events: none;
-}
-
-.social-notification-icon-stack > image {
-  max-height: 20px;
+.social-notification-container {
+  /* position:relative on .toolbarbutton-1 does not get position:absolute
+     to work as expected on .toolbarbutton-1 generated content. Placing a
+     simple container outside of .toolbarbutton-1 and setting position:relative
+     on the simple container however will work. */
+  position: relative;
 }
 
-.social-notification-icon-label {
-  text-align: end;
+.social-notification-container > .toolbarbutton-1[badge]:not([badge=""])::after {
+  /* The |content| property is set in the content stylesheet. */
   font-size: 9px;
   font-weight: bold;
   padding: 0 1px;
@@ -2934,14 +2902,18 @@ html|*#gcli-output-frame {
   background-color: #000000;
   border: 1px solid #9C9CFF;
   border-radius: 2px;
+  position: absolute;
+  top: 2px;
+  right: 2px;
 }
 
-.social-notification-icon-label[value=""] {
-  display: none;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > *|* > .social-notification-container > .toolbarbutton-1[badge]:not([badge=""])::after {
+  top: 7px;
 }
 
-.social-notification-icon-image {
-  -moz-image-region: rect(0, 16px, 16px, 0);
+.social-notification-container > .toolbarbutton-1[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 2px;
+  right: auto;
 }
 
 #social-notification-icon-mentions {
@@ -3266,6 +3238,8 @@ chatbox[minimized="true"] {
   background-position: top left;
 }
 
-#main-window[privatebrowsingmode=temporary] #appmenu-button {
+#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon {
   list-style-image: url("chrome://browser/skin/privatebrowsing-light.png");
+  width: 20px;
+  height: 16px;
 }
diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css
index 4dcff7fc..19b2594f 100644
--- a/LCARStrek/browser/downloads/downloads.css
+++ b/LCARStrek/browser/downloads/downloads.css
@@ -334,3 +334,8 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
   background-color: #404048;
 }
+
+toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
+  margin: 0;
+  text-align: center;
+}
diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css
index b690cc1c..58e3a95a 100644
--- a/LCARStrek/browser/searchbar.css
+++ b/LCARStrek/browser/searchbar.css
@@ -70,11 +70,6 @@
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.search-go-button:-moz-system-metric(touch-enabled) {
-  -moz-padding-start: 5px;
-  -moz-padding-end: 3px;
-}
-
 .search-go-button:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
-- 
2.43.0