X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=53561361aab28c429425534f7e8277cc8bd6c21e;hp=6e02f342a2f19632a8e9e2aeec39a020ee18a468;hb=a98338ac8a1bfe6a848d620d13720fb991319df4;hpb=6dc70335b2a0bf287f39b81011cb275c8158622c

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 6e02f342..53561361 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -49,11 +49,17 @@ menubar {
   background-color: #9C9CFF;
 }
 
+/* Hides the titlebar-placeholder underneath the window caption buttons when we
+   are not autohiding the menubar. */
+#toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-placeholder[type="caption-buttons"] {
+  display: none;
+}
+
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
    toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
    of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
-#toolbar-menubar:not([autohide="true"]) ~ #TabsToolbar,
-#toolbar-menubar[autohide="true"]:not([inactive]) ~ #TabsToolbar {
+#toolbar-menubar:not([moz-collapsed=true]):not([autohide="true"]) ~ #TabsToolbar,
+#toolbar-menubar:not([moz-collapsed=true])[autohide="true"]:not([inactive]) ~ #TabsToolbar {
 /*  margin-top: 3px;*/
 }
 
@@ -72,6 +78,13 @@ menubar {
   display: none;
 }
 
+#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[customizing-dragovertarget].customization-target::before,
+#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #TabsToolbar[customizing-dragovertarget].customization-target::before,
+#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #toolbar-menubar.customization-target:hover::before,
+#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #TabsToolbar.customization-target:hover::before {
+  outline-color: #A09090;
+}
+
 #navigator-toolbox {
 }
 
@@ -462,12 +475,60 @@ menubar {
   background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center;
 }
 
-.bookmarks-toolbar-customize,
 #bookmarks-toolbar-placeholder {
-  max-width: 15em !important;
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
 
+toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder,
+#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder {
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important;
+}
+
+/* ----- BOOKMARK STAR ANIMATION ----- */
+
+@keyframes animation-bookmarkAdded {
+  from { transform: rotate(0deg) translateX(-16px) rotate(0deg) scale(1); opacity: 0; }
+  60%  { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(2.2); opacity: 1; }
+  80%  { opacity: 1; }
+  to   { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(1); opacity: 0; }
+}
+
+@keyframes animation-bookmarkPulse {
+  from { transform: scale(1); }
+  50%  { transform: scale(1.3); }
+  to   { transform: scale(1); }
+}
+
+#bookmarked-notification-container {
+  min-height: 1px;
+  min-width: 1px;
+  height: 1px;
+  margin-bottom: -1px;
+  z-index: 5;
+  position: relative;
+}
+
+#bookmarked-notification {
+  background-size: 16px;
+  background-position: center;
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 16px;
+  opacity: 0;
+}
+
+#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification {
+  background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png");
+  animation: animation-bookmarkAdded 800ms;
+  animation-timing-function: ease, ease, ease;
+}
+
+#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  animation: animation-bookmarkPulse 300ms;
+  animation-delay: 600ms;
+  animation-timing-function: ease-out;
+}
+
 /* ::::: bookmark menus ::::: */
 
 menu.bookmark-item,
@@ -476,7 +537,7 @@ menuitem.bookmark-item {
   max-width: 32em;
 }
 
-.bookmark-item > .menu-iconic-left {
+.bookmark-item:not(.subviewbutton) > .menu-iconic-left {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -1242,7 +1303,8 @@ menuitem.bookmark-item {
 
 /* === END menupanel.inc.css === */
 
-.toolbarbutton-1 {
+/* the selector makes it only apply pre-Australis as iconsize and palette-box or addon-bar don't exist afterwards */
+:-moz-any(#palette-box, #navigator-toolbox[iconsize], #addon-bar) .toolbarbutton-1 {
   list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
 
@@ -1276,6 +1338,16 @@ menuitem.bookmark-item {
   -moz-padding-end: 1px;
 }
 
+/* Help SDK icons fit: */
+toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+  width: 16px;
+}
+
+#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
+  /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */
+  width: 32px;
+}
+
 /* ::::: small primary toolbar buttons ::::: */
 
 #nav-bar {
@@ -2053,6 +2125,9 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   -moz-margin-start: 0;
 }
 
+#urlbar-display-box {
+}
+
 #urlbar-display {
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
@@ -2073,6 +2148,16 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   font-size: .9em;
 }
 
