X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=69a0ceaceb84a91cd4933c04afa3e6a86b556df3;hp=617944a485b3e7d76eae541e9f28ff41cced6940;hb=2b5a514788884f7527ad59c3381c75a71d4dbeea;hpb=8d154261b30ff6943f76d43b4a9cffce302ae776

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 617944a4..69a0ceac 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -17,8 +17,8 @@ toolbar[customizable="true"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-browsercustom");
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme), (-moz-mac-yosemite-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   toolbar[customizable="true"]:not([nowindowdrag="true"]) {
     -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
   }
@@ -74,13 +74,20 @@ menubar {
 /*  margin-top: 15px;*/
 }
 
-@supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+@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. */
   #toolbar-menubar:not([autohide="true"]) {
     -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom");
   }
 }
 
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #main-window[tabsintitlebar]:not([inFullscreen="true"]) #TabsToolbar {
+    padding-left: 60px;
+  }
+}
+
 #main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap {
   /* the titlebar buttons are shown right over the endcap but we have no power over the buttonbox position just for this case, so hide the endcap */
   display: none;
@@ -106,13 +113,12 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-@supports ( not(-moz-appearance: -moz-mac-unified-toolbar) ) {
-  /* this is a usable workaround to detect we're not on Mac OS */
-  /* indent also due to non-applicable aero rule */
-  #toolbar-menubar {
-    background-color: transparent !important;
-  }
+#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
+}
 
+@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. */
   #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme),
   #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
     /* like menubar */
@@ -130,10 +136,6 @@ menubar {
     /*color: inherit;*/
   }
 
-  #TabsToolbar:-moz-lwtheme {
-    /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/
-  }
-
   #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
     visibility: hidden;
   }
@@ -144,14 +146,11 @@ menubar {
   }
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   #titlebar-buttonbox > .titlebar-button {
     display: none;
   }
-  #titlebar-buttonbox {
-    margin-top: 1px;
-  }
 }
 
 #nav-bar {
@@ -192,6 +191,15 @@ menubar {
   margin-top: 4px;
 }
 
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #main-window[sizemode="normal"] > #titlebar,
+  #main-window[sizemode="maximized"] > #titlebar {
+    margin-top: 19px;
+    /* There is a margin-bottom set to -23 by code. */
+  }
+}
+
 /* The button box must appear on top of the navigator-toolbox in order for
  * click and hover mouse events to work properly for the button in the restored
  * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
@@ -248,6 +256,31 @@ menubar {
   list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
 }
 
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
+  #titlebar-fullscreen-button {
+    -moz-appearance: none;
+    list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon.png");
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
+  }
+
+  #titlebar-fullscreen-button:hover {
+    -moz-image-region: rect(0px, 32px, 16px, 16px);
+  }
+
+  @media (min-resolution: 2dppx) {
+    #titlebar-fullscreen-button {
+      list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon@2x.png");
+      -moz-image-region: rect(0px, 32px, 32px, 0px);
+    }
+
+    #titlebar-fullscreen-button:hover {
+      -moz-image-region: rect(0px, 64px, 32px, 32px);
+    }
+  }
+}
+
+
 /* ::::: bookmark buttons ::::: */
 
 toolbarbutton.bookmark-item:not(.subviewbutton),
@@ -2367,7 +2400,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .panel-promo-closebutton > .toolbarbutton-text {
   padding: 0;
-  margin: 0;
 }
 
 /* ::::: content area ::::: */
@@ -2416,13 +2448,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   border-bottom: 1px solid #008484;
 }
 
-#main-window:not([customizing]) #TabsToolbar:not(:-moz-lwtheme) {
-}
-
-#main-window[tabsintitlebar] #TabsToolbar {
-  background-color: transparent;
-}
-
 /* === BEGIN tabs.inc.css === */
 
 .tabbrowser-tab,
@@ -2481,7 +2506,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-.tab-throbber {
+.tab-throbber[busy] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png");
 }
 
@@ -2520,6 +2545,29 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 }
 
+/* Tab Overflow */
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:-moz-locale-dir(rtl),
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:-moz-locale-dir(ltr) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed],
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] {
+}
+
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator,
+.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator {
+}
+
 .tab-background-start[selected=true]::after,
 .tab-background-start[selected=true]::before,
 .tab-background-start,
@@ -2960,8 +3008,14 @@ 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"] {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-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");
+}
+
+.popup-notification-icon[popupid="bad-content"][mixedblockdisabled],
+.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] {
+  list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png);
 }
 
 .popup-notification-icon[popupid="webRTC-sharingDevices"],
@@ -3012,7 +3066,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 
 .notification-anchor-icon:-moz-focusring {
   outline: 1px dotted #008484;
-/*  outline-offset: -3px; */
 }
 
 .default-notification-icon,
