Skip to content

Commit

Permalink
v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Aris-t2 committed Oct 20, 2017
1 parent 3e789c0 commit 37018cc
Show file tree
Hide file tree
Showing 15 changed files with 178 additions and 144 deletions.
24 changes: 11 additions & 13 deletions classic/css/buttons/appbutton_in_titlebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@

#main-window[uidensity=touch][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-button #PanelUI-menu-button .toolbarbutton-icon {
-moz-margin-end: -90px !important;
margin-top: -3px !important;
margin-bottom: -3px !important;
}

#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button::after {
Expand Down Expand Up @@ -147,7 +145,6 @@
margin-top: -4px !important;
}


/* button color/border */

/* orange (default) */
Expand Down Expand Up @@ -192,7 +189,7 @@
background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
}

/* disable extra dragspace, if enabled to ensure proper titlebarbutton position */
/* remove extra dragspace even, if enabled, to ensure proper position on titlebar */
#main-window[extradragspace][tabsintitlebar]:not([inFullscreen]) {
--space-above-tabbar: 0px !important;
}
Expand All @@ -201,21 +198,22 @@
padding-top: 0px !important;
}*/

/* fix for squared_button_appearance_for_classic_buttons_on_navbar.css */
#main-window[tabsintitlebar][uidensity=compact] #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack {
padding: 5px !important;
}
#main-window[tabsintitlebar]:not([uidensity=compact]):not([uidensity=touch]) #toolbar-menubar[autohide="true"][inactive="true"] ~ #nav-bar #PanelUI-menu-button .toolbarbutton-badge-stack {
padding: 6px !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: 9px !important;
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: 0 !important;
padding: 6px !important;
width: 9px !important;
height: 7px !important;
}

/* fix for toolbar + text mode */
Expand Down
2 changes: 1 addition & 1 deletion classic/css/buttons/appbutton_popup_hide_panelarrow.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
#main-window[tabsintitlebar] #appMenu-popup{
-moz-margin-start: 0px !important;
-moz-margin-end: -204px !important;
margin-top:2px !important;
margin-top: -2px !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

.toolbarbutton-icon,
.toolbarbutton-badge-stack {
border-radius: 12px !important;
border-radius: 20px !important;
}

/**/
9 changes: 9 additions & 0 deletions classic/css/buttons/buttons_on_navbar_classic_appearance.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@
border: 0 !important;
}

/* adjust zoom reset and copy buttons position */
#nav-bar :-moz-any(#copy-button,#zoom-reset-button) {
-moz-margin-start: -1px !important;
-moz-margin-end: -1px !important;
}
:-moz-any(#edit-controls, #zoom-controls) separator {
visibility: collapse !important;
}

/* classic button style */
#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-icon,
#main-window:not([customizing]) #nav-bar .toolbarbutton-1[disabled=true]:-moz-any([open],[checked],:hover:active,:active) > .toolbarbutton-text,
Expand Down
105 changes: 105 additions & 0 deletions classic/css/buttons/buttons_on_navbar_squared_buttons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/*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 ************************************/
/****************************************************************************************/

/* This code won't work for all buttons the same way. There are way too many different ***
** types and button variations out there to catch all of them with genereal code. *******/


#main-window[uidensity=compact] #nav-bar toolbarbutton .toolbarbutton-icon {
width: 32px !important;
height: 26px !important;
padding-top: 5px !important;
padding-bottom: 5px !important;
}
#main-window[uidensity=compact] #nav-bar toolbarbutton .toolbarbutton-badge-stack {
width: 32px !important;
height: 26px !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
}

#main-window[uidensity=compact] #nav-bar #downloads-button #downloads-indicator-anchor {
margin-left: 3px !important;
margin-right: 3px !important;
padding-top: 5px !important;
padding-bottom: 5px !important;
}
#main-window[uidensity=compact] #nav-bar .webextension-browser-action .toolbarbutton-icon {
margin-left: 3px !important;
margin-right: 3px !important;
}
#main-window[uidensity=compact] #nav-bar :-moz-any(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
padding-left: 7px !important;
padding-right: 7px !important;
}

