From 43371c9bdc1b48679019293c73e4caf07ed0095c Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 6 Jul 2014 19:54:10 +0200 Subject: [PATCH] fifth part of syncing LCARStrek with Firefox 30 windows theme changes --- LCARStrek/browser/browser.css | 34 ++++++++----------- .../browser/customizableui/panelUIOverlay.css | 21 +++++++++--- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index f238d7ba..9d125a76 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -62,8 +62,8 @@ menubar { /* margin-top: 3px;*/ } -#main-window[tabsintitlebar][sizemode="normal"][chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar, -#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar { +#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen])[chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar, +#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar { /* margin-top: 15px;*/ } @@ -127,13 +127,6 @@ menubar { visibility: visible; } -/* Make the menu inherit the toolbar's color. On non-compositor (Aero Basic, XP modern, classic) - * this is defined above, but only for tabsintitlebar. Otherwise (Aero Glass, Windows 8), - * this is hardcoded to black in browser-aero.css, even without tabsintitlebar. */ - #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) { -/* color: inherit; */ - } - #nav-bar { /* Position the toolbar above the bottom of background tabs */ position: relative; @@ -1332,6 +1325,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { window:not([chromehidden~="toolbar"]) #urlbar-container > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon { } +#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, @@ -1341,7 +1335,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-container > #forward-button:not([o #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon { } -#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover:active > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open]) > .toolbarbutton-icon, #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text, @@ -2479,16 +2473,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { /* End selected tab */ -/* Background tabs */ - -/* Decrease the height of the hoverable region of background tabs whenever the tabs are at the top - of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by - the titlebar. We don't need this in fullscreen since window dragging is not an issue there. */ -#main-window[tabsintitlebar]:not([sizemode="maximized"]):not([inFullscreen]) #toolbar-menubar:-moz-any([autohide="true"][inactive], :not([autohide])) + #TabsToolbar .tab-background-middle:not([selected=true]) { -} - -/* End background tabs */ - /* Tab pointer-events */ /* .tabbrowser-tab { @@ -2520,6 +2504,16 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { /* === END tabs.inc.css === */ +/* Background tabs: + * + * Decrease the height of the hoverable region of background tabs whenever the tabs are at the top + * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by + * the titlebar. We don't need this in fullscreen since window dragging is not an issue there. + */ +#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([selected=true]) { +/* clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);*/ +} + /* Tab DnD indicator */ .tab-drop-indicator { list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png"); diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 5345e8a7..e280b46d 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -19,6 +19,11 @@ moveY 3.4s linear 0s infinite alternate; } +#PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):empty::before { + animation: moveXRTL 3.05s linear 0s infinite alternate, + moveY 3.4s linear 0s infinite alternate; +} + #PanelUI-popup #PanelUI-contents:empty:hover::before { background-image: url("chrome://browser/skin/customizableui/whimsy.png"); } @@ -37,9 +42,13 @@ /* These values are adjusted for the padding on the panel. */ from { margin-left: -9px; } to { margin-left: calc(100% - 55px); } } +@keyframes moveXRTL { + /* These values are adjusted for the padding on the panel. */ + from { margin-right: -9px; } to { margin-right: calc(100% - 55px); } +} @keyframes moveY { /* These values are adjusted for the padding and height of the panel. */ - from { margin-top: -6px; } to { margin-top: 58px; } + from { margin-top: -.5em; } to { margin-top: calc(64px - .5em); } } #customization-panelHolder { @@ -210,7 +219,7 @@ panelview:not([mainview]) .toolbarbutton-text, #PanelUI-contents { display: block; - flex: auto; + flex: 1 0 auto; margin-left: auto; margin-right: auto; max-width: 22.35em; @@ -689,7 +698,7 @@ menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], border-color: hsla(210,4%,10%,.11); } -panelview .toolbarbutton-1:not([disabled]):-moz-any([open],:hover:active), +panelview .toolbarbutton-1:-moz-any(:not([disabled]):-moz-any([open],:hover:active),[checked=true]), toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],:hover:active), menu.subviewbutton:not([disabled])[_moz-menuactive]:active, menuitem.subviewbutton:not([disabled])[_moz-menuactive]:active, @@ -758,7 +767,7 @@ menuitem.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), } / Popups with only one item don't have a footer / -menupopup[placespopup=true][singleitempopup=true] > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox, +#BMB_bookmarksPopup menupopup[placespopup=true][singleitempopup=true] > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox, / These popups never have a footer / #BMB_bookmarksToolbarPopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox, #BMB_unsortedBookmarksPopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox { @@ -1017,6 +1026,10 @@ toolbarbutton[overflowedItem=true] { background-repeat: no-repeat; } +.subviewbutton[checked="true"]:-moz-locale-dir(rtl) { + background-position: top 5px right 4px; +} + .subviewbutton[checked="true"]:hover { background-image: url("chrome://global/skin/menu/menu-check-hover.gif"); } -- 2.43.0