diff --git a/src/firefox/chrome/Orchis/colors/dark.css b/src/firefox/chrome/Orchis/colors/dark.css index 8bdec33..ac74d17 100644 --- a/src/firefox/chrome/Orchis/colors/dark.css +++ b/src/firefox/chrome/Orchis/colors/dark.css @@ -24,7 +24,7 @@ /* Sidebar */ --gnome-sidebar-background: #3b3b3b; --gnome-inactive-sidebar-background: #3f3f3f; - + /* Popups */ --gnome-menu-background: #333333; --gnome-menu-border-color: #121212; @@ -44,7 +44,7 @@ --gnome-inactive-headerbar-box-shadow: inset 0 1px rgba(255, 255, 255, 0.08); /* Buttons */ - --gnome-button-background: transparent; + --gnome-button-background: rgba(255, 255, 255, 0.06); --gnome-button-border-color: transparent; --gnome-button-border-accent-color: transparent; --gnome-headerbar-button-border-color: transparent; @@ -82,7 +82,7 @@ --gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0); /* URL bar */ - --gnome-urlbar-background: #2d2d2d; + --gnome-urlbar-background: rgba(255, 255, 255, 0.06); --gnome-urlbar-border-color: #282828; --gnome-urlbar-box-shadow: inset 0 0 0 1px rgba(21, 83, 158, 0); --gnome-urlbar-color: #ffffff; diff --git a/src/firefox/chrome/Orchis/colors/light.css b/src/firefox/chrome/Orchis/colors/light.css index dbf0cb3..40f16b0 100644 --- a/src/firefox/chrome/Orchis/colors/light.css +++ b/src/firefox/chrome/Orchis/colors/light.css @@ -43,7 +43,7 @@ --gnome-inactive-headerbar-box-shadow: 0 1px #fff inset; /* Buttons */ - --gnome-button-background: transparent; + --gnome-button-background: rgba(0, 0, 0, 0.06); --gnome-button-border-color: transparent; --gnome-button-border-accent-color: #bfbfbf; --gnome-headerbar-button-border-color: #cdcdcd; @@ -81,7 +81,7 @@ --gnome-button-destructive-action-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0); /* URL bar */ - --gnome-urlbar-background: #f5f5f5; + --gnome-urlbar-background: rgba(0, 0, 0, 0.06); --gnome-urlbar-border-color: #b6b6b3; --gnome-urlbar-box-shadow: none; --gnome-urlbar-color: #202020; diff --git a/src/firefox/chrome/Orchis/icons/go-next-symbolic.svg b/src/firefox/chrome/Orchis/icons/go-next-symbolic.svg index 1666652..1aaa708 100644 --- a/src/firefox/chrome/Orchis/icons/go-next-symbolic.svg +++ b/src/firefox/chrome/Orchis/icons/go-next-symbolic.svg @@ -1,7 +1,3 @@ - - - - - - + + diff --git a/src/firefox/chrome/Orchis/icons/go-previous-symbolic.svg b/src/firefox/chrome/Orchis/icons/go-previous-symbolic.svg index ff5e136..45725a5 100644 --- a/src/firefox/chrome/Orchis/icons/go-previous-symbolic.svg +++ b/src/firefox/chrome/Orchis/icons/go-previous-symbolic.svg @@ -1,7 +1,5 @@ - - - - - - + + + + diff --git a/src/firefox/chrome/Orchis/parts/buttons.css b/src/firefox/chrome/Orchis/parts/buttons.css index 85cf81c..d5fef0b 100644 --- a/src/firefox/chrome/Orchis/parts/buttons.css +++ b/src/firefox/chrome/Orchis/parts/buttons.css @@ -52,6 +52,7 @@ /* Buttons with margins */ #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { margin: 0 2px !important; + background: transparent !important; } /* Text buttons */ @@ -277,7 +278,7 @@ menulist[open] .menulist-label-box, /* Combined buttons */ #nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#hack), -#nav-bar #back-button:not(#hack), +/* #nav-bar #back-button:not(#hack), */ .subviewbutton.panel-subview-footer:not(:only-of-type):not(:last-of-type), .panel-footer button:not(:only-of-type):not(:last-of-type), #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button), @@ -291,7 +292,7 @@ menulist[open] .menulist-label-box, } #nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#hack), -#nav-bar #forward-button:not(#hack), +/* #nav-bar #forward-button:not(#hack), */ .subviewbutton.panel-subview-footer:not(:only-of-type):not(:first-of-type), .panel-footer button:not(:only-of-type):not(:first-of-type), #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button), diff --git a/src/firefox/chrome/Orchis/parts/csd.css b/src/firefox/chrome/Orchis/parts/csd.css index 469d71f..52ec4f9 100644 --- a/src/firefox/chrome/Orchis/parts/csd.css +++ b/src/firefox/chrome/Orchis/parts/csd.css @@ -6,11 +6,6 @@ -moz-appearance: -moz-window-titlebar !important; } -/* Headerbar top border corners rounded */ -:root[tabsintitlebar]:not([inFullscreen]):not([sizemode="maximized"]) #nav-bar { - border-radius: 12px 12px 0 0 !important; -} - /* Window buttons box */ :root[tabsintitlebar] #titlebar .titlebar-buttonbox-container, :root[tabsintitlebar] #titlebar-buttonbox-container, @@ -94,11 +89,6 @@ display: none !important; } -/* Headerbar top border corners rounded */ -:root[tabsintitlebar]:not([inFullscreen]):not([sizemode="maximized"]) #nav-bar { - border-radius: 0 0 0 0 !important; -} - /* Remove tabsbar titlebar blank spaces */ :root[tabsintitlebar] #TabsToolbar .titlebar-placeholder { display: none !important; diff --git a/src/firefox/chrome/Orchis/parts/entries.css b/src/firefox/chrome/Orchis/parts/entries.css index 9f484d5..01a7192 100644 --- a/src/firefox/chrome/Orchis/parts/entries.css +++ b/src/firefox/chrome/Orchis/parts/entries.css @@ -3,54 +3,39 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /* Entries */ -#search-box, -.findbar-textbox, #searchbar, -#urlbar.megabar #urlbar-input-container, -#urlbar:not(.megabar) { +#search-box, +.findbar-textbox { -moz-appearance: none !important; background: var(--gnome-urlbar-background) !important; border: none !important; - border-radius: 1000px !important; + border-radius: 16px !important; box-shadow: none !important; color: var(--gnome-urlbar-color) !important; height: 32px !important; max-height: 32px !important; padding: 6px 12px !important; box-sizing: border-box; -} - -#searchbar, -#urlbar.megabar #urlbar-input-container, -#urlbar:not(.megabar) { - background: var(--gnome-urlbar-background) !important; - padding: 0 6px !important; + transition: all 100ms; } /* Entries focused */ +#urlbar[breakout][breakout-extend], +#searchbar:focus-within, #search-box[focused], .findbar-textbox[focused], .findbar-textbox:focus { background: var(--gnome-focused-urlbar-background) !important; outline: 2px solid var(--gnome-focused-urlbar-border-color) !important; outline-offset: -2px; - -moz-outline-radius: 1000px; -} - -#urlbar.megabar[breakout][breakout-extend], -#urlbar:not(.megabar)[focused], -#searchbar:focus-within, -#urlbar[focused] { - background: var(--gnome-focused-urlbar-background) !important; - outline: 2px solid var(--gnome-focused-urlbar-border-color) !important; - outline-offset: -2px; - -moz-outline-radius: 1000px; + -moz-outline-radius: 16px; + transition: all 100ms; } #urlbar:hover, #searchbar:hover, -#urlbar.megabar #urlbar-input-container:hover, -#urlbar:not(.megabar):hover { +#search-box:hover, +.findbar-textbox:hover { background: var(--gnome-button-hover-background) !important; } @@ -105,4 +90,3 @@ #searchbar > .searchbar-textbox[focused] .searchbar-search-button:not(#hack) { margin: 0 !important; } - diff --git a/src/firefox/chrome/Orchis/parts/headerbar-urlbar.css b/src/firefox/chrome/Orchis/parts/headerbar-urlbar.css index 6d06d40..bcce1d4 100644 --- a/src/firefox/chrome/Orchis/parts/headerbar-urlbar.css +++ b/src/firefox/chrome/Orchis/parts/headerbar-urlbar.css @@ -7,26 +7,33 @@ --urlbar-toolbar-height: 32.00px !important; } +/* Center the URL bar */ +toolbarspring { + max-width: 10000px !important; +} + /* Megabar reset */ #urlbar { box-shadow: none !important; + background: var(--gnome-urlbar-background) !important; + border-radius: 16px !important; + padding: 0 6px !important; } #urlbar-background { box-shadow: none !important; border: 0 !important; background: transparent !important; + border-radius: 16px !important; } #urlbar[breakout][breakout-extend] { left: 0 !important; top: 0 !important; width: 100% !important; z-index: 5 !important; - padding: 0 !important; + padding: 0 6px !important; } #urlbar[breakout][breakout-extend][open] { - border-radius: 16px !important; - padding: 0 0 !important; height: auto !important; max-height: unset !important; } @@ -34,25 +41,9 @@ #urlbar[breakout][breakout-extend] #urlbar-input-container { height: 30px !important; max-height: 30px !important; - border-radius: 16px 16px 0 0 !important; - padding: 0 0 !important; -} - -#urlbar[breakout][breakout-extend][open] #urlbar-input-container { - height: 28px !important; - max-height: 28px !important; - border: 2px solid var(--gnome-focused-urlbar-border-color) !important; - border-bottom: none !important; - background: var(--gnome-urlbar-background) !important; - box-shadow: var(--gnome-popover-shadow) !important; padding: 0 0 !important; } -/* Center the URL bar */ -toolbarspring { - max-width: 10000px !important; -} - /* URL bar and Search bar's icons */ .urlbar-icon:hover, .urlbar-icon-wrapper:hover, @@ -69,12 +60,8 @@ toolbarspring { /* URL bar results */ .urlbarView { - background: var(--gnome-urlbar-background) !important; - border: 2px solid var(--gnome-focused-urlbar-border-color) !important; - border-top: none !important; - border-radius: 0 0 16px 16px; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.3) !important; - color: var(--gnome-button-color) !important; + background: transparent !important; + color: var(--gnome-toolbar-color) !important; margin: -2px 0 0 0 !important; width: 100% !important; } @@ -100,56 +87,15 @@ toolbarspring { } .search-one-offs { - padding: 8px 0 0 0 !important; - margin-top: 8px !important; + margin-top: 2px !important; + margin-bottom: 2px !important; + padding: 6px 6px !important; border-color: var(--gnome-popover-separator-color) !important; } -#urlbar .search-panel-header > label { - margin-top: 0px !important; - margin-left: 6px !important; -} - -.urlbarView-body-outer { - --item-padding-start: 0 !important; - --item-padding-end: 0 !important; -} - -/* URL bar results megabar fixes */ -#urlbar.megabar .urlbarView { - background: var(--gnome-urlbar-background) !important; - width: 100% !important; - margin: 0 !important; - margin-top: -42px !important; - box-shadow: none !important; - border-top: 0 !important; - padding: 0px !important; - border-color: var(--gnome-urlbar-border-color) !important; -} -#urlbar.megabar .urlbarView-body-outer { - padding: 0 8px !important; -} -#urlbar.megabar .urlbarView-body-inner { - border: 0 !important; -} -#urlbar.megabar .urlbarView-row { - padding: 6px !important; - border-radius: 5px !important; -} -#urlbar.megabar .search-one-offs { - margin-top: 6px !important; - padding: 8px !important; - background: var(--gnome-popover-background) !important; - border-top: 1px solid var(--gnome-popover-separator-color) !important; -} - -/* Search engines buttons */ -#urlbar .searchbar-engine-one-off-item { +.searchbar-engine-one-off-item { --toolbarbutton-active-background: transparent !important; --toolbarbutton-hover-background: transparent !important; -} - -#urlbar .searchbar-engine-one-off-item { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: none !important; @@ -157,15 +103,32 @@ toolbarspring { padding: 0 0 !important; min-height: 32px !important; min-width: 32px !important; - margin: 2px !important; - border-radius: 16px; + margin: 0 !important; + border-radius: 0; } -#urlbar .searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { +.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { background: var(--gnome-button-hover-background) !important; color: unset !important; } +.searchbar-engine-one-off-item:first-child { + border-radius: 16px 0 0 16px; +} +.searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:last-child { + border-radius: 0 16px 16px 0; +} -#urlbar #urlbar-anon-search-settings-compact { +#urlbar-anon-search-settings-compact { border-radius: 16px; margin-left: 6px !important; } + +/* URL bar and Search bar */ +#urlbar[focused] .urlbar-textbox-container { + margin: -1px !important; +} +#searchbar > .searchbar-textbox[focused] .searchbar-search-button { + margin-left: -1px !important; +} +#searchbar > .searchbar-textbox[focused] .search-go-button { + margin-right: -1px !important; +} diff --git a/src/firefox/chrome/Orchis/parts/toolbox.css b/src/firefox/chrome/Orchis/parts/toolbox.css index 4021ce8..199ffde 100644 --- a/src/firefox/chrome/Orchis/parts/toolbox.css +++ b/src/firefox/chrome/Orchis/parts/toolbox.css @@ -28,6 +28,10 @@ fill: var(--gnome-toolbar-color) !important; } +:root[tabsintitlebar][sizemode="maximized"] #TabsToolbar { + border-radius: 0 0 0 0 !important; +} + #tabbrowser-tabs { box-shadow: none !important; }