+#identity-box:-moz-locale-dir(ltr) {
+/*  border-top-left-radius: 1.5px;
+  border-bottom-left-radius: 1.5px;*/
+}
+
+#identity-box:-moz-locale-dir(rtl) {
+/*  border-top-right-radius: 1.5px;
+  border-bottom-right-radius: 1.5px;*/
+}
+
 #notification-popup-box:not([hidden]) + #identity-box {
   -moz-padding-start: 10px !important;
   border-radius: 0;
@@ -2701,14 +2786,20 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 /* Tabstrip */
 
-/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
-#navigator-toolbox:not([iconsize]) > #TabsToolbar,
-#TabsToolbar {
+/* Remove selector when Australis lands - this makes it only apply pre-Australis as iconsize only exists there */
+#navigator-toolbox[iconsize] > #TabsToolbar {
   min-height: 0;
   padding: 0;
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
 }
 
+/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
+#navigator-toolbox:not([iconsize]) > #TabsToolbar {
+  min-height: 0;
+  padding: 0;
+  -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar");
+}
+
 #TabsToolbar .toolbar-holder {
   background-color: #000000; /* correct effect of being an actual toolbar */
 }
@@ -2850,7 +2941,8 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .tabs-newtab-button,
 #TabsToolbar > #new-tab-button,
-#TabsToolbar > toolbarpaletteitem > #new-tab-button {
+#TabsToolbar > toolbarpaletteitem > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] {
   list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png");
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
@@ -3647,7 +3739,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   min-height: 32px; */
 }
 
-.developer-toolbar-button {
+#developer-toolbar > toolbarbutton {
 /*  margin: 0;
   padding: 0 10px;
   width: 32px; */
@@ -3676,6 +3768,25 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
+#developer-toolbar-closebutton {
+  list-style-image: url("chrome://browser/skin/devtools/close.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  min-width: 16px;
+  width: 16px;
+}
+
+#developer-toolbar-closebutton > .toolbarbutton-icon {
+}
+
+#developer-toolbar-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
+#developer-toolbar-closebutton:hover,
+#developer-toolbar-closebutton:hover:active {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
 /* GCLI */
 
 html|*#gcli-tooltip-frame,
@@ -3706,10 +3817,13 @@ html|*#gcli-output-frame {
 /*  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:not([focused="true"]) {
@@ -3778,16 +3892,98 @@ html|*#gcli-output-frame {
 
 .devtools-responsiveui-toolbar {
   background: transparent;
+  /* text color is textColor from dark theme, since no theme is applied to
+   * the responsive toolbar.
+   */
+  color: #FF9F00;
   margin: 10px 0;
   padding: 0;
   box-shadow: none;
   border-bottom-width: 0;
 }
 
-.devtools-responsiveui-toolbar > menulist,
-.devtools-responsiveui-toolbar > toolbarbutton {
-  min-width: 22px;
-/*  border-radius: 0; */
+.devtools-responsiveui-menulist,
+.devtools-responsiveui-toolbarbutton {
+  -moz-box-align: center;
+  min-width: 32px;
+/*  min-height: 22px;*/
+/*  margin: 0 3px; */
+}
+
+.devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
+.devtools-responsiveui-menulist:-moz-focusring,
+.devtools-responsiveui-toolbarbutton:-moz-focusring {
+/*  outline: 1px dotted hsla(210,30%,85%,0.7);
+  outline-offset: -4px;*/
+}
+
+.devtools-responsiveui-toolbarbutton:not([label]) > .toolbarbutton-text {
+  display: none;
+}
+
+.devtools-responsiveui-toolbarbutton:not([checked=true]):hover:active {
+/*  border-color: hsla(210,8%,5%,.6);
+  background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3));
+  box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15); */
+}
+
+.devtools-responsiveui-menulist[open=true],
+.devtools-responsiveui-toolbarbutton[open=true],
+.devtools-responsiveui-toolbarbutton[checked=true] {
+/*  border-color: hsla(210,8%,5%,.6) !important;
+  background: linear-gradient(hsla(220,6%,10%,.6), hsla(210,11%,18%,.45) 75%, hsla(210,11%,30%,.4));
+  box-shadow: 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15); */
+}
+
+.devtools-responsiveui-toolbarbutton[checked=true] {
+/*  color: hsl(208,100%,60%); */
+}
+
+.devtools-responsiveui-toolbarbutton[checked=true]:hover {
+/*  background-color: transparent !important;*/
+}
+
+.devtools-responsiveui-toolbarbutton[checked=true]:hover:active {
+/*  background-color: hsla(210,8%,5%,.2) !important;*/
+}
+
+.devtools-responsiveui-menulist > .menulist-label-box {
+  text-align: center;
+}
+
+.devtools-responsiveui-menulist > .menulist-dropmarker {
+/*  display: -moz-box;
+  background-color: transparent;
+  list-style-image: url("chrome://browser/skin/devtools/dropmarker.png");
+  -moz-box-align: center;
+  border-width: 0;
+  min-width: 16px;*/
+}
+
+.devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+/*  color: inherit;
+  border-width: 0;
+  -moz-border-end: 1px solid hsla(210,8%,5%,.45);
+  box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);*/
+}
+
+.devtools-responsiveui-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
+/*  box-shadow: 1px 0 0 hsla(210,16%,76%,.15) inset, -1px 0 0 hsla(210,16%,76%,.15);*/
+}
+
+.devtools-responsiveui-toolbarbutton[type=menu-button] {
+/*  padding: 0 1px;*/
+  -moz-box-align: stretch;
+}
+
+.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");
+  -moz-box-align: center;
+  padding: 0 3px;*/
 }
 
 .devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child,
