X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=761dab91ddacb2f1513686d0422c386cda781a4f;hp=f9c9cbefc2588b7663dd9548ff380df79946f3ad;hb=e28f3f71465fc35bd3c71fae071ff71890271323;hpb=018d70fb86bbc18fee28fcbf5d8a880e0dd9d407

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f9c9cbef..761dab91 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -89,16 +89,16 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
   /* like menubar */
   background-color: #6000CF;
   color: #FF9F00;
 }
-#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: #8050B0;
   color: #FF9F00;
 }
-#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
   padding-top: 3px;
 }
 
@@ -114,6 +114,9 @@ menubar {
 #nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar,
 #nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar {
   /* background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
+  /* Position the toolbar above the bottom of background tabs */
+  position: relative;
+  z-index: 1;
 }
 
 #personal-bookmarks {
@@ -126,6 +129,16 @@ menubar {
 
 /* ::::: app menu button ::::: */
 
+/* The app menu button 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 can swallow these events. It will also place the button above the
+ * fog on themes with Aero Glass.
+ */
+#main-window[tabsintitlebar] #appmenu-button-container {
+  z-index: 1;
+}
+
 #appmenu-button {
   background-color: #FF9F00;
   background-clip: padding-box;
@@ -599,6 +612,12 @@ menuitem.bookmark-item {
   -moz-image-region: rect(18px, 144px, 36px, 126px);
 }
 
+/* When "new tab" page shows up, the menubutton-button (star button) is disabled */
+#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled="true"] {
+  -moz-image-region: rect(36px, 144px, 54px, 126px) !important;
+  background-color: transparent !important;
+}
+
 #navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred] {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
@@ -942,13 +961,11 @@ menuitem.bookmark-item {
 }
 
 #downloads-button[cui-areatype="menu-panel"],
-#downloads-indicator[cui-areatype="menu-panel"],
 :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button {
   -moz-image-region: rect(0px, 256px, 32px, 224px);
 }
 
 #downloads-button[cui-areatype="menu-panel"]:hover,
-#downloads-indicator[cui-areatype="menu-panel"]:hover,
 :-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button:hover {
   -moz-image-region: rect(32px, 256px, 64px, 224px);
 }
@@ -2495,6 +2512,13 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   max-height: 16px;
 }
 
+toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
+  width: auto;
+  height: auto;
+  max-width: 32px;
+  max-height: 24px;
+}
+
 /* fixup corners for share panel */
 .social-panel > .social-panel-frame {
   border-radius: inherit;
@@ -2694,12 +2718,15 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border-bottom: 1px solid #008484;
 }
 
+/* === BEGIN tabs.inc.css === */
+
 .tabbrowser-tab,
-.tabs-newtab-button {
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
   margin-top: 0px;
 }
 
-.tabbrowser-tab{
+.tabbrowser-tab {
   padding: 1px 4px 2px;
 }
 
@@ -2707,12 +2734,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-margin-start: 2px;
 }
 
-.tabs-newtab-button {
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button {
   border-radius: 8px 8px 0px 0px;
   -moz-margin-start: 0;
 }
 
-.tabs-newtab-button:not(:hover) {
+.tabs-newtab-button:not(:hover),
+#TabsToolbar > #new-tab-button:not(:hover) {
   background-color: #C09070;
 }
 
@@ -2720,45 +2749,34 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   text-decoration: underline;
 }
 
-.tabbrowser-tab:hover,
-.tabs-newtab-button:hover {
-}
+/* Selected tab */
 
 .tabbrowser-tab[selected="true"] {
 }
 
-#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-}
+/* End selected tab */
 
-.tabbrowser-tab:-moz-lwtheme {
-}
+/* Pinned tabs */
 
-.tabbrowser-tab[selected="true"]:-moz-lwtheme {
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
+  background-color: #E7ADE7;
 }
-
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-brighttext {
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
+  background-color: #3333FF;
+  color: #000000;
 }
 
-.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
-}
+/* New tab button */
 
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
-.tabs-newtab-button:-moz-lwtheme-darktext {
+.tabs-newtab-button {
+  width: 28px;
 }
 
-.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
-.tabs-newtab-button:-moz-lwtheme-darktext:hover {
+#TabsToolbar > #new-tab-button {
+  width: 26px;
 }
 
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-  background-color: #E7ADE7;
-}
-.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-color: #3333FF;
-  color: #000000;
-}
+/* === END tabs.inc.css === */
 
 .tab-throbber,
 .tab-icon-image {
@@ -2837,16 +2855,11 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
-.tabs-newtab-button {
-  width: 28px;
-}
-
-#TabsToolbar > #new-tab-button {
-  width: 26px;
-}
-
+/* Remove |#navigator-toolbox:not([iconsize])| selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */
 .tabs-newtab-button,
 .tabs-newtab-button:hover,
+#navigator-toolbox:not([iconsize]) #TabsToolbar > #new-tab-button,
+#navigator-toolbox:not([iconsize]) #TabsToolbar > #new-tab-button:hover,
 #TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
@@ -3029,6 +3042,24 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/Secure24.png");
 }
 
+#identity-popup-help-icon {
+  border: none;
+  margin: 7px 0 0 -3px;
+  background: none;
+  min-width: 0;
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+  cursor: pointer;
+}
+
+#identity-popup-help-icon > .button-box > .button-text {
+  display: none;
+}
+
+#identity-popup-help-icon > .button-box > .button-icon {
+  height: 16px;
+  width: 16px;
+}
+
 #identity-popup-more-info-button {
   margin-top: 6px;
   margin-bottom: 0;
