From a1ae7970a18c60d019712a583b9238a3916109c5 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Wed, 23 Jun 2021 07:58:22 +0000 Subject: [PATCH] Update template and Firefox theme config --- .github/ISSUE_TEMPLATE/glitch.md | 4 +++ .github/ISSUE_TEMPLATE/idea.md | 4 +++ .github/ISSUE_TEMPLATE/installation.md | 4 +++ .github/SECURITY.md | 6 ++-- lib-core.sh | 2 +- .../{parts => }/left_header_button_3.css | 0 .../{parts => }/left_header_button_4.css | 0 .../{parts => }/left_header_button_5.css | 0 src/other/firefox/Monterey/parts/toolbox.css | 10 ------ .../{parts => }/right_header_button_3.css | 0 .../{parts => }/right_header_button_4.css | 0 .../{parts => }/right_header_button_5.css | 0 src/other/firefox/userChrome.css | 36 +++++++++++++------ 13 files changed, 42 insertions(+), 24 deletions(-) rename src/other/firefox/Monterey/{parts => }/left_header_button_3.css (100%) rename src/other/firefox/Monterey/{parts => }/left_header_button_4.css (100%) rename src/other/firefox/Monterey/{parts => }/left_header_button_5.css (100%) rename src/other/firefox/Monterey/{parts => }/right_header_button_3.css (100%) rename src/other/firefox/Monterey/{parts => }/right_header_button_4.css (100%) rename src/other/firefox/Monterey/{parts => }/right_header_button_5.css (100%) diff --git a/.github/ISSUE_TEMPLATE/glitch.md b/.github/ISSUE_TEMPLATE/glitch.md index a786e67..039baa6 100644 --- a/.github/ISSUE_TEMPLATE/glitch.md +++ b/.github/ISSUE_TEMPLATE/glitch.md @@ -7,4 +7,8 @@ assignees: 'vinceliuice' --- + + + diff --git a/.github/ISSUE_TEMPLATE/idea.md b/.github/ISSUE_TEMPLATE/idea.md index 1c7adfa..fd3484d 100644 --- a/.github/ISSUE_TEMPLATE/idea.md +++ b/.github/ISSUE_TEMPLATE/idea.md @@ -7,4 +7,8 @@ assignees: 'vinceliuice' --- + + + diff --git a/.github/ISSUE_TEMPLATE/installation.md b/.github/ISSUE_TEMPLATE/installation.md index 82769a2..61e4be9 100644 --- a/.github/ISSUE_TEMPLATE/installation.md +++ b/.github/ISSUE_TEMPLATE/installation.md @@ -7,4 +7,8 @@ assignees: 'rivanfebrian123' --- + + + diff --git a/.github/SECURITY.md b/.github/SECURITY.md index c48059e..56decaf 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -4,11 +4,11 @@ | Version | Supported | | ------------ | ------------------ | +| 2021-06-23 | :white_check_mark: | | 2021-05-05 | :white_check_mark: | -| 2021-04-20 | :white_check_mark: | -| < 2021-04-08 | :x: | +| < 2021-04-20 | :x: | ## Reporting a Vulnerability Report a security vulnerability to https://github.com/vinceliuice/WhiteSur-gtk-theme/issues -with a blank template +with a blank template or contact one of the authors. diff --git a/lib-core.sh b/lib-core.sh index 3e3f57b..9d925fd 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -21,7 +21,7 @@ WHITESUR_SOURCE=("lib-core.sh") #--------------System--------------# export WHITESUR_PID=$$ -MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" +MY_USERNAME="${SUDO_USER:-$(logname 2> /dev/null || echo "${USER}")}" if command -v gnome-shell &> /dev/null; then if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then diff --git a/src/other/firefox/Monterey/parts/left_header_button_3.css b/src/other/firefox/Monterey/left_header_button_3.css similarity index 100% rename from src/other/firefox/Monterey/parts/left_header_button_3.css rename to src/other/firefox/Monterey/left_header_button_3.css diff --git a/src/other/firefox/Monterey/parts/left_header_button_4.css b/src/other/firefox/Monterey/left_header_button_4.css similarity index 100% rename from src/other/firefox/Monterey/parts/left_header_button_4.css rename to src/other/firefox/Monterey/left_header_button_4.css diff --git a/src/other/firefox/Monterey/parts/left_header_button_5.css b/src/other/firefox/Monterey/left_header_button_5.css similarity index 100% rename from src/other/firefox/Monterey/parts/left_header_button_5.css rename to src/other/firefox/Monterey/left_header_button_5.css diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css index 6e10b90..fdb7bb8 100644 --- a/src/other/firefox/Monterey/parts/toolbox.css +++ b/src/other/firefox/Monterey/parts/toolbox.css @@ -5,16 +5,6 @@ * - bookmark bar (toolbar#PersonalToolbar) * - add-ons can add their own toolbars (toolbar) */ -/* buttons on left headerbar */ -@import "left_header_button_3.css"; -/*@import "left_header_button_4.css";*/ -/*@import "left_header_button_5.css";*/ - -/* buttons on right headerbar */ -@import "right_header_button_3.css"; -/*@import "right_header_button_4.css";*/ -/*@import "right_header_button_5.css";*/ - @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; #nav-bar, #PersonalToolbar, #toolbar-menubar { diff --git a/src/other/firefox/Monterey/parts/right_header_button_3.css b/src/other/firefox/Monterey/right_header_button_3.css similarity index 100% rename from src/other/firefox/Monterey/parts/right_header_button_3.css rename to src/other/firefox/Monterey/right_header_button_3.css diff --git a/src/other/firefox/Monterey/parts/right_header_button_4.css b/src/other/firefox/Monterey/right_header_button_4.css similarity index 100% rename from src/other/firefox/Monterey/parts/right_header_button_4.css rename to src/other/firefox/Monterey/right_header_button_4.css diff --git a/src/other/firefox/Monterey/parts/right_header_button_5.css b/src/other/firefox/Monterey/right_header_button_5.css similarity index 100% rename from src/other/firefox/Monterey/parts/right_header_button_5.css rename to src/other/firefox/Monterey/right_header_button_5.css diff --git a/src/other/firefox/userChrome.css b/src/other/firefox/userChrome.css index b9adcd4..fdcc4e1 100644 --- a/src/other/firefox/userChrome.css +++ b/src/other/firefox/userChrome.css @@ -1,15 +1,35 @@ +/*------------------------USAGE---------------------------- + * Remove "/*" at the begining of "@import" line to ENABLE. + * Add "/*" at the begining of "@import" line to DISABLE. + */ -/* Import theme */ + +/*-------------------Choose your theme--------------------- + * Enable one of these themes and disable the other ones. + */ @import "WhiteSur/theme.css"; /**/ /*@import "Monterey/theme.css"; /**/ -/* - * Here you can enable other theme features not included by default. - * To enable a specific feature, uncomment its @import line by removing "/*" at - * the beginning of the line. To disable it, put the "/*" back. + +/*--------------Configure your Monterey theme-------------- + * ONLY for Monterey theme + * Enable one of these options and disable the other ones. */ +/* How many buttons on left headerbar */ +@import "Monterey/left_header_button_3.css"; +/*@import "Monterey/left_header_button_4.css";*/ +/*@import "Monterey/left_header_button_5.css";*/ + +/* How many buttons on right headerbar */ +@import "Monterey/right_header_button_3.css"; +/*@import "Monterey/right_header_button_4.css";*/ +/*@import "Monterey/right_header_button_5.css";*/ + + +/*--------------Configure common theme features--------------*/ + /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ @@ -38,9 +58,5 @@ /* Hide window buttons (close/min/max) in maximized windows */ /*@import "WhiteSur/hide-window-buttons.css"; /**/ -/* Import a custom stylesheet - * Everything you add in your customChrome.css file (it doesn't exist by - * default) will be included here and preserved between updates, so you can move - * your configuration to that file if you don't like setting it up after every - * update. You can also apply your own custom styles in that file. */ +/* Import your custom stylesheet */ @import "customChrome.css"; /**/