From d1230a45708cb8756e05f1ca6bdae41d345ea153 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 11 Sep 2015 18:57:38 +0200 Subject: sync with latest Arc changes --- arc-firefox-theme/chrome/browser/browser.css | 10 +-- .../custom_images/dark/tabs/tab-end-hover.svg | 19 ++--- .../browser/custom_images/dark/tabs/tab-end.svg | 8 +- .../custom_images/dark/tabs/tab-middle-hover.svg | 12 +-- .../browser/custom_images/dark/tabs/tab-middle.svg | 10 +-- .../custom_images/dark/tabs/tab-start-hover.svg | 21 ++--- .../browser/custom_images/dark/tabs/tab-start.svg | 12 +-- .../custom_images/dark/window-controls/close.svg | 58 ++++++------- .../dark/window-controls/close_prelight.svg | 24 ++---- .../dark/window-controls/close_pressed.svg | 26 +++--- .../dark/window-controls/maximize.svg | 24 ++---- .../dark/window-controls/maximize_prelight.svg | 12 +-- .../dark/window-controls/maximize_pressed.svg | 99 ++++++++++++++++++++-- .../dark/window-controls/minimize.svg | 26 ++---- .../dark/window-controls/minimize_prelight.svg | 18 ++-- .../dark/window-controls/minimize_pressed.svg | 14 ++- .../browser/custom_images/darker/tabs/tab-end.svg | 8 +- .../custom_images/darker/tabs/tab-middle.svg | 4 +- .../custom_images/darker/tabs/tab-start.svg | 6 +- .../browser/custom_images/light/tabs/tab-end.svg | 4 +- .../custom_images/light/tabs/tab-middle.svg | 8 +- .../browser/custom_images/light/tabs/tab-start.svg | 4 +- .../custom_images/light/window-controls/close.svg | 31 ++++--- .../light/window-controls/close_prelight.svg | 29 +++---- .../light/window-controls/close_pressed.svg | 10 +-- .../light/window-controls/maximize.svg | 24 ++---- .../light/window-controls/maximize_prelight.svg | 12 +-- .../light/window-controls/maximize_pressed.svg | 6 +- .../light/window-controls/minimize.svg | 24 ++---- .../light/window-controls/minimize_prelight.svg | 14 +-- .../light/window-controls/minimize_pressed.svg | 8 +- .../chrome/browser/sass/_browser-sass.scss | 4 +- arc-firefox-theme/chrome/browser/sass/_colors.scss | 72 ++++++++-------- .../chrome/browser/sass/_drawing.scss | 44 ++++------ .../chrome/browser/sass/browser-dark.css | 46 +++++----- .../chrome/browser/sass/browser-darker.css | 18 ++-- .../chrome/browser/sass/browser-light.css | 10 +-- 37 files changed, 374 insertions(+), 405 deletions(-) (limited to 'arc-firefox-theme/chrome/browser') diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index babfce1..6fa9f8a 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -8,7 +8,7 @@ :root { --toolbarbutton-hover-background: #fbfbfc; --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: #5294E2; + --toolbarbutton-hover-bordercolor: #cfd6e6; --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: #5294E2; --toolbarbutton-active-background: #5294E2; @@ -58,7 +58,7 @@ transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; } #TabsToolbar:not([collapsed="true"]) + #nav-bar { - border-top: 1px solid rgba(203, 205, 212, 0.95) !important; + border-top: 1px solid rgba(212, 213, 219, 0.95) !important; background-clip: padding-box; margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ @@ -137,8 +137,8 @@ toolbarbutton.bookmark-item { toolbarbutton.bookmark-item:not([disabled=true]):hover { -moz-appearance: none; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; } toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) { -moz-appearance: none; @@ -1278,14 +1278,12 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { padding: 3px; border-radius: 3px; margin: 0 3px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; border: 1px solid #cfd6e6; } #urlbar[focused], .searchbar-textbox[focused] { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; border: 1px solid #5294E2; } diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg index 36c4251..514f96b 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end-hover.svg @@ -39,8 +39,8 @@ id="namedview16" showgrid="true" inkscape:zoom="10.766271" - inkscape:cx="-9.9304967" - inkscape:cy="10.808825" + inkscape:cx="3.3052838" + inkscape:cy="3.3782114" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" @@ -57,7 +57,7 @@ id="defs4" /> + style="opacity:0.6"> + style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" /> - diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg index 7b0e1f8..e3c2967 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-end.svg @@ -39,7 +39,7 @@ id="namedview16" showgrid="true" inkscape:zoom="10.766271" - inkscape:cx="6.5561773" + inkscape:cx="-26.417171" inkscape:cy="10.808825" inkscape:window-x="0" inkscape:window-y="23" @@ -56,7 +56,7 @@ + style="opacity:0.6"> + style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555984" /> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg index 9f94872..7cc1a03 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-middle.svg @@ -38,9 +38,9 @@ inkscape:window-height="1052" id="namedview16" showgrid="true" - inkscape:zoom="5.3831355" - inkscape:cx="6.4463018" - inkscape:cy="9.9647005" + inkscape:zoom="30.451613" + inkscape:cx="22.422533" + inkscape:cy="31.436498" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" @@ -56,7 +56,7 @@ + style="opacity:0.6"> + style="fill:#383c4a;fill-opacity:1;stroke:#4080fb;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.84555981" /> - diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg index 6a280d5..05a6788 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-start.svg @@ -38,9 +38,9 @@ inkscape:window-height="1052" id="namedview16" showgrid="true" - inkscape:zoom="7.6129032" - inkscape:cx="-10.453684" - inkscape:cy="11.931441" + inkscape:zoom="43.065084" + inkscape:cx="12.889294" + inkscape:cy="0.72416328" inkscape:window-x="0" inkscape:window-y="23" inkscape:window-maximized="1" @@ -56,7 +56,7 @@ + transform="translate(-641,1218)"> + id="g4490-6-5-2-5-3-6"> - + - - + id="layer4-4-1-9-5-6-3-8" + style="display:inline;fill:#ffffff;fill-opacity:1" /> @@ -213,7 +207,7 @@ x="645" height="16" width="16" - id="rect17883-39-99-8" + id="rect17883-39-99-8-8" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg index 748830f..852b85a 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/close_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -150,11 +150,11 @@ id="g4092-0-2-3-4-6" style="display:inline" transform="translate(58,0)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + transform="translate(-437.00001,1218)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> - - + transform="translate(-612.00002,1218)"> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg index 6a420b9..9be9958 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -145,12 +145,12 @@ @@ -207,7 +207,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#c4c7cc;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6-7-1" /> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg index 326ae8d..6974699 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/maximize_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -133,11 +129,98 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1028.3622)"> + + + + + + + + + + + + + + + + + + + + + transform="translate(-408.00001,1218)"> - @@ -134,17 +130,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - - diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg index 5c12c91..d029d16 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_prelight.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_prelight.svg" + sodipodi:docname="minimize_prelight.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -145,12 +141,12 @@ @@ -205,7 +201,7 @@ id="layer12-45-6-2-7"> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg index be0af55..f88d4f0 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/window-controls/minimize_pressed.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_pressed.svg" + sodipodi:docname="minimize_pressed.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1889683" - inkscape:cy="9.2440344" + inkscape:zoom="22.627418" + inkscape:cx="4.6255954" + inkscape:cy="10.407616" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -111,10 +111,6 @@ orientation="1,0" position="12,12" id="guide4316" /> - @@ -137,7 +133,7 @@ style="display:inline" id="titlebutton-min-active-dark" inkscape:label="#g6414" - transform="translate(-379,1218)"> + transform="translate(-379.00001,1218)"> + sodipodi:docname="tab-middle.svg"> @@ -21,7 +21,7 @@ image/svg+xml - + @@ -39,7 +39,7 @@ id="namedview16" showgrid="true" inkscape:zoom="21.532542" - inkscape:cx="16.353419" + inkscape:cx="8.110082" inkscape:cy="30.597364" inkscape:window-x="0" inkscape:window-y="23" @@ -66,7 +66,7 @@ rx="0.5" /> image/svg+xml - + @@ -150,11 +150,11 @@ id="g4092-0-2-21-0" style="display:inline" transform="translate(58,0)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg index 879400d..6f2670e 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="22.627418" + inkscape:cx="12.382889" + inkscape:cy="11.054563" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -150,11 +150,11 @@ id="g4092-0-2-3" style="display:inline" transform="translate(58,0)"> - @@ -185,13 +185,7 @@ - - + style="display:inline;fill:#ffffff;fill-opacity:1" /> + diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg index 9f0fe17..0365887 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/close_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="1" + inkscape:cx="13.034303" + inkscape:cy="10.832259" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -154,7 +154,7 @@ r="7" cy="255" cx="1376" - style="fill:#ef4048;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f13039;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4068-7-5-4-9" /> @@ -188,7 +188,7 @@ style="display:inline;fill:#ffffff;fill-opacity:1"> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg index c2a642d..5da027c 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,22 +134,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - - + transform="translate(-612,1218)" + style="display:inline;opacity:0.8"> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg index 90ef47c..a530d48 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_prelight.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -145,12 +145,12 @@ @@ -207,7 +207,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:1;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#7a7f8b;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6" /> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg index 549401c..c2f869b 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/maximize_pressed.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg index 5c2cecd..78a5356 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize.svg @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -134,17 +134,10 @@ id="layer1" transform="translate(0,-1028.3622)"> - + transform="translate(-583,1218)" + style="display:inline;opacity:0.8"> - diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg index 93d5baf..5d9de25 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_prelight.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_prelight.svg" + sodipodi:docname="minimize_prelight.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -145,12 +145,12 @@ @@ -205,7 +205,7 @@ id="layer12-45-6"> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg index fe9ebee..588536a 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/window-controls/minimize_pressed.svg @@ -14,7 +14,7 @@ id="svg4306" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="minimize_focused_pressed.svg" + sodipodi:docname="minimize_pressed.svg" style="enable-background:new"> @@ -81,9 +81,9 @@ borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="9.1908305" - inkscape:cy="9.2459508" + inkscape:zoom="45.254834" + inkscape:cx="12.734727" + inkscape:cy="10.911658" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index 84a96e2..c8b5b68 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -23,7 +23,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path); :root { --toolbarbutton-hover-background: $button_bg; --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: $selected_bg_color; + --toolbarbutton-hover-bordercolor: $button_border; --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: $selected_bg_color; @@ -84,7 +84,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path); } #TabsToolbar:not([collapsed="true"]) + #nav-bar { - border-top: 1px solid darken($header_border, 3%) !important; + border-top: 1px solid $header_border !important; background-clip: padding-box; margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ /* Position the toolbar above the bottom of background tabs */ diff --git a/arc-firefox-theme/chrome/browser/sass/_colors.scss b/arc-firefox-theme/chrome/browser/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/arc-firefox-theme/chrome/browser/sass/_colors.scss +++ b/arc-firefox-theme/chrome/browser/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $fg_color: if($variant =='light', #5c616c, #D3DAE3); $selected_fg_color: #ffffff; $selected_bg_color: #5294E2; $selected_borders_color: darken($selected_bg_color, 20%); -$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); - -$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); - -$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); -$button_border: $entry_border; - $header_bg: red; @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); -$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); +$header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $osd_insensitive_bg_color: darken($osd_bg_color, 3%); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); $osd_borders_color: transparentize(black, 0.3); -$panel_bg: darken($osd_bg_color, 4.7%); -$panel_fg: $osd_fg_color; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // Minimize, Maximize -$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); -$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $wm_button_active_bg: $selected_bg_color; -$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); -$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); -$wm_button_hover_border: $selected_bg_color; -$wm_button_active_border: $selected_bg_color; +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/arc-firefox-theme/chrome/browser/sass/_drawing.scss b/arc-firefox-theme/chrome/browser/sass/_drawing.scss index cd263c5..a4f95c4 100644 --- a/arc-firefox-theme/chrome/browser/sass/_drawing.scss +++ b/arc-firefox-theme/chrome/browser/sass/_drawing.scss @@ -2,26 +2,35 @@ // Entries -@mixin entry($t, $dark:false) { +@mixin entry($t) { // // Entries drawing function // - //@extend %reset_style; - box-shadow: inset 0 0 transparentize($base_color, 1); +// $t: entry type +// @if $t==normal { + // + // normal entry + // color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; } @if $t==focus { + // + // focused entry + // color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; } @if $t==insensitive { + // + // insensitive entry + // color: $insensitive_fg_color; background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); @@ -44,31 +53,13 @@ border: 1px solid $button_border; } - @else if $t==focus { - // - // focused button - // - color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; - } - - @else if $t==focus-hover { - // - // focused button - // - color: $selected_bg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; - } - @else if $t==hover { // // hovered button // color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + background-color: lighten($button_bg, 5%); + border: 1px solid $button_border; } @else if $t==active { @@ -89,9 +80,6 @@ background-color: transparentize($button_bg, 0.45); } - $_header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 3%), 0.1), transparentize($button_bg, 0.1)); - $_header_button_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 8%), transparentize($header_fg, 0.7)); - @if $t==header-normal { // // normal header-bar button @@ -106,8 +94,8 @@ // hovered header-bar button // color: $header_fg; - border-color: $_header_button_border; - background-color: $_header_button_bg; + border-color: $header_button_border; + background-color: $header_button_bg; } @else if $t==header-active { diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index 56672e1..6f0988f 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -6,9 +6,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ :root { - --toolbarbutton-hover-background: #3d414b; + --toolbarbutton-hover-background: #444a58; --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: #5294E2; + --toolbarbutton-hover-bordercolor: #2b2e39; --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: #5294E2; --toolbarbutton-active-background: #5294E2; @@ -36,12 +36,12 @@ -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */ height: 1px; - background-color: #2d3036; } + background-color: #2b2e39; } #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; - background-color: #444852; } + background-color: #383C4A; } #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) { padding-top: 1px; @@ -58,7 +58,7 @@ transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; } #TabsToolbar:not([collapsed="true"]) + #nav-bar { - border-top: 1px solid rgba(29, 32, 36, 0.97) !important; + border-top: 1px solid rgba(38, 42, 51, 0.97) !important; background-clip: padding-box; margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ @@ -67,11 +67,11 @@ z-index: 1; } #main-window[htitlemode=always] #TabsToolbar { - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97) !important; } + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97) !important; } #nav-bar { background-image: none !important; - background-color: #444852 !important; + background-color: #383C4A !important; box-shadow: none; padding-top: 3px; padding-bottom: 3px; } @@ -137,8 +137,8 @@ toolbarbutton.bookmark-item { toolbarbutton.bookmark-item:not([disabled=true]):hover { -moz-appearance: none; color: #D3DAE3; - background-color: #3d414b; - border: 1px solid #5294E2; } + background-color: #505666; + border: 1px solid #2b2e39; } toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) { -moz-appearance: none; @@ -544,8 +544,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon { background-color: none; color: rgba(207, 218, 231, 0.8); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, @@ -1278,16 +1278,14 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { padding: 3px; border-radius: 3px; margin: 0 3px; - box-shadow: inset 0 0 rgba(56, 60, 69, 0); color: #D3DAE3; - background-color: #383c45; - border: 1px solid #2d3036; } + background-color: #404552; + border: 1px solid #2b2e39; } #urlbar[focused], .searchbar-textbox[focused] { - box-shadow: inset 0 0 rgba(56, 60, 69, 0); color: #D3DAE3; - background-color: #383c45; + background-color: #404552; border: 1px solid #5294E2; } .searchbar-textbox { @@ -1628,7 +1626,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box padding-right: 4px; border-width: 0 1px 0 0; border-style: solid; - border-color: #2d3036; } + border-color: #2b2e39; } #notification-popup-box:-moz-locale-dir(rtl), .notification-anchor-icon:-moz-locale-dir(rtl) { @@ -2272,17 +2270,17 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Findbar */ .browserContainer > findbar { - background-color: #444852; + background-color: #383C4A; color: #D3DAE3; border-top: 1px solid; - -moz-border-top-colors: #2d3036; + -moz-border-top-colors: #2b2e39; text-shadow: none; } .browserContainer > findbar .findbar-textbox { -moz-appearance: none; color: #D3DAE3; - border: 1px solid #2d3036; - background-color: #383c45; + border: 1px solid #2b2e39; + background-color: #404552; box-shadow: none; margin: 0; padding: 5px; @@ -2309,8 +2307,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .browserContainer > findbar .findbar-find-previous, .browserContainer > findbar .findbar-find-next { - background: #3d414b; - border: 1px solid #2d3036; + background: #444a58; + border: 1px solid #2b2e39; box-shadow: none; } .browserContainer > findbar .findbar-find-previous { @@ -2601,7 +2599,7 @@ lwtHeader;*/ #TabsToolbar:not(:-moz-lwtheme) { -moz-appearance: none; color: rgba(207, 218, 231, 0.8); - background: #2f343b; } + background: #2f343f; } #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag), #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) { diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index b111a31..d854633 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -8,7 +8,7 @@ :root { --toolbarbutton-hover-background: #fbfbfc; --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: #5294E2; + --toolbarbutton-hover-bordercolor: #cfd6e6; --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: #5294E2; --toolbarbutton-active-background: #5294E2; @@ -58,7 +58,7 @@ transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; } #TabsToolbar:not([collapsed="true"]) + #nav-bar { - border-top: 1px solid rgba(24, 27, 31, 0.97) !important; + border-top: 1px solid rgba(38, 42, 51, 0.97) !important; background-clip: padding-box; margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ @@ -67,7 +67,7 @@ z-index: 1; } #main-window[htitlemode=always] #TabsToolbar { - box-shadow: inset 0 1px rgba(54, 60, 68, 0.97) !important; } + box-shadow: inset 0 1px rgba(54, 59, 72, 0.97) !important; } #nav-bar { background-image: none !important; @@ -137,8 +137,8 @@ toolbarbutton.bookmark-item { toolbarbutton.bookmark-item:not([disabled=true]):hover { -moz-appearance: none; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; } toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) { -moz-appearance: none; @@ -544,8 +544,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba #TabsToolbar .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon { background-color: none; color: rgba(207, 218, 231, 0.8); - border-color: rgba(29, 32, 36, 0.97); - background-color: rgba(40, 44, 50, 0.87); } + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } .findbar-button:not([disabled=true]):-moz-any([checked="true"], :hover:active) > .toolbarbutton-text, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([open="true"]) > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open="true"]) > .toolbarbutton-icon, @@ -1278,14 +1278,12 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { padding: 3px; border-radius: 3px; margin: 0 3px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; border: 1px solid #cfd6e6; } #urlbar[focused], .searchbar-textbox[focused] { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; border: 1px solid #5294E2; } @@ -2601,7 +2599,7 @@ lwtHeader;*/ #TabsToolbar:not(:-moz-lwtheme) { -moz-appearance: none; color: rgba(207, 218, 231, 0.8); - background: #2f343b; } + background: #2f343f; } #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag), #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) { diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index babfce1..6fa9f8a 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -8,7 +8,7 @@ :root { --toolbarbutton-hover-background: #fbfbfc; --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: #5294E2; + --toolbarbutton-hover-bordercolor: #cfd6e6; --toolbarbutton-active-boxshadow: none; --toolbarbutton-active-bordercolor: #5294E2; --toolbarbutton-active-background: #5294E2; @@ -58,7 +58,7 @@ transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; } #TabsToolbar:not([collapsed="true"]) + #nav-bar { - border-top: 1px solid rgba(203, 205, 212, 0.95) !important; + border-top: 1px solid rgba(212, 213, 219, 0.95) !important; background-clip: padding-box; margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */ @@ -137,8 +137,8 @@ toolbarbutton.bookmark-item { toolbarbutton.bookmark-item:not([disabled=true]):hover { -moz-appearance: none; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; } toolbarbutton.bookmark-item:not([disabled=true]):-moz-any([open], [checked], :hover:active) { -moz-appearance: none; @@ -1278,14 +1278,12 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { padding: 3px; border-radius: 3px; margin: 0 3px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; border: 1px solid #cfd6e6; } #urlbar[focused], .searchbar-textbox[focused] { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; border: 1px solid #5294E2; } -- cgit v1.2.3