Skip to content

Commit

Permalink
Merge branch 'main.update.branch' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
soulhotel authored Jun 20, 2024
2 parents 3b70b14 + de37658 commit 5063bc6
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 29 deletions.
31 changes: 8 additions & 23 deletions doc/change-log.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### [Click Me ⬇️](https://github.com/soulhotel/FF-ULTIMA/releases/download/1.7.9/ffultima1.7.9.zip) 1.7.9 latest
### [Click Me ⬇️](https://github.com/soulhotel/FF-ULTIMA/releases/download/1.7.9.5/ffultima1.7.9.5.zip) 1.7.9.5 latest

###### ⬇️ Please follow the [installation instructions](https://github.com/soulhotel/FF-ULTIMA#installation) on main page.

Expand All @@ -7,7 +7,7 @@
###### ⚙️ [Change settings](https://github.com/soulhotel/FF-ULTIMA/blob/main/doc/Modification.md), tab size, no borders, spacing, autohiding, more.

>[!WARNING]
> Returning Users: **Some user preferences (names) have changed!** Please reapply the user.js to get the updated settings. This change is to reflect future updates/features while organizing the names for easier readability. Setting names will be carefully considered moving forward and renaming will **NOT** happen again. Thank you.
> Returning Users: **Some user preferences were renamed in 1.7.9!** If you haven't done so already, please reapply your user.js to get the corrected settings. This change is to reflect future updates/features while organizing the names for easier readability. Setting names will be carefully considered moving forward and renaming will **NOT** happen again. Thank you.
> <details><summary>(CLICK ME) Settings List Preview</summary>
>
> <br>
Expand All @@ -17,25 +17,10 @@
> </details>
### Change Log:
- All is well, in Firefox 128.0b2.
- `new` Setting `ultima.tabs.vertical.hide` will hide vertical tabs. (renamed)
- `new` Setting `ultima.tabs.vertical.onlyprivate` hides vertical tabs ~ except for in private windows.
- `new` Setting `ultima.urlbar.suggestions` to toggle url bar suggestions on/off.
- `new` Setting `ultima.urlbar.centered` to toggle url bar centered text and overflow.
- `new` Setting `ultima.urlbar.hidebuttons` to show excess buttons only on hover.
- `new` Audio indicator (in Sidebery) positioned similar to native vertical tabs by [DarkDipper](https://github.com/DarkDipper), [#73](https://github.com/soulhotel/FF-ULTIMA/pull/73).
- `fix` Mac OS toolbar width patched, tested on Sonama and Ventura.
- `fix` Group Indentations improved (in Sidebery) [DarkDipper](https://github.com/DarkDipper), [#73](https://github.com/soulhotel/FF-ULTIMA/pull/73).
- `fix` Added padding (1px) added to the bottom of the mini-button-bar.
- `fix` Bad spacing, mathematical error, when tabs autohide is disabled.
- `fix` Removed duplicate code regarding context menu theme.
- `removed` Tab size preference renamed, `ultima.tabs.vertical` no longer needed. You can delete these in about:config.
- `todo` Alternative lwtheme variables (experimental)
- `todo` Setting to keep default tabs-on-top layout. (not a priority)
- `todo` Verify Windows Nav bar vertical center
- `new` Setting `ultima.OS.kdedecoration` adds compatibility for KDE Users with themed window decoration buttons.
> ![2024-06-20_14-35](https://github.com/soulhotel/FF-ULTIMA/assets/155501797/168821f4-75b3-4f36-9264-250cf72653fc)
- `fix` Close button for tabs not visible when in Fullscreen Mode, [#30](https://github.com/soulhotel/FF-ULTIMA/issues/30).
- `todo` Alternative lwtheme variables (experimental).
- `todo` Setting to keep default tabs-on-top layout (not a priority).
- `todo` Code miniaturization, slowly cleaning up the source, simplifying some functions, shrinking some files.
- `todo` New preference for alternate pinned tab styling, still havent decided on a style yet. Feedback is appreciated.

|windows | ![1 7](https://github.com/soulhotel/FF-ULTIMA/assets/155501797/ed741f9f-cac6-4339-8913-a697a8b3ade9) |
|--- |---|
|Linux | ![lin](https://github.com/soulhotel/FF-ULTIMA/assets/155501797/6d6e1a97-d17e-4b9d-8bb7-73e47b688558) |
|Mac (from LowSpecGamer25) | ![mac-user](https://github.com/soulhotel/FF-ULTIMA/assets/155501797/e814cc59-ae96-4e8a-a128-261daecd9094) |
84 changes: 78 additions & 6 deletions theme/override-linux.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
- strictly for when the users OS is linux and mac (despite the name)
[Index: ctrl+f a line to find a section]
--KDE--
--GNOME--
--mac--
KDE window controls
Gnome window controls
Mac positioned controls (for any OS)
KDE compat. for themed Window decoration buttons
-----------------------------------------------------------------*/

/*--Default Linux Overrides - Inactivity titlebar, Nav bar spacing, More--*/
Expand Down Expand Up @@ -54,7 +55,7 @@
} /*--<--end linux media query--*/

/*------------------------------------------------------------------------*/
/*--KDE--*/
/* KDE window controls */

@media (-moz-bool-pref: "ultima.OS.kde") {
@media (-moz-platform: linux), (-moz-os-version: linux) {
Expand Down Expand Up @@ -124,7 +125,7 @@
} /*--<--end OS preference query--*/

/*------------------------------------------------------------------------*/
/*--GNOME--*/
/* Gnome window controls */

@media (-moz-bool-pref: "ultima.OS.gnome") {
@media (-moz-platform: linux), (-moz-os-version: linux) {
Expand All @@ -140,7 +141,7 @@
} /*--<--end OS preference query--*/

/*------------------------------------------------------------------------*/
/*--mac--*/
/* Mac positioned controls (for any OS) */
/* all mac overrides have been moved to a dedicated file override-mac.css*/
/* this preferences will be recycled into an alternative style for titlebar buttons */

Expand Down Expand Up @@ -225,3 +226,74 @@
}
} /*--<--end linux media query--*/
} /*--<--end OS preference query--*/

/*------------------------------------------------------------------------*/
/* Linux compat. for themed Window decoration buttons */

@media (-moz-bool-pref: "ultima.OS.kdedecorations") {
@media (-moz-platform: linux), (-moz-os-version: linux) {

:root[tabsintitlebar] .titlebar-buttonbox {
top: 7px !important;
right: 5px !important;
}

.titlebar-button, .titlebar-button[lwtheme="true"] {
appearance: none !important;
margin: 0 !important;
margin-top: 0px !important;
padding: 4px 4px !important;
justify-content: center !important;
color: inherit !important;
-moz-context-properties: fill, fill-opacity !important;
fill: var(--toolbarbutton-icon-fill) !important;
stroke: var(--toolbarbutton-icon-fill) !important;
border-radius: var(--uc-button-border-radius);
}

.titlebar-button .toolbarbutton-icon,
.titlebar-button[lwtheme="true"] .toolbarbutton-icon,
.titlebar-button[lwtheme="true"] .toolbarbutton-icon[lwtheme="true"] {
border-radius: var(--toolbarbutton-border-radius) !important;
list-style-image: url("chrome://global/skin/icons/arrow-down.svg");
opacity: 1 !important;
padding: 3px !important;
}

/*--icons override, default icons dont override when there is window inactivity--*/
.titlebar-button.titlebar-close .toolbarbutton-icon{
list-style-image: url("icons/lin-close-decoration.svg") !important;
margin-top: -1px !important;
}
.titlebar-button.titlebar-min .toolbarbutton-icon{
list-style-image: url("icons/lin-min-decoration.svg") !important;
margin-top: -1px !important;
}
.titlebar-button.titlebar-max .toolbarbutton-icon{
list-style-image: url("icons/lin-max-decoration.svg") !important;
margin-top: -1px !important;
}
.titlebar-button.titlebar-restore .toolbarbutton-icon{
list-style-image: url("icons/lin-restore-decoration.svg") !important;
margin-top: -1px !important;
}

/*--override background changes when hovered--*/
#main-window .titlebar-button:hover,
#main-window:not([lwtheme]) .titlebar-button:hover {
background-color: transparent !important;
border-radius: var(--uc-button-border-radius);
} .titlebar-close:hover {
background-color: rgb(191, 66, 66) !important;
}

/*--override padding--*/
.titlebar-button > .toolbarbutton-icon[lwtheme="true"] {
padding: 4px 4px !important;
-moz-context-properties: revert !important;
stroke: currentColor;
border-radius: var(--uc-button-border-radius);
}
} /*--<--end linux media query--*/
} /*--<--end OS preference query--*/

1 change: 1 addition & 0 deletions user.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ user_pref("ultima.xstyle.pinnedtabs.i", false); /* Experimental. Havent decided
user_pref("ultima.OS.kde", true);
user_pref("ultima.OS.gnome", false);
user_pref("ultima.OS.mac", false);
user_pref("ultima.OS.kdedecorations", false);
/*user_pref("ultima.OS.linux", false);*/ /*Experimental*/

/*other*/
Expand Down

0 comments on commit 5063bc6

Please sign in to comment.