@@ -3092,8 +3145,15 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
 }
 
 .mixed-content-blocked-notification-icon,
-#mixed-content-blocked-notification-icon {
-  list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png");
+#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");
+}
+
+.bad-content-unblocked-notification-icon,
+#bad-content-unblocked-notification-icon {
+  list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png);
 }
 
 .webRTC-shareDevices-notification-icon,
@@ -3128,6 +3188,81 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled
   margin: 0px;
 }
 
+/* Translation infobar */
+
+/* === BEGIN infobar.inc.css === */
+
+notification[value="translation"] .messageImage {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+@media (min-resolution: 1.25dppx) {
+  notification[value="translation"] .messageImage {
+    list-style-image: url("chrome://browser/skin/translation-16@2x.png");
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+}
+
+notification[value="translation"][state="translating"] .messageImage {
+  list-style-image: url("chrome://browser/skin/translating-16.png");
+  -moz-image-region: auto;
+}
+
+@media (min-resolution: 1.25dppx) {
+  notification[value="translation"][state="translating"] .messageImage {
+    list-style-image: url("chrome://browser/skin/translating-16@2x.png");
+  }
+}
+
+notification[value="translation"] button,
+notification[value="translation"] menulist {
+  min-width: 0;
+}
+
+notification[value="translation"] menulist > .menulist-dropmarker {
+}
+
+.translation-menupopup arrowscrollbox {
+  padding-bottom: 0;
+}
+
+.translation-attribution {
+  cursor: pointer;
+  -moz-box-align: end;
+  font-size: small;
+}
+
+.translation-attribution > label {
+  margin-bottom: 0;
+}
+
+.translation-attribution > image {
+  width: 70px;
+}
+
+/* === END infobar.inc.css === */
+
+notification[value="translation"] {
+  min-height: 40px;
+}
+
+.translate-notification-icon,
+#translate-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.translated-notification-icon,
+#translated-notification-icon {
+  list-style-image: url("chrome://browser/skin/translation-16.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.translation-menupopup {
+  -moz-appearance: none;
+}
+
 /* Bookmarks roots menu-items */
 #subscribeToPageMenuitem:not([disabled]),
 #subscribeToPageMenupopup,
@@ -3343,6 +3478,13 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   color: #FF9F00;
 }
 
+html|*.highlighter-nodeinfobar-dimensions {
+  color: #A09090;
+  -moz-border-start: 1px solid #9C9CFF;
+  -moz-margin-start: 6px;
+  -moz-padding-start: 6px;
+}
+
 /* Highlighter - Node Infobar - box & arrow */
 
 .highlighter-nodeinfobar-arrow {
@@ -3370,6 +3512,26 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   margin: 7px 0;
 }
 
+/* Css transform highlighter */
+
+svg|polygon.css-transform-transformed {
+  fill: #9C9CFF;
+  opacity: 0.8;
+}
+
+svg|polygon.css-transform-untransformed {
+  fill: #A09090;
+  opacity: 0.8;
+}
+
+svg|polygon.css-transform-transformed,
+svg|polygon.css-transform-untransformed,
+svg|line.css-transform-line {
+  stroke: #E7ADE7;
+  stroke-dasharray: 5 3;
+  stroke-width: 2;
+}
+
 /* === END highlighter.inc.css === */
 
 #full-screen-warning-message {
@@ -3441,6 +3603,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   display: none;
 }
 
+.developer-toolbar-button > .toolbarbutton-icon,
+#developer-toolbar-closebutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 #developer-toolbar-toolbox-button {
   list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -3456,6 +3624,19 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #developer-toolbar-toolbox-button:hover,
+  #developer-toolbar-toolbox-button:hover:active,
+  #developer-toolbar-toolbox-button[checked=true] {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 #developer-toolbar-closebutton {
   list-style-image: url("chrome://browser/skin/devtools/close.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -3475,6 +3656,18 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #developer-toolbar-closebutton {
+    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+    -moz-image-region: rect(0px, 32px, 32px, 0px);
+  }
+
+  #developer-toolbar-closebutton:hover,
+  #developer-toolbar-closebutton:hover:active {
+    -moz-image-region: rect(0px, 64px, 32px, 32px);
+  }
+}
+
 /* GCLI */
 
 html|*#gcli-tooltip-frame,
@@ -3501,19 +3694,38 @@ html|*#gcli-output-frame {
 }
 
 .gclitoolbar-input-node {
-  padding-left: 20px;
 /*  line-height: 32px;
   outline-style: none; */
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 16, 16, 0);
   background-repeat: no-repeat;
   background-color: rgba(0, 0, 0, .75);
 }
 
 .gclitoolbar-input-node[focused="true"] {
-  background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16);
   background-color: #000000;
 }
 