#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar toolbarbutton .toolbarbutton-icon {
width: 40px !important;
height: 30px !important;
padding-top: 7px !important;
padding-bottom: 7px !important;
}
#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar toolbarbutton .toolbarbutton-badge-stack {
width: 40px !important;
height: 30px !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
}
#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #downloads-button #downloads-indicator-anchor {
margin-left: 6px !important;
margin-right: 6px !important;
padding-top: 7px !important;
padding-bottom: 7px !important;
}
#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar .webextension-browser-action .toolbarbutton-icon {
margin-left: 6px !important;
margin-right: 6px !important;
}
#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar #back-button .toolbarbutton-icon{
padding: 9px !important;
height: 34px !important;
width: 34px !important;
}
#main-window:not([uidensity=compact]):not([uidensity=touch]) #nav-bar :-moz-any(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
padding-left: 11px !important;
padding-right: 11px !important;
}

#main-window[uidensity=touch] #nav-bar toolbarbutton .toolbarbutton-icon {
width: 46px !important;
height: 32px !important;
padding-top: 8px !important;
padding-bottom: 8px !important;
}
#main-window[uidensity=touch] #nav-bar toolbarbutton .toolbarbutton-badge-stack {
width: 46px !important;
height: 32px !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
}
#main-window[uidensity=touch] #nav-bar #downloads-button #downloads-indicator-anchor {
margin-left: 6px !important;
margin-right: 6px !important;
padding-top: 8px !important;
padding-bottom: 8px !important;
}
#main-window[uidensity=touch] #nav-bar .webextension-browser-action .toolbarbutton-icon {
margin-left: 6px !important;
margin-right: 6px !important;
}
#main-window[uidensity=touch] #nav-bar #back-button .toolbarbutton-icon{
padding: 12px !important;
height: 40px !important;
width: 40px !important;
}
#main-window[uidensity=touch] #nav-bar :-moz-any(#add-ons-button,#zoom-out-button,#zoom-in-button) .toolbarbutton-icon {
padding-left: 14px !important;
padding-right: 14px !important;
}

/**/

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion classic/css/locationbar/locationbar_border_roundness.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/****************************************************************************************/

.searchbar-textbox, #urlbar {
border-radius: 12px !important;
border-radius: 20px !important;
}

/**/
36 changes: 23 additions & 13 deletions classic/css/tabs/tabs_below_navigation_toolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,37 @@
/****************************************************************************************/


/* tabs toolbar adjustment */
#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar,
#main-window[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar,
#main-window[uidensity=compact][tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar,
#main-window[uidensity=compact][tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive="true"] ~ #TabsToolbar,
#TabsToolbar{
-moz-padding-start: 2px !important;
}
#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #TabsToolbar {
margin-top: 0px !important;
}

/* 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][sizemode="normal"]:not([inFullscreen]) #TabsToolbar {
margin-top: 0px !important;
}

/* tab height */
#tabbrowser-tabs,
#tabbrowser-tabs > .tabbrowser-arrowscrollbox,
.tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
min-height: 25px !important;
}

/* toolbar order (start) ************************************/
#print-preview-toolbar,
#printedit-toolbar,
#titlebar {
-moz-box-ordinal-group: 0 !important;
}

#navigator-toolbox #toolbar-menubar {
-moz-box-ordinal-group: 1 !important;
}
Expand All @@ -51,24 +53,32 @@
#navigator-toolbox toolbar {
-moz-box-ordinal-group: 10 !important;
}
/**/
/* tabs toolbar */
#navigator-toolbox #TabsToolbar {
-moz-box-ordinal-group: 100 !important;
}
/* toolbar order (end) **************************************/

/* toolbar colors */
#TabsToolbar:not(:-moz-lwtheme){
background-image: linear-gradient(#f9f9fa,#f9f9fa) !important;
}
#TabsToolbar:-moz-lwtheme{
background: rgba(255,255,255,0.4) !important;
}

/* toolbar borders */
#main-window #navigator-toolbox::after {
/*border-bottom: unset !important;*/
opacity: 0 !important;
}
#TabsToolbar{
margin-bottom: 0px !important;
border-bottom: 1px solid #5f7181 !important;
}

#TabsToolbar:not(:-moz-lwtheme){
#main-window[sizemode="normal"] #TabsToolbar:not(:-moz-lwtheme){
border-left: 1px solid #5f7181 !important;
border-right: 1px solid #5f7181 !important;
background-image: linear-gradient(#f9f9fa,#f9f9fa) !important;
}

#TabsToolbar:-moz-lwtheme{
background: rgba(255,255,255,0.4) !important;
}

@media (-moz-os-version: windows-win7),(-moz-os-version: windows-vista) {
Expand Down
Loading

0 comments on commit 37018cc

Please sign in to comment.