1.1.6

Aris-t2 · Oct 27, 2017 · 8352352 · 8352352
1 parent c2609d8
commit 8352352
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 11 deletions.
diff --git a/classic/css/buttons/appbutton_in_titlebar.css b/classic/css/buttons/appbutton_in_titlebar.css
@@ -8,7 +8,7 @@
 
 
 /*************************************************/
-/* cheat main menu button into title bar toolbar */
+/* cheat main menu button into title bar ********/
 /************************************************/
 
 /* gain space before tabs toolbar */
@@ -31,8 +31,7 @@
 #main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
   -moz-appearance: none !important;
   -moz-box-ordinal-group: 0 !important;
-  position: absolute !important;
-  top: -26px !important;
+  position: fixed !important;
   height: 22px !important;
   margin: 0 !important;
   -moz-margin-start: -1px !important;
@@ -43,7 +42,15 @@
 }
 
 #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
-  top: -30px !important;
+  top: 1px !important;
+}
+
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  top: 8px !important;
+}
+
+#main-window[tabsintitlebar][inFullscreen] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  top: 0px !important;
 }
 
 #main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button #PanelUI-menu-button {
@@ -61,6 +68,11 @@
   border-bottom: 2px solid !important;
 }
 
+/* hide button in fullscreen mode, if toolbars get automatically hidden */
+#main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  visibility: collapse !important;
+}
+
 /* dropmarker icon / arrow */
 #main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button .toolbarbutton-icon {
   -moz-margin-end: -94px !important;

diff --git a/classic/css/buttons/appbutton_in_titlebar_icon_only.css b/classic/css/buttons/appbutton_in_titlebar_icon_only.css
@@ -0,0 +1,203 @@
+/*AGENT_SHEET*/
+
+/* Firefox 57+ userChrome.css tweaks ****************************************************/
+/* code mostly taken from 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons **/
+/* by Aris ([email protected])*********************************************************/
+/* Github: https://github.com/aris-t2/customcssforfx ************************************/
+/****************************************************************************************/
+
+
+/*************************************************/
+/* cheat main menu button into title bar ********/
+/************************************************/
+
+/* gain space before tabs toolbar */
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
+  -moz-padding-start: 43px !important;
+}
+
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
+  -moz-padding-start: 41px !important;
+}
+
+#main-window[uidensity=compact][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
+  -moz-padding-start: 40px !important;
+}
+
+#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
+  -moz-padding-start: 39px !important;
+}
+
+#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
+  -moz-padding-start: 48px !important;
+}
+
+#main-window[uidensity=touch][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar{
+  -moz-padding-start: 47px !important;
+}
+
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  -moz-appearance: none !important;
+  -moz-box-ordinal-group: 0 !important;
+  position: fixed !important;
+  height: 22px !important;
+  margin: 0 !important;
+  -moz-margin-start: -1px !important;
+  border: unset !important;
+  box-shadow: unset !important;
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+}
+
+#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  top: 1px !important;
+}
+
+#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  top: 8px !important;
+}
+
+#main-window[tabsintitlebar][inFullscreen] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  top: 0px !important;
+}
+
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button #PanelUI-menu-button {
+  background-clip: padding-box !important;
+  padding: 0 4px 0 !important;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+  -moz-padding-start: 4px !important;
+  -moz-padding-end: 4px !important;
+  height: 22px !important;
+  border-radius: 0 0 4px 4px;
+  border-top: none !important;
+  border-right: 2px solid !important;
+  border-left: 2px solid !important;
+  border-bottom: 2px solid !important;
+}
+
+/* hide button in fullscreen mode, if toolbars get automatically hidden */
+#main-window[tabsintitlebar] #navigator-toolbox[inFullscreen="true"][style*="margin-top: -"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  visibility: collapse !important;
+}
+
+/* dropmarker icon / arrow */
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button .toolbarbutton-icon {
+  list-style-image: url("../../image/appbutton-inv.svg") !important;
+  background: unset !important;
+  box-shadow: unset !important;
+}
+
+
+/* adjust button badge stack */
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([checked]):not([open]):not(:active) > .toolbarbutton-badge-stack,
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  :-moz-any(#PanelUI-button,#PanelUI-menu-button):not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack{
+  background: unset !important;
+  border-color: unset !important;
+  border: 0 !important;
+  box-shadow: unset !important;
+}
+
+/* adjust button badge */
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button #PanelUI-menu-button .toolbarbutton-badge-stack .toolbarbutton-badge  {
+  -moz-margin-end: 2px !important;
+  margin-top: 0px !important;
+}
+
+/* button color/border */
+
+/* orange (default) */
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button #PanelUI-menu-button {
+  background-image: linear-gradient(rgb(247,182,82), rgb(215,98,10) 95%) !important;
+  -moz-border-right-colors: rgba(255,255,255,.60) hsla(214,89%,21%,.5) !important;
+  -moz-border-left-colors: rgba(255,255,255,.60) hsla(214,89%,21%,.5) !important;
+  -moz-border-bottom-colors: rgba(255,255,255,.70) hsla(214,89%,21%,.5) !important;
+  box-shadow: 0 1px 0 rgba(255,255,255,.25) inset,
+			  0 0 0 1px rgba(255,255,255,.25) inset !important;
+}
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
+  background-image: radial-gradient(farthest-side at center bottom, rgba(252,240,89,.5) 10%, rgba(252,240,89,0) 70%),
+					radial-gradient(farthest-side at center bottom, rgb(236,133,0), rgba(255,229,172,0)),
+					linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important;
+  border-color: rgba(83,42,6,.9) !important;
+  box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
+			  0 0 2px 1px rgba(250,234,169,.7) inset,
+			  0 -1px 0 rgba(250,234,169,.5) inset !important;
+}
+#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]){
+  background-image: linear-gradient(rgb(246,170,69), rgb(209,74,0) 95%) !important;
+  box-shadow: 0 2px 3px rgba(0,0,0,.4) inset,
+			  0 1px 1px rgba(0,0,0,.2) inset !important;
+}
+
+/*private browsing - purple */
+#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-button #PanelUI-menu-button{
+  background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important;
+  border-color: rgba(43,8,65,.9) !important;
+}
+#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-button #PanelUI-menu-button:hover:not(:active):not([open]){
+  background-image: radial-gradient(farthest-side at center bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%),
+					radial-gradient(farthest-side at center bottom, rgb(192,81,247), rgba(236,172,255,0)),
+					linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
+  border-color: rgba(43,8,65,.9) !important;
+  box-shadow: 0 1px 0 rgba(255,255,255,.1) inset,
+			  0 0 2px 1px rgba(240,193,255,.7) inset,
+			  0 -1px 0 rgba(240,193,255,.5) inset !important;
+}
+#main-window[privatebrowsingmode=temporary][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-button #PanelUI-menu-button:-moz-any(:hover:active,[open]) {
+  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
+}
+
+/* remove extra dragspace even, if enabled, to ensure proper position on titlebar */
+#main-window[extradragspace][tabsintitlebar]:not([inFullscreen]) {
+  --space-above-tabbar: 0px !important;
+}
+/*#main-window[sizemode="normal"][chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar,
+#main-window[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
+  padding-top: 0px !important;
+}*/
+
+/* fix for 'buttons_on_navbar_squared_buttons.css' */
+#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack,
+#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack,
+#main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack {
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+  width: unset !important;
+  height: 22px !important;
+}
+
+#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon,
+#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon,
+#main-window[tabsintitlebar][uidensity=touch] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-icon {
+  padding: 0px !important;
+  width: 16px !important;
+  height: 16px !important;
+}
+
+/* fix for toolbar + text mode */
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] #PanelUI-menu-button{
+  -moz-appearance: unset !important;
+}
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button .toolbarbutton-text,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button:not([type="menu-button"]) .toolbarbutton-text,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] #PanelUI-menu-button .toolbarbutton-text{
+  display: none !important;
+}
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button:not([type="menu-button"]),
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button:not([type="menu-button"]),
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) .toolbarbutton-1[type="menu-button"] #PanelUI-menu-button{
+  -moz-box-orient: unset !important;
+  min-width: unset !important;
+}
+
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) toolbaritem #PanelUI-menu-button:not(#nav-bar-overflow-button):not(#PlacesChevron) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack),
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button:not([type="menu-button"]):not(#nav-bar-overflow-button):not(#PlacesChevron) > :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)/*,
+#main-window[tabsintitlebar] toolbox #toolbar-menubar[autohide="true"][inactive="true"] ~ toolbar:not(#TabsToolbar) #PanelUI-menu-button[type="menu-button"]:not(#nav-bar-overflow-button):not(#PlacesChevron) toolbarbutton :-moz-any(.toolbarbutton-icon,.toolbarbutton-badge-stack)*/{
+  opacity: 1.0 !important;
+  margin-bottom: unset !important;
+}
+
diff --git a/classic/css/tabs/tabs_below_navigation_toolbar.css b/classic/css/tabs/tabs_below_navigation_toolbar.css
@@ -20,9 +20,8 @@
 }
 
 /* fix for application/hamburger button in titlebar */