@@ -4297,36 +4493,72 @@ notification.pluginVulnerable .messageImage {
 
 /* === END plugin-doorhanger.inc.css === */
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
-  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
-  background-position: top right;
-  background-repeat: no-repeat;
-}
+/* === BEGIN customizeMode.inc.css === */
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
-  background-position: top left;
-}
+/* Customization mode */
 
-#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;
+#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck {
+  margin: 0 1em 1em;
 }
 
-/* === BEGIN customizeMode.inc.css === */
+#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox {
+  margin-left: 1em;
+  margin-right: 1em;
+}
 
-/* Customization mode */
-#nav-bar[customize-entered] > #nav-bar-customization-target {
-  margin: 1px 3px;
+#main-window:-moz-any([customize-entering],[customize-exiting]) #tab-view-deck {
+  pointer-events: none;
 }
 
-#nav-bar[customize-entered] > #nav-bar-customization-target,
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before,
 #PanelUI-contents > .panel-customization-placeholder {
+  -moz-outline-radius: 2.5px;
   outline: 1px dashed transparent;
 }
 
-#main-window[customizing-movingItem] #nav-bar-customization-target,
-#main-window[customizing-movingItem] .panel-customization-placeholder {
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before {
+  /* Prevent jumping of tabs when switching a window between inactive and active (bug 853415). */
+  -moz-box-ordinal-group: 0;
+  content: "";
+  display: -moz-box;
+  height: 100%;
+  left: 0;
+  outline-offset: -2px;
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+/* Shift the TabsToolbar outline up 2px since the #nav-bar is shifted up by 1px and the
+   #TabsToolbar::after is a pixel higher to draw the bottom border of the tabstrip so this makes the
+   offset from the bottom effectively the same as other targets (-2px). */
+#main-window[customize-entered] #TabsToolbar.customization-target::before {
+/*  top: -2px;*/
+}
+
+/* The parents of the outline pseudo-elements need to be positioned so that the outline is positioned relative to it. */
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)):hover,
+#main-window[customize-entered] .customization-target[customizing-dragovertarget]:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)),
+#main-window[customize-entered] #nav-bar-customization-target.customization-target {
+  position: relative;
+}
+
+/* Most target outlines are shown on hover and drag over but the panel menu uses
+   placeholders instead. */
+#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)):hover::before,
+#main-window[customize-entered] .customization-target[customizing-dragovertarget]:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before,
+/* nav-bar and panel outlines are always shown */
+#nav-bar[showoutline=true] > #nav-bar-customization-target.customization-target::before {
+  outline-color: #A09090;
+}
+
+#nav-bar[showoutline=true] > #nav-bar-customization-target.customization-target::before {
+  transition: outline-color 250ms linear;
+}
+
+#PanelUI-contents[showoutline=true] > .panel-customization-placeholder {
+  transition: outline-color 250ms linear;
   outline-color: #9C9CFF;
 }
 
@@ -4335,18 +4567,23 @@ notification.pluginVulnerable .messageImage {
   outline-offset: -5px;
 }
 
-#main-window[customize-entered] .customization-target {
+#main-window[customizing] .customization-target:not(#PanelUI-contents) {
   min-width: 100px;
-  padding-left: 10px;
-  padding-right: 10px;
+/*  padding-left: 10px;
+  padding-right: 10px;*/
+}
+
+#main-window:-moz-any([customize-entering],[customize-entered]) #tab-view-deck {
+  padding: 0 2em 2em;
 }
 
 #customization-container {
   background-color: #000000;
 }
 
-#customization-palette-container {
-  padding: 25px;
+#customization-palette,
+#customization-empty {
+  padding: 0 15px 15px;
 }
 
 #customization-header {
@@ -4355,10 +4592,51 @@ notification.pluginVulnerable .messageImage {
   color: #9C9CFF;
   font-weight: lighter;
   margin-bottom: 1em;
+  padding: 15px 15px 0;
 }
 
 #customization-panel-container {
-  padding: 15px 25px 25px;
+  padding: 10px 10px 0px;
+}
+
+#customization-footer {
+  /*background-color: rgb(236,236,236);*/
+  border-top: 1px solid #9C9CFF;
+  padding: 15px;
+}
+
+.customizationmode-button {
+  margin: 0;
+}
+
+.customizationmode-button:hover {
+}
+
+.customizationmode-button[disabled="true"] {
+}
+
+#customization-titlebar-visibility-button {
+  list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
+  -moz-image-region: rect(0, 24px, 24px, 0);
+  padding: 2px 7px;
+  -moz-margin-end: 10px;
+}
+
+#customization-titlebar-visibility-button > .button-box > .button-text {
+  /* Sadly, button.css thinks its margins are perfect for everyone. */
+  -moz-margin-start: 6px !important;
+}
+
+#customization-titlebar-visibility-button[checked] {
+  -moz-image-region: rect(0, 48px, 24px, 24px);
+  background-color: #008484;
+}
+
+#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;
   background-repeat: repeat;
@@ -4366,10 +4644,8 @@ notification.pluginVulnerable .messageImage {
   background-attachment: fixed;
 }
 
-toolbarpaletteitem {
-  transition: background-color, border-color, box-shadow, border-width;
-  transition-duration: 10ms, 10ms, 10ms, 250ms;
-  transition-timing-function: linear, linear, linear, ease-in-out;
+toolbarpaletteitem[place="toolbar"] {
+  transition: border-width 250ms ease-in-out;
 }
 
 toolbarpaletteitem[mousedown] {
@@ -4381,23 +4657,37 @@ toolbarpaletteitem[mousedown] {
 .panel-customization-placeholder,
 toolbarpaletteitem[place="palette"],
 toolbarpaletteitem[place="panel"] {
-  transition: background-color, border-color, box-shadow, transform;
-  transition-duration: 10ms, 10ms, 10ms, 250ms;
-  transition-timing-function: linear, linear, linear, ease-in-out;
+  transition: transform .3s ease-in-out;
+}
+
+#customization-palette {
+  transition: opacity .3s ease-in-out;
+  opacity: 0;
 }
 
+#customization-palette[showing="true"] {
+  opacity: 1;
+}
+
+toolbarpaletteitem[notransition].panel-customization-placeholder,
+toolbarpaletteitem[notransition][place="toolbar"],
 toolbarpaletteitem[notransition][place="palette"],
 toolbarpaletteitem[notransition][place="panel"] {
-  transition: background-color, border-color, box-shadow;
-  transition-duration: 10ms, 10ms, 10ms;
-  transition-timing-function: linear, linear, linear;
+  transition: none;
 }
 
-toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon {
-  transition: transform 50ms ease-in-out;
+toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
+toolbarpaletteitem > toolbaritem.panel-wide-item,
+toolbarpaletteitem > toolbarbutton[type="menu-button"] {
+  transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important;
 }
 
 toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon {
+  transform: scale(1.3);
+}
+
+toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item,
+toolbarpaletteitem[mousedown] > toolbarbutton[type="menu-button"] {
   transform: scale(1.1);
 }
 
@@ -4413,44 +4703,42 @@ toolbarpaletteitem[place="toolbar"] {
   margin-bottom: 25px;
 }
 
-/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
-#customization-palette > #wrapper-edit-controls,
-:-moz-any(#customization-palette, #panelUI-contents) > #customization-palette > #wrapper-zoom-controls {
-  width: 225px;
-}
-
-#wrapper-edit-controls[place="palette"] > .toolbarpaletteitem-box,
-#wrapper-zoom-controls[place="palette"] > .toolbarpaletteitem-box {
-  width: 225px;
-  max-width: 225px;
-}
-
 #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
 #wrapper-edit-controls[place="palette"] > #edit-controls > separator,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > separator {
-  margin-top: 24px;
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > separator {
+  margin-top: 20px;
 }
 
+/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */
 #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton,
 :-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton {
   margin-left: 0;
   margin-right: 0;
-  max-width: 70px;
-  min-width: 70px;
+  max-width: 24px;
+  min-width: 24px;
   max-height: 24px;
   height: 24px;
+  padding: 4px;
 }
 
-#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-text,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button > .toolbarbutton-text {
-  display: inline;
+#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon,
+#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon {
+  width: 16px;
 }
 