+.gclitoolbar-input-node::before {
+  content: "";
+  display: inline-block;
+  -moz-box-ordinal-group: 0;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  background-image: url("chrome://browser/skin/devtools/commandline-icon.png");
+  background-position: 0 center;
+  background-size: 32px 16px;
+}
+
+.gclitoolbar-input-node[focused="true"]::before {
+  background-position: -16px center;
+}
+
+@media (min-resolution: 2dppx) {
+  .gclitoolbar-input-node::before {
+    background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png");
+  }
+}
+
 .gclitoolbar-input-node:not([focused="true"]) {
   border-color: transparent;
 }
@@ -3570,7 +3782,7 @@ html|*#gcli-output-frame {
 /* Responsive Mode */
 
 .browserContainer[responsivemode] {
-  background: #221500 url("chrome://browser/skin/devtools/responsive-background.png");
+  background-color: #221500;
   padding: 0 20px 20px 20px;
 }
 
@@ -3598,6 +3810,11 @@ html|*#gcli-output-frame {
 /*  margin: 0 3px; */
 }
 
+.devtools-responsiveui-toolbarbutton > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
@@ -3645,7 +3862,7 @@ html|*#gcli-output-frame {
 .devtools-responsiveui-menulist > .menulist-dropmarker {
 /*  display: -moz-box;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
   -moz-box-align: center;
   border-width: 0;
   min-width: 16px;*/
@@ -3669,7 +3886,7 @@ html|*#gcli-output-frame {
 
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+/*  list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;*/
 }
@@ -3697,6 +3914,24 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-close {
+    list-style-image: url("chrome://browser/skin/devtools/close@2x.png");
+  }
+
+  .devtools-responsiveui-close:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+
+  .devtools-responsiveui-rotate {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png");
+  }
+
+  .devtools-responsiveui-rotate:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-touch {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png");
   -moz-image-region: rect(0px,16px,16px,0px);
@@ -3708,6 +3943,19 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-touch {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png");
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  .devtools-responsiveui-touch:hover,
+  .devtools-responsiveui-touch[checked],
+  .devtools-responsiveui-touch[checked]:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-screenshot {
   list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png");
   -moz-image-region: rect(0px,16px,16px,0px);
@@ -3717,11 +3965,22 @@ html|*#gcli-output-frame {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-screenshot {
+    list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png");
+  }
+
+  .devtools-responsiveui-screenshot:hover {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 .devtools-responsiveui-resizebarV {
   width: 7px;
   height: 24px;
   cursor: ew-resize;
   transform: translate(12px, -12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png");
 }
 
@@ -3730,6 +3989,7 @@ html|*#gcli-output-frame {
   height: 7px;
   cursor: ns-resize;
   transform: translate(-12px, 12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png");
 }
 
@@ -3738,9 +3998,24 @@ html|*#gcli-output-frame {
   height: 16px;
   cursor: se-resize;
   transform: translate(12px, 12px);
+  background-size: cover;
   background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png");
 }
 
+@media (min-resolution: 2dppx) {
+  .devtools-responsiveui-resizebarV {
+    background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png");
+  }
+
+  .devtools-responsiveui-resizebarH {
+    background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png");
+  }
+
+  .devtools-responsiveui-resizehandle {
+    background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png");
+  }
+}
+
 /* === END responsivedesign.inc.css === */
 
 /* === including indicator.css is done at the start of the file === */
@@ -4244,6 +4519,27 @@ notification.pluginVulnerable .messageImage {
 
 /* === END plugin-doorhanger.inc.css === */
 
+/* === BEGIN badcontent-doorhanger.inc.css === */
+
+.popup-notification-item-title[popupid="bad-content"] {
+  font-weight: bold;
+}
+
+.popup-notification-item-message[popupid="bad-content"] {
+  width: 17em;
+}
+
+.popup-notification-item-message-critical[popupid="bad-content"] {
+  color: #FF0000;
+  font-style: italic;
+}
+
+.popup-notification-footer[popupid="bad-content"] {
+  padding-top: 1em;
+}
+
+/* === END badcontent-doorhanger.inc.css === */
+
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
@@ -4332,6 +4628,7 @@ notification.pluginVulnerable .messageImage {
 
 #customization-container {
   background-color: #000000;
+  color: #FF9F00;
 }
 
 #customization-palette,
@@ -4359,11 +4656,11 @@ notification.pluginVulnerable .messageImage {
 
 #customization-footer {
   border-top: 1px solid #9C9CFF;
-  padding: 15px;
+  padding: 10px;
 }
 
 .customizationmode-button {
-  margin: 0;
+  margin: 5px;
 }
 
 .customizationmode-button:hover {
@@ -4372,11 +4669,15 @@ notification.pluginVulnerable .messageImage {
 .customizationmode-button[disabled="true"] {
 }
 
+.customizationmode-button > .box-inherit > .box-inherit > .button-icon,
+.customizationmode-button > .button-box > .button-icon {
+/*  height: 24px;*/
+}
+
 #customization-titlebar-visibility-button {
   list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
   padding: 0px 5px;
-  -moz-margin-end: 10px;
 }
 
 #customization-titlebar-visibility-button:hover {
@@ -4398,6 +4699,10 @@ notification.pluginVulnerable .messageImage {
   -moz-margin-start: 5px !important;
 }
 
+#customization-titlebar-visibility-button > .button-box > .button-icon {
+  vertical-align: middle;
+}
+
 #customization-titlebar-visibility-button[checked] {
   -moz-image-region: rect(0, 32px, 16px, 16px);
   background-color: #008484;
@@ -4412,10 +4717,6 @@ notification.pluginVulnerable .messageImage {
   background-color: #FF9F00;
 }
 
-#customization-undo-reset-button {
-  -moz-margin-end: 10px;
-}
-
 #main-window[customize-entered] #customization-panel-container {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-position: left top;
@@ -4616,11 +4917,27 @@ toolbarpaletteitem[place="toolbar"] {
   transform: perspective(0.01px);
 }
 
-#main-window[customize-entered] {
+#main-window[customize-entered] > #tab-view-deck {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-attachment: fixed;
 }
 
+#main-window[customization-lwtheme] > #tab-view-deck:-moz-lwtheme {
+  background-repeat: no-repeat;
+  background-position: right top;
+  background-attachment: fixed;
+  /* The image will get set from CustomizeMode.jsm */
+  background-image: none;
+  background-color: transparent;
+}
+
+#main-window[customization-lwtheme]:-moz-lwtheme {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-repeat: repeat;
+  background-attachment: fixed;
+  background-position: left top;
+}
+
 #main-window[customize-entered] #browser-bottombox,
 #main-window[customize-entered] #customization-container {
   border-left: 1px solid #9C9CFF;