@@ -3455,11 +3486,13 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent !important;
 }
 
+/* === BEGIN highlighter.inc.css === */
+
 /* Highlighter */
 
 .highlighter-outline {
   box-shadow: 0 0 0 1px black;
-  outline: 1px dashed white;
+  outline: 1px dashed #A09090;
 }
 
 .highlighter-outline[locked]  {
@@ -3471,10 +3504,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 .highlighter-nodeinfobar {
   color: #FF9F00;
-  border: 1px solid rgba(156, 156, 255, .5);
   border-radius: 3px;
   background-color: #000000;
   background-clip: padding-box;
+  border: 1px solid #008484;
+  padding: 5px;
+  /* Avoid cases where the infobar is smaller than the arrow, when the text is
+  short */
+  min-width: 75px;
 }
 
 /* Highlighter - Node Infobar - text */
@@ -3512,9 +3549,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   -moz-margin-end: 2px;
 }
 
-.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
-}
-
 .highlighter-nodeinfobar-inspectbutton:hover,
 .highlighter-nodeinfobar-inspectbutton:hover:active/*,
 .highlighter-nodeinfobar-container:not([locked]) >  .highlighter-nodeinfobar >  .highlighter-nodeinfobar-inspectbutton*/ {
@@ -3524,9 +3558,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 .highlighter-nodeinfobar-menu {
 }
 
-.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
-}
-
 .highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-box-align: center;
   -moz-margin-start: -1px;
@@ -3539,7 +3570,6 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   height: 14px;
   -moz-margin-start: calc(50% - 7px);
   transform: rotate(-45deg);
-  border: 1px solid transparent;
   background-clip: padding-box;
   background-repeat: no-repeat;
 }
@@ -3547,28 +3577,21 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
 .highlighter-nodeinfobar-arrow-top {
   margin-bottom: -8px;
   margin-top: 8px;
-  border-right-color: rgba(0, 132, 132, .5);
-  border-top-color: rgba(0, 132, 132, .5);
   background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
 .highlighter-nodeinfobar-arrow-bottom {
   margin-top: -8px;
   margin-bottom: 8px;
-  border-left-color: rgba(0, 132, 132, .5);
-  border-bottom-color: rgba(0, 132, 132, .5);
   background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
-.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar,
-.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar {
-  box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
-}
-
 .highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
+/* === END highlighter.inc.css === */
+
 #full-screen-warning-message {
   background-color: #000000;
   color: #FF9F00;
@@ -3624,7 +3647,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
   min-height: 32px; */
 }
 
-.developer-toolbar-button {
+#developer-toolbar > toolbarbutton {
 /*  margin: 0;
   padding: 0 10px;
   width: 32px; */
@@ -3653,6 +3676,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,
@@ -3683,10 +3725,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"]) {
@@ -3755,16 +3800,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,
@@ -4260,7 +4387,17 @@ window > chatbox {
   margin: 0;
 }
 
-/* Customization mode */
+.messageImage[value="plugin-hidden"] {
+  list-style-image: url("chrome://browser/skin/notification-pluginNormal.png");
+}
+
+/* Keep any changes to this style in sync with pluginProblem.css */
+notification.pluginVulnerable {
+}
+
+notification.pluginVulnerable .messageImage {
+  list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png");
+}
 
 /* === END plugin-doorhanger.inc.css === */
 
@@ -4283,17 +4420,69 @@ window > chatbox {
 /* === BEGIN customizeMode.inc.css === */
 
 /* Customization mode */
-#nav-bar[customize-entered] > #nav-bar-customization-target {
-  margin: 1px 3px;
+
+#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck {
+  margin: 0 1em 1em;
 }
 
-#nav-bar[customize-entered] > #nav-bar-customization-target,
+#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox {
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+#main-window:-moz-any([customize-entering],[customize-exiting]) #tab-view-deck {
+  pointer-events: none;
+}
+
+#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;
 }
 
@@ -4302,7 +4491,7 @@ window > chatbox {
   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;
@@ -4312,8 +4501,9 @@ window > chatbox {
   background-color: #000000;
 }
 
-#customization-palette-container {
-  padding: 25px;
+#customization-palette,
+#customization-empty {
+  padding: 0 15px 15px;
 }
 
 #customization-header {
@@ -4322,10 +4512,51 @@ window > chatbox {
   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;
@@ -4333,10 +4564,8 @@ window > chatbox {
   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] {
@@ -4348,23 +4577,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);
 }
 
@@ -4380,44 +4623,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 {
@@ -4428,6 +4669,82 @@ toolbarpaletteitem[place="toolbar"] {
 
 /* === END customizeMode.inc.css === */
 
+/* === 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;
+}
+
+#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[customizing] {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png");
   background-attachment: fixed;
@@ -4443,8 +4760,6 @@ toolbarpaletteitem[place="toolbar"] {
   background-clip: padding-box;
 }
 
-/* End customization mode */
-
 #main-window[privatebrowsingmode=temporary] #TabsToolbar::after {
   content: "";
   display: -moz-box;
@@ -4461,6 +4776,13 @@ html|div#UITourHighlight {
   border: 2px #9C9CFF solid;
   min-height: 32px;
   min-width: 32px;
+  /* HACK for pre-Australis */
+  display: none;
+}
+
+html|div#UITourHighlight[active] {
+  /* HACK for pre-Australis */
+  display: none;
 }
 
 #UITourTooltip {