-#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon,
-:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon {
-  margin: 0;
-  -moz-margin-start: 5px;
+#wrapper-edit-controls > #edit-controls > toolbarbutton > .toolbarbutton-icon {
+  opacity: 1; /* To ensure these buttons always look enabled in customize mode */
+}
+
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button,
+:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator {
+  display: none;
+}
+
+#wrapper-personal-bookmarks:not([place="toolbar"]) > #personal-bookmarks {
+  -moz-box-pack: center;
+  min-height: 48px;
 }
 
 #customization-palette > toolbarpaletteitem > label {
@@ -4461,13 +4749,85 @@ toolbarpaletteitem[place="toolbar"] {
 
 /* === END customizeMode.inc.css === */
 
-#main-window[customizing] {
-  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
-  background-attachment: fixed;
+/* === BEGIN customizeTip.inc.css === */
+
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
+  margin: 0;
+  min-width: 400px;
+  max-width: 1000px;
+  min-height: 200px;
+  border-radius: 3px;
+/*  background-image: linear-gradient(90deg, #a0dfff 0%, #ceeeff 100%);*/
+  border: 1px solid #9C9CFF;
 }
 
-#main-window:-moz-any([customize-entering],[customize-entered]) #tab-view-deck {
-  padding: 0 2em 2em;
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent:-moz-locale-dir(rtl) {
+/*  background-image: linear-gradient(90deg, #ceeeff 0%, #a0dfff 100%);*/
+}
+
+.customization-tipPanel-infoBox {
+  margin: 20px 25px 25px;
+  width: 25px;
+  background-image: url("chrome://browser/skin/customizableui/info-icon-customizeTip.png");
+  background-repeat: no-repeat;
+}
+
+.customization-tipPanel-content {
+  margin: 25px 0;
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.customization-tipPanel-em {
+  margin: 0;
+  font-weight: bold;
+}
+
+.customization-tipPanel-contentImage {
+  margin-top: 25px;
+  list-style-image: url("chrome://browser/skin/customizableui/customize-illustration.png");
+  min-width: 300px;
+  max-width: 300px;
+  min-height: 190px;
+  max-height: 190px;
+  display: -moz-box;
+}
+
+.customization-tipPanel-contentImage:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/customizableui/customize-illustration-rtl.png");
+}
+
+.customization-tipPanel-link {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  color: #3333FF;
+  margin: 0;
+  cursor: pointer;
+}
+
+.customization-tipPanel-link > .button-box > .button-text {
+  margin: 0 !important;
+}
+
+.customization-tipPanel-closeBox > .close-icon {
+  -moz-appearance: none;
+  border: 0;
+  -moz-margin-end: -25px;
+}
+
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"],
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
+  list-style-image: url("chrome://browser/skin/customizableui/panelarrow-customizeTip.png");
+}
+
+/* === END customizeTip.inc.css === */
+
+#main-window[customize-entered] {
+  background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
+  background-attachment: fixed;
 }
 
 #customization-container {
@@ -4476,6 +4836,32 @@ toolbarpaletteitem[place="toolbar"] {
   background-clip: padding-box;
 }
 
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"] {
+  margin-right: -2px;
+}
+
+#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] {
+  margin-left: -2px;
+}
+
+/* End customization mode */
+
+#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
+  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
+  background-position: top right;
+  background-repeat: no-repeat;
+}
+
+#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
+  background-position: top left;
+}
+
+#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;
+}
+
 #main-window[privatebrowsingmode=temporary] #TabsToolbar::after {
   content: "";
   display: -moz-box;