Bug 1255989 - Bookmarks toolbar items should inherit -moz-window-dragging from the parent toolbar. r=gijs
authorDão Gottwald <dao@mozilla.com>
Wed, 29 Jun 2016 12:39:03 +0200
changeset 302908 abdc1a4e708067a5c1a3609fa21e505eb8c8fce3
parent 302907 352e0c835e682e0d59cd174041585a1b7736d3cf
child 302909 3fa6d81f720a687d5b593e0f8d4eaed887724755
push id19805
push userdgottwald@mozilla.com
push dateWed, 29 Jun 2016 10:39:28 +0000
treeherderfx-team@abdc1a4e7080 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs
bugs1255989
milestone50.0a1
Bug 1255989 - Bookmarks toolbar items should inherit -moz-window-dragging from the parent toolbar. r=gijs
browser/base/content/browser.css
browser/themes/windows/devedition.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -238,16 +238,20 @@ toolbar[customizing] > .overflow-button 
 #main-window[tabsintitlebar] #titlebar-buttonbox {
   position: relative;
 }
 
 #titlebar-buttonbox {
   -moz-appearance: -moz-window-button-box;
 }
 
+#personal-bookmarks {
+  -moz-window-dragging: inherit;
+}
+
 %ifdef XP_MACOSX
 #titlebar-fullscreen-button {
   -moz-appearance: -moz-mac-fullscreen-button;
 }
 
 /* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */
 #titlebar-secondary-buttonbox:-moz-locale-dir(ltr),
 #titlebar-buttonbox-container:-moz-locale-dir(rtl),
@@ -281,18 +285,18 @@ toolbar[customizing] > .overflow-button 
 }
 
 #main-window[tabletmode] #titlebar-min,
 #main-window[tabletmode] #titlebar-max {
   display: none !important;
 }
 
 #main-window[tabsintitlebar] #TabsToolbar,
-#main-window[tabsintitlebar] #toolbar-menubar:not([autohide=true]),
-#main-window[tabsintitlebar] #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme {
+#main-window[tabsintitlebar] #toolbar-menubar,
+#main-window[tabsintitlebar] #navigator-toolbox > toolbar:-moz-lwtheme {
   -moz-window-dragging: drag;
 }
 %endif
 
 %endif
 
 #main-window[inFullscreen][inDOMFullscreen] #navigator-toolbox,
 #main-window[inFullscreen][inDOMFullscreen] #fullscr-toggler,
@@ -355,26 +359,16 @@ toolbarpaletteitem > #personal-bookmarks
 }
 
 #nav-bar-customization-target > #personal-bookmarks,
 toolbar:not(#TabsToolbar) > #wrapper-personal-bookmarks,
 toolbar:not(#TabsToolbar) > #personal-bookmarks {
   -moz-box-flex: 1;
 }
 
-/* Ensure that empty parts of the bookmarks container can be dragged on OSX, and on other OSes
- * only when a lwtheme is in use. */
-%ifdef XP_MACOSX
-#main-window[tabsintitlebar]:not([customizing]) #personal-bookmarks {
-%else
-#main-window[tabsintitlebar]:not([customizing]) #personal-bookmarks:-moz-lwtheme {
-%endif
-  -moz-window-dragging: drag;
-}
-
 #zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button > .toolbarbutton-text {
   display: -moz-box;
 }
 
 #urlbar-reload-button:not([displaystop]) + #urlbar-stop-button,
 #urlbar-reload-button[displaystop] {
   visibility: collapse;
 }
--- a/browser/themes/windows/devedition.css
+++ b/browser/themes/windows/devedition.css
@@ -256,18 +256,17 @@
 #navigator-toolbox {
   /* The side borders on the toolbox also look out-of-place because we don't paint over
    * the native background color at all, and these are !important for the same reason as above. */
   border-left: none !important;
   border-right: none !important;
 }
 
 /* Disable dragging like in the default theme: */
-#main-window[tabsintitlebar] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):-moz-lwtheme,
-#main-window[tabsintitlebar]:not([customizing]) #personal-bookmarks:-moz-lwtheme {
+#main-window[tabsintitlebar] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):-moz-lwtheme {
   -moz-window-dragging: no-drag;
 }
 
 /* The sidebar header has no background now that the background of the #browser-panel
  * has no image and is transparent. Fix: */
 .sidebar-header:-moz-lwtheme,
 #sidebar-header {
   background-color: var(--chrome-background-color);