@@ -4867,68 +5184,83 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   -moz-appearance: none;
 }
 
-#context-navigation > #context-back > .menu-iconic-left {
+#context-back > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back"); */
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#context-navigation > #context-back:not([disabled="true"]):hover > .menu-iconic-left {
+#context-back:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-active"); */
   -moz-image-region: rect(18px, 54px, 36px, 36px);
 }
 
-#context-navigation > #context-back[disabled="true"] > .menu-iconic-left {
+#context-back[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-disabled"); */
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-#context-navigation > #context-forward > .menu-iconic-left {
+#context-forward > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward"); */
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#context-navigation > #context-forward:not([disabled="true"]):hover > .menu-iconic-left {
+#context-forward:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-active"); */
   -moz-image-region: rect(18px, 72px, 36px, 54px);
 }
 
-#context-navigation > #context-forward[disabled="true"] > .menu-iconic-left {
+#context-forward[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-disabled"); */
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-#context-navigation > #context-reload > .menu-iconic-left {
+#context-reload > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload"); */
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
   -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
-#context-navigation > #context-reload:not([disabled="true"]):hover > .menu-iconic-left {
+#context-reload:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-active"); */
   -moz-image-region: rect(14px, 14px, 28px, 0);
 }
 
-#context-navigation > #context-reload[disabled="true"] > .menu-iconic-left {
+#context-reload[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-disabled"); */
   -moz-image-region: rect(28px, 14px, 42px, 0);
 }
 
-#context-navigation > #context-stop > .menu-iconic-left {
+#context-stop > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop"); */
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
   -moz-image-region: rect(0, 28px, 14px, 14px);
 }
 
-#context-navigation > #context-stop:not([disabled="true"]):hover > .menu-iconic-left {
+#context-stop:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-active"); */
   -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
-#context-navigation > #context-stop[disabled="true"] > .menu-iconic-left {
+#context-stop[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-disabled"); */
   -moz-image-region: rect(28px, 28px, 42px, 14px);
 }
 
-#context-navigation > #context-bookmarkpage > .menu-iconic-left {
+#context-bookmarkpage > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark"); */
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
-#context-navigation > #context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
+#context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-active"); */
   -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
-#context-navigation > #context-bookmarkpage[disabled="true"] > .menu-iconic-left {
+#context-bookmarkpage[disabled="true"] > .menu-iconic-left {
+  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-disabled"); */
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
@@ -4939,8 +5271,8 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
 }
 
 #context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
-  width: 18px;
-  height: 18px;
+  width: 18px; /*16px;*/
+  height: 18px; /*16px;*/
   margin: 7px;
 }
 
@@ -4952,3 +5284,10 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
 }
 
 /* === END contextmenu.inc.css === */
+
+#context-navigation {
+}
+
+#context-sep-navigation {
+/*  margin-top: -4px; */
+}