From e8519ae061331281b03e2cc291cca5774e76ab8a Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Thu, 16 Feb 2012 02:16:28 +0100 Subject: [PATCH] make the forward-button-hiding really work and give it a nicer shape when it's displayed --- LCARStrek/browser/browser.css | 78 +++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 72546cfe..603d8097 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -751,6 +751,18 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { -moz-margin-start: -6px !important; padding-left: 7px; padding-right: 3px; + margin-top: 2px; + margin-bottom: 2px; +} + +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(ltr) { + border-top-right-radius: 11px; + border-bottom-right-radius: 11px; +} + +#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl) { + border-top-left-radius: 11px; + border-bottom-left-radius: 11px; } #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover { @@ -781,9 +793,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button > #forward-button { - border-top-right-radius: 0; +/* border-top-right-radius: 0; border-bottom-right-radius: 0; - -moz-margin-end: 0; + -moz-margin-end: 0; */ } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > @@ -798,6 +810,12 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon opacity: 0; } +window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > + :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > + #unified-back-forward-button:hover > #forward-button[disabled] { + background-color: transparent; +} + /* stop button */ #stop-button { @@ -1176,73 +1194,73 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container { - padding-left: 27px; - -moz-margin-start: -27px; + #unified-back-forward-button + #urlbar-container { + padding-left: 22px; + -moz-margin-start: -22px; position: relative; pointer-events: none; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container > #urlbar { - -moz-border-start: none; - margin-left: 0; + #unified-back-forward-button + #urlbar-container > #urlbar { +/* -moz-border-start: none; + margin-left: 0; */ pointer-events: all; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox:not([switchingtabs]) + #urlbar-container > #urlbar { + #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar { -moz-transition: margin-left 150ms ease-out; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container > #urlbar:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; + #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr) { +/* border-top-left-radius: 0; + border-bottom-left-radius: 0; */ } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; + #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { +/* border-top-right-radius: 0; + border-bottom-right-radius: 0; */ } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled] + #urlbar-container { + #unified-back-forward-button[forwarddisabled] + #urlbar-container { mask: url("chrome://browser/content/browser.xul#winstripe-urlbar-back-button-mask"); } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled] + #urlbar-container > #urlbar { - margin-left: -27px; + #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar { + margin-left: -22px; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar { + #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar { /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */ -moz-transition-delay: 100s; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar { + #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar { /* when not hovered anymore, trigger a new transition to hide the forward button immediately */ - margin-left: -27.01px; + margin-left: -22.01px; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container:-moz-locale-dir(rtl), + #unified-back-forward-button + #urlbar-container:-moz-locale-dir(rtl), window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { + #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { /* let winstripe-urlbar-back-button-mask clip the urlbar's right side for RTL */ -moz-transform: scaleX(-1); } @@ -1330,41 +1348,41 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder, window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox + #urlbar-container > #urlbar > #identity-box { + #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box { border-radius: 0; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { + #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { padding-left: 5px; -moz-transition: padding-left; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { + #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { padding-right: 5px; -moz-transition: padding-right; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box { + #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box { /* forward button hiding is delayed when hovered */ -moz-transition-delay: 100s; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { + #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ padding-left: 5.01px; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { + #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ padding-right: 5.01px; } @@ -2159,7 +2177,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-buttonbox[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box { + #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box { padding-left: 5px; } -- 2.43.0