-#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button,
-#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
-  top: -23px !important;
+#main-window[tabsintitlebar][inFullscreen] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar  #PanelUI-button {
+  visibility: collapse !important;
 }
 
 /* tab height */

diff --git a/classic/userChrome.css b/classic/userChrome.css
@@ -7,7 +7,7 @@
 /****************************************************************************************/
 
 /****************/
-/**** v1.1.5 ****/
+/**** v1.1.6 ****/
 /****************/
 
 
@@ -88,8 +88,10 @@
 /* Application/hamburger button in Firefox titlebar (Windows only) **********************/
 /****************************************************************************************/
 
-/* cheat appbutton into titlebar (if menubar is disabled) */
+/* appbutton in titlebar (if menubar is disabled) */
+/* only use one at a time */
 @import url(./css/buttons/appbutton_in_titlebar.css);
+/*@import url(./css/buttons/appbutton_in_titlebar_icon_only.css);*/
 
 /* button color - only use one at a time */
 @import url(./css/buttons/appbutton_in_titlebar_autocolor.css);
@@ -122,7 +124,7 @@
 /*@import url(./css/tabs/classic_squared_tabs_fully_squared.css);*/
 
 /* tabs not on top - tabs below navigation and bookmarks toolbars */
-/*@import url(./css/tabs/tabs_below_navigation_toolbar.css);*/ 
+/*@import url(./css/tabs/tabs_below_navigation_toolbar.css);*/
 
 /* restore empty/missing ta favicon - only use one at a time */
 @import url(./css/tabs/missing_tab_favicon_restored_default.css);

diff --git a/classic/userContent.css b/classic/userContent.css
@@ -7,7 +7,7 @@
 /****************************************************************************************/
 
 /****************/
-/**** v1.1.5 ****/
+/**** v1.1.6 ****/
 /****************/