diff --git a/bin/update-default-backgrounds b/bin/update-default-backgrounds deleted file mode 100755 index f0d85db2..00000000 --- a/bin/update-default-backgrounds +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -DESTDIR=share/desktop-base/kali-theme -DESKTOP_BACKGROUND=$(echo $1 | sed 's/\..\+//') -DESKTOP_BACKGROUND_EXTENSION=$(echo $1 | grep -o '\..\+') -DESKTOP_BACKGROUND_PURPLE=$(echo $2 | sed 's/\..\+//') -DESKTOP_BACKGROUND_PURPLE_EXTENSION=$(echo $2 | grep -o '\..\+') -LOGIN_BACKGROUND=$(echo $3 | sed 's/\..\+//') -LOGIN_BACKGROUND_EXTENSION=$(echo $3 | grep -o '\..\+') - -# login/lockscreen -ln -sfv ../../../backgrounds/kali/${LOGIN_BACKGROUND}.xml ${DESTDIR}/lockscreen/gnome-background.xml -ln -sfv ../../../backgrounds/kali/${LOGIN_BACKGROUND}-16x9${LOGIN_BACKGROUND_EXTENSION} ${DESTDIR}/login/background - -# Desktop background -kde_wallpaper=$(echo ${DESKTOP_BACKGROUND} | sed -E 's/(^|-)([a-z])/\U\2/g') -kde_wallpaper_purple=$(echo ${DESKTOP_BACKGROUND_PURPLE} | sed -E 's/(^|-)([a-z])/\U\2/g') -ln -sfv ../../../backgrounds/kali/${DESKTOP_BACKGROUND}.xml ${DESTDIR}/wallpaper/gnome-background.xml -ln -sfv ../../../backgrounds/kali/${DESKTOP_BACKGROUND_PURPLE}.xml ${DESTDIR}/wallpaper/gnome-background-purple.xml -ln -nsfv ../../../wallpapers/${kde_wallpaper}/contents ${DESTDIR}/wallpaper/contents -sed -i "s/defaultWallpaperTheme=.*/defaultWallpaperTheme=${kde_wallpaper}/" share/plasma/desktoptheme/kali/metadata.desktop -sed -i "s/defaultFileSuffix=.*/defaultFileSuffix=${DESKTOP_BACKGROUND_EXTENSION}/" share/plasma/desktoptheme/kali/metadata.desktop -sed -i "s/defaultWallpaperTheme=.*/defaultWallpaperTheme=${kde_wallpaper_purple}/" share/plasma/desktoptheme/kali-purple/metadata.desktop -sed -i "s/defaultFileSuffix=.*/defaultFileSuffix=${DESKTOP_BACKGROUND_PURPLE_EXTENSION}/" share/plasma/desktoptheme/kali-purple/metadata.desktop - -# default background symlink for XFCE -mkdir -p share/backgrounds/kali-16x9 -ln -sf ${DESKTOP_BACKGROUND}${DESKTOP_BACKGROUND_EXTENSION} share/backgrounds/kali-16x9/default -sed -i '/default-purple/d' debian/kali-themes-purple.links -echo "/usr/share/backgrounds/kali-16x9/${DESKTOP_BACKGROUND_PURPLE}${DESKTOP_BACKGROUND_PURPLE_EXTENSION} /usr/share/backgrounds/kali-16x9/default-purple" >> debian/kali-themes-purple.links diff --git a/bin/update-maintainer-scripts b/bin/update-maintainer-scripts deleted file mode 100755 index 80eed902..00000000 --- a/bin/update-maintainer-scripts +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -update_script() { - local script=$1 - ( - sed -n -e '1,/^FILES_TO_DIVERT="/ p' $script - cat files-to-divert - sed -n -e '/^" # END FILES_TO_DIVERT/,$ p' $script - ) > $script.new - mv $script.new $script -} - -update_script debian/kali-themes.preinst -update_script debian/kali-themes.postinst -update_script debian/kali-themes.postrm diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 41a4af3b..00000000 --- a/debian/changelog +++ /dev/null @@ -1,1478 +0,0 @@ -kali-themes (2024.1.6) kali-dev; urgency=medium - - [ Lucas Parsy ] - * copy vpn ip when clicking on its icon in xfce taskbar - - [ Daniel Ruiz de Alegría ] - * Icons: add gtkhash app icon - * XFCE: genmon script tweaks - - -- Daniel Ruiz de Alegría Thu, 08 Feb 2024 13:04:40 +0100 - -kali-themes (2024.1.5) kali-dev; urgency=medium - - * Fix optimized png boot background not working - * Upload correct images - - -- Daniel Ruiz de Alegría Fri, 02 Feb 2024 17:34:40 +0100 - -kali-themes (2024.1.4) kali-dev; urgency=medium - - * Improve readability of boot menu background - * Optimize boot png assets - * Remove text from desktop-base logo - * Icons: Add missing icon hwloc - * Icons: Add app icon symlinks - * Icons: copy Flat-Remix icon theme update - * Icons: Add missing KDE backups app icon - * Icons: Add new gimp app - * Remove wrong icon - * Add sparrow-wifi app icon - - -- Daniel Ruiz de Alegría Fri, 02 Feb 2024 10:02:58 +0100 - -kali-themes (2024.1.3) kali-dev; urgency=medium - - * Set correct wallpaper in gnome for Kali Purple - * Install default-purple link only for kali-themes-purple - * XFCE: fix cpugraph crash - - -- Daniel Ruiz de Alegría Fri, 26 Jan 2024 14:39:47 +0100 - -kali-themes (2024.1.2) kali-dev; urgency=medium - - * Fix desktop background not working in KDE - * Improve script to update default login/desktop backgrounds - * Update changelog for 2024.4.2 - - -- Daniel Ruiz de Alegría Wed, 24 Jan 2024 18:04:57 +0100 - -kali-themes (2024.1.1) kali-dev; urgency=medium - - * Set new wallpaper for Kali Purple - * Fix Kali Purple's background path - - -- Daniel Ruiz de Alegría Wed, 24 Jan 2024 16:39:50 +0100 - -kali-themes (2024.1.0) kali-dev; urgency=medium - - * Recover previous boot menu backgrounds - * Upload first update for boot menu backgrounds - * Update boot menu background - * Add info about all boot menu file locations - * Optimize boot menu background - * Depend on 2024 wallpapers package - * Add bottom black gradient to iso boot background - * Configure new default wallpapers - * Use jpg file for background and login images - * Use image without extension desktop-base desktop-background - - -- Daniel Ruiz de Alegría Wed, 24 Jan 2024 08:38:33 +0100 - -kali-themes (2023.4.5) kali-dev; urgency=medium - - * Add qt6ct themes for Kali-Purple - * Lighten background of dark gtk sourceview theme - - -- Daniel Ruiz de Alegría Sat, 25 Nov 2023 18:53:08 +0100 - -kali-themes (2023.4.4) kali-dev; urgency=medium - - * Improve qt themes - * Icons: Add missing category icons from kali-menu - * Icons: Update app icons from kali-menu - - -- Daniel Ruiz de Alegría Fri, 17 Nov 2023 14:12:43 +0100 - -kali-themes (2023.4.3) kali-dev; urgency=medium - - * Add settings for qt6ct - * Add themes for qt6 - - -- Daniel Ruiz de Alegría Wed, 15 Nov 2023 16:30:00 +0100 - -kali-themes (2023.4.2) kali-experimental; urgency=medium - - * Make SUBDIRS parameter modifiable in makefile - * Fix transparent menubar in gnome-terminal - * Improve color-scheme for gtk sourceview theme - * Gnome-Shell: Update upstream theme for version 45.rc - * Gnome-Shell: Update theme tweaks - * Update gnome-shell versions in control file 'Breaks' - * Gnome-Shell: Regenerate theme - * Gnome-Shell: Remove unneeded assets - * Gnome-Shell: update sync script upstream version to 45.0 - * Gnome-Shell: Remove slider handle - * Gnome-Shell: regenerate themes - - -- Daniel Ruiz de Alegría Wed, 08 Nov 2023 13:34:52 +0100 - -kali-themes (2023.4.1) kali-dev; urgency=medium - - * Icons: Add impacket-scripts symlink icon - * Icons: Add dirsearch icon - * Icons: Add villain icon - * Icons: Update rekono app icon - * Update whiskermenu settings for version 2.8.0 - - -- Daniel Ruiz de Alegría Tue, 19 Sep 2023 16:54:59 +0200 - -kali-themes (2023.4.0) kali-dev; urgency=medium - - * Add kali autopilot icon - * Add gvm icon - * Add rekono icon - * Add kaboxer-rekono.svg symlink - * Remove rekono top shadow - - -- Daniel Ruiz de Alegría Fri, 18 Aug 2023 12:22:41 +0200 - -kali-themes (2023.3.3) kali-dev; urgency=medium - - * Fix updated icons from kali-menu - * Fix gnome text-editor icon - - -- Daniel Ruiz de Alegría Fri, 11 Aug 2023 10:23:06 +0200 - -kali-themes (2023.3.2) kali-dev; urgency=medium - - * Force rm to prevent breaking preinst script if file doens't exist - - -- Daniel Ruiz de Alegría Fri, 21 Jul 2023 17:59:31 +0200 - -kali-themes (2023.3.1) kali-dev; urgency=medium - - * Icons: Update Flat-Remix icon themes - * Icons: fix symlink for actions/symbolic - * Move kali-purple env file for plasma - * Remove config file to avoid conflict with kali-themes-purple - * Fix moved file to kali-themes-purple via 'Breaks' parameter - * Add purple face icon - * Remove old config file in postinst - * Remove config file to avoid conflict with kali-themes-purple - - -- Daniel Ruiz de Alegría Thu, 13 Jul 2023 16:08:14 +0200 - -kali-themes (2023.3.0) kali-dev; urgency=medium - - * Add symlink for impacket-scripts - * GNOME: Update for gnome-shell 44.2 - - -- Daniel Ruiz de Alegría Wed, 07 Jun 2023 13:17:02 +0200 - -kali-themes (2023.2.4) kali-dev; urgency=medium - - * Update icons from kali-menu - - -- Daniel Ruiz de Alegría Tue, 16 May 2023 19:48:50 +0200 - -kali-themes (2023.2.3) kali-dev; urgency=medium - - * Update icons from kali-menu - - -- Daniel Ruiz de Alegría Fri, 28 Apr 2023 11:24:22 +0200 - -kali-themes (2023.2.2) kali-dev; urgency=medium - - * Gnome-Shell: minor theme fixes - * Gnome-Shell: Add tiling assistant extension - - -- Daniel Ruiz de Alegría Tue, 04 Apr 2023 11:52:12 +0200 - -kali-themes (2023.2.1) kali-experimental; urgency=medium - - * Gnome-Shell: sync upstream - * Gnome-Shell: add missing color variables - * Gnome-Shell: update search result - * Gnome-Shell: update dashboard and icon-grid - * Gnome-Shell: sync _colors.scss with upstream changes - * Gnome-Shell: regenerate themes - * Set min version for gnome-shell - * Gnome-Shell: update search entry - * Gnome-Shell: fix icon color in quick settings using light theme - * Use gnome:Version and gnome:NextVersion variables for 'Breaks' conditions - * Better use numbered gnome-shell versions in 'Breaks' conditions - - -- Daniel Ruiz de Alegría Wed, 29 Mar 2023 23:28:04 +0200 - -kali-themes (2023.2.0) kali-dev; urgency=medium - - * Fix Makefile scripts - - -- Daniel Ruiz de Alegría Mon, 20 Mar 2023 17:30:03 +0100 - -kali-themes (2023.1.8) kali-dev; urgency=medium - - * Fix purple themes - - -- Daniel Ruiz de Alegría Sat, 11 Mar 2023 10:02:06 +0100 - -kali-themes (2023.1.7) kali-dev; urgency=medium - - [ Arnaud Rebillout ] - * Replace 'which' with 'command -v' - - [ Daniel Ruiz de Alegría ] - * Revert "KDE: dirty fix for blurry background image" - * KDE: fix purple theme configuration - - -- Daniel Ruiz de Alegría Thu, 09 Mar 2023 13:11:22 +0100 - -kali-themes (2023.1.6) kali-dev; urgency=medium - - * KDE: xdg-user-dirs fix is now included in desktop-base - * Divert kcm-about-distrorc from desktop-base to show Kali instead of Debian - * KDE: dirty fix for blurry background image - - -- Daniel Ruiz de Alegría Thu, 02 Mar 2023 17:32:42 +0100 - -kali-themes (2023.1.5) kali-dev; urgency=medium - - * Icons: Add Purple variant for kali-menu icon - - -- Daniel Ruiz de Alegría Fri, 17 Feb 2023 16:59:50 +0100 - -kali-themes (2023.1.4) kali-dev; urgency=medium - - * Remove trailing whitespace in changelog - * Use same version dependency of kali-themes in kali-themes-mobile and kali-themes-purple - - -- Daniel Ruiz de Alegría Wed, 15 Feb 2023 09:22:47 +0100 - -kali-themes (2023.1.3) kali-dev; urgency=medium - - * Qt: set breeze as default theme - * Add config for alacritty - * Icons: Add Flat-Remix Purple variant - * Add Kali Purple themes - * Qt: add themes for Kali Purple - * gsettings for Kali Purple - * Revert "Qt: set breeze as default theme" - * Set kali-themes-purple package layout - * Add Kali Purple settings - * Fix Kali Purple themes for GNOME - * Fix debian/rules - * Fix name of adw-gtk3 theme - * Configure background for kali purple in all desktops - * Set symlink for kali purple background on xfce - * KDE: set color-scheme for Kali Purple - * Some package fixes - * Add Kali Purple themes for KDE Plasma - * KDE: tweak Kali Purple themes - * Configure all terminals for Kali Purple themes - * Make piuparts happy - * Force install config files - - -- Daniel Ruiz de Alegría Mon, 13 Feb 2023 12:19:12 +0100 - -kali-themes (2023.1.2) kali-dev; urgency=medium - - * Xfce: set lightdm themes to dark - * New boot background - * Optimize boot images - * Grub: make timeout label visible with new background - * Revert "Xfce: set lightdm themes to dark" - * Configure new login background - * Set dependency for new wallpapers package - * Xfce: use non-symbolic icons in systray - * Improve monospace colors in cherrytree - * Add open-terminal-here shortcut for nautilus - * Set kali-moto as default background - * Make lintian happy - - -- Daniel Ruiz de Alegría Mon, 06 Feb 2023 11:40:38 +0100 - -kali-themes (2023.1.1) kali-dev; urgency=medium - - * Xfce: Improve wording of autostart file that mutes motherboard beep - * Xfce: add custom kali panel layouts for xfce4-panel-profiles - * Fix xfce-panel-profiles/Makefile - * Symlink xubuntu-logo-menu.svg to kali panel icon - * Xfce: rename panel profile 'Kali Light' as 'Kali Slim' - * Xfce: rename panel profile 'Kali Light' as 'Kali compact' - - -- Daniel Ruiz de Alegría Wed, 11 Jan 2023 11:23:43 +0100 - -kali-themes (2023.1.0) kali-dev; urgency=medium - - * Xfce: panel vpn script show also ip for tap interfaces - * Xfce: enable theme sync for gtk and xfwm themes - * Xfce: exclude texdoctk in settings panel - * Xfce: update panel clock settings for 4.18 - * Xfce: readjust height of whiskermenu - * Revert "Xfce: fix duplicated launcher in xfce4-panel (fixes #139)" - * Force installation of config files - * Xfce: Remove catfish shortcuts in thunar - - -- Daniel Ruiz de Alegría Wed, 21 Dec 2022 10:36:17 +0100 - -kali-themes (2022.4.5) kali-dev; urgency=medium - - * Set nethunter wallpaper for phosh background - - -- Daniel Ruiz de Alegría Wed, 23 Nov 2022 11:00:05 +0100 - -kali-themes (2022.4.4) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add settings for Phosh shell - * Phosh enable scale-to-fit - * Update plymouth theme to support smaller displays - * Fixes to kali-themes-phosh package - * Xfce: fix images are opened with firefox instead of ristretto - * KDE: fix default folders in home dir don't get created - * Configure package for mobile theme - * Rename phosh with mobile - * Fixes for kali-themes-mobile - - [ Steev Klimaszewski ] - * Add d/watch - - -- Daniel Ruiz de Alegría Mon, 21 Nov 2022 16:11:04 +0100 - -kali-themes (2022.4.3) kali-dev; urgency=medium - - * Make lintian happy - * Update compton.conf and add picom.conf - * sort files-to-divert - * Force installation of config files - - -- Daniel Ruiz de Alegría Sun, 13 Nov 2022 16:21:05 +0100 - -kali-themes (2022.4.2) kali-dev; urgency=medium - - * Gnome-Shell: Update theme for gnome 43 - * Set darker background-pattern for gtksourceview-5 - * Bump gnome-shell version - - -- Daniel Ruiz de Alegría Mon, 26 Sep 2022 11:21:42 +0200 - -kali-themes (2022.4.1) kali-dev; urgency=medium - - * Fix gsettings - - -- Daniel Ruiz de Alegría Wed, 21 Sep 2022 12:43:29 +0200 - -kali-themes (2022.4.0) kali-dev; urgency=medium - - * Icons: add symlink for peass-ng - * Icons: Update faraday icon - * Add rizin app icon and update cutter - * Set new theme for gnome - * GTK4: add color-schemes for text editor - * Settings for new gnome-text-editor - * Gnome-Shell: replace gedit with gnome-text-editor in dash favorites - * Set dark mode for gnome-terminal - * Fix gsettings - * Icons: add missing icon for gnome-text-editor - * Change background and selection color for kali-dark theme for gtksourceview-5 - - -- Daniel Ruiz de Alegría Mon, 19 Sep 2022 19:53:28 +0200 - -kali-themes (2022.3.2) kali-dev; urgency=medium - - * Add icon for peass - * Remove unused grub font - * Grub: use default font - * Icons: fix size of ac-adapter icon in xfce-panel - - -- Daniel Ruiz de Alegría Tue, 28 Jun 2022 21:51:29 +0200 - -kali-themes (2022.3.1) kali-dev; urgency=medium - - [ Arnaud Rebillout ] - * Define a drop_diversion function in the postrm script - * Nitpicks in maintainer scripts - - [ Daniel Ruiz de Alegría ] - * Xfce: fix duplicated launcher in xfce4-panel (fixes #139) - * Xfce: add hidden value to autostart file instead of removing it - - -- Daniel Ruiz de Alegría Fri, 03 Jun 2022 09:43:28 +0200 - -kali-themes (2022.3.0) kali-dev; urgency=medium - - * Icons: update Flat-Remix icon theme - * Fix symlink for symbolic 'actions' icons - * Icons: remove window symbolic icons from elementary - * Change dash-to-dock version - * Configure dash-to-dock to disable overview on startup - - -- Daniel Ruiz de Alegría Fri, 27 May 2022 11:51:36 +0200 - -kali-themes (2022.2.4) kali-dev; urgency=medium - - * Update sync upstream version for gnome-shell 42.0 - * Update icon theme - - -- Daniel Ruiz de Alegría Mon, 25 Apr 2022 17:14:39 +0200 - -kali-themes (2022.2.3) kali-dev; urgency=medium - - * Gnome-Shell: update upstream code to gnome 42 - * Gnome-Shell: generate new gnome themes - * Gnome-Shell: reduce font size - * Gnome-Shell: update theme tweaks for search-entry, search-results, and - window-picker - * Gnome-Shell: remove border to search results - * Gnome-Shell: update slider theme tweaks - * Gnome-Shell: remove workspaces-switcher theme tweaks - * Gnome-Shell: update panel theme tweaks - * Gnome-Shell: update app-grid theme tweaks - * Gnome-Shell: update dash theme tweaks - * Gnome-Shell: set recording indicator text color to white - * Gnome-Shell: update keyboard theme tweaks - * Gnome-Shell: remove slider barlevel border - * Gnome-Shell: update calendar theme tweaks - * Gnome-Shell: code cleanup - * Gnome-Shell: update checkbox theme tweaks - * Gnome-Shell: update switches theme tweaks - * Gnome-Shell: reduce height of switch assets - * Gnome-Shell: update upstream to 42.rc - * Gnome-Shell: remove old assets - * Gnome-Shell: update message list theme tweaks - * Gnome-Shell: tweak switches - * Gnome-Shell: update popover theme tweaks - * Gnome-Shell: change shadow to notification-banner - * Gnome-Shell: change bg colors of buttons and cards - * Gnome-Shell: tweak notifications in calendar panel - * Gnome-Shell: lighten icon shadow - * Gnome-Shell: update osd theme tweaks - * Gnome-Shell: theme screenshot dialog - * Gnome-Shell: theme workspace switcher - * Update 'breaks' version for gnome-shell - * Gnome-Shell: tweak theme shadows - * Gnome-Shell: reduce opacity of panel shadow - * Remove gnome-backgrounds.xml diversion for GNOME 42 - * Gnome-Shell: update settings for dash-to-dock extensions - * Gnome-Shell: replace dash-to-dock extension with ubuntu-dock - * Gnome-Shell: add settings for picture-uri-dark - * Gnome-Shell: fix icon-shadow in dash - - -- Daniel Ruiz de Alegría Wed, 20 Apr 2022 21:03:20 +0200 - -kali-themes (2022.2.2) kali-dev; urgency=medium - - * GTK3: fix gnome-terminal transparent scrollbar - * GTK4: style app-notifications and scrollbars - * GTK: Update gtk themes - * GTK4: add libhandy styles - * Force install panel/default.xml config file - * Xfce: reduce size of panel for light variant - * Xfce: reduce size of panel for light variant - * Gnome-Shell: fix dashtodock bug with external drives - - -- Daniel Ruiz de Alegría Fri, 15 Apr 2022 18:19:49 +0200 - -kali-themes (2022.2.1) kali-dev; urgency=medium - - * GTK3: fix missing dark theme in Kali-Dark - * GTK3: tweak nautilus 42 theme - * Add autostart script to copy missing config files from /etc/skel - * Xfce: add alternative light panel configs - * Xfce: use alternative panel for arm devices - * GTK: configure prefer-dark color-scheme - * Revert "Add autostart script to copy missing config files from /etc/skel" - * wrap-and-sort -ast - * Update packaging - - -- Daniel Ruiz de Alegría Fri, 01 Apr 2022 13:07:05 +0200 - -kali-themes (2022.2.0) kali-dev; urgency=medium - - * Xfce: configure mousepad add-last-end-of-line - * Xfce: configure mouse size to fix auto-scaling - * GTK3: fix theme for whiskermenu in icons mode - * GTK3: don't remove hovered background in whiskermenu iconview - * Icons: fix symlink for symbolic action icons - * Xfce: disable logout beep sound - * Xfce: add more monitors with the default wallpaper - * GTK3: update theme for gedit and nautilus - * GTK3: use nautilus style for version 42.beta - * Force install xfce4-desktop.xml - - -- Daniel Ruiz de Alegría Fri, 04 Mar 2022 17:38:08 +0100 - -kali-themes (2022.1.1) kali-dev; urgency=medium - - * Resize live image grub background - * Xfce: fix mousepad headerbar - - -- Daniel Ruiz de Alegría Tue, 18 Jan 2022 12:33:34 +0100 - -kali-themes (2022.1.0) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Gnome-Shell: Make some widgets in the calendar popup more flat - * GTK3: improve default-decoration background - * GTK3: reduce Kali logo size in headerbar - * GTK3: change background of default-headerbar on backdrop - * GTK3: fix lightdm button color - * QT: configure standard dialogs to gtk3 - * Add keyboard layout menu to lightdm - * XFWM4: remove 1.5x scale HiDPI themes - * GTK3: Improve scrollbar visibility - * Update theme css - * Gnome-Shell: improve background for hovered items in calendar popover - * KDE: remove old aurorae themes - * Configure cherrytree color-schemes and theme - * Qt: match scrollbar size with gtk3 themes - * Qt: increase scrollbar border-radius - * Xfce: hide battery percentage - * Icons: Update flat-remix icon theme - * GTK3: fix hovered titlebuttons in firefox - * Update configuration for kali-wallpapers 2022 - * Configure new login background - * Configure new desktop background - * Qt: Fix qt scrollbar - * Nitpick in xfce4-panel-genmon-vpnip.sh - * New grub backgrounds - * Remove duplicated grub background file - - [ Ben Wilson ] - * Update email address - * Update control - - [ Arnaud Rebillout ] - * Add Rules-Requires-Root - * Set Section to oldlibs for transitional packages - - -- Arnaud Rebillout Wed, 12 Jan 2022 10:51:12 +0700 - -kali-themes (2021.4.2) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * GTK3: Improve decoration round corners - * GTK3: remove side marging of titlebuttons inside default-decoration - headerbar - * GTK3: give volume to check and radio widgets - * GTK3: Update css files - * Xfce: add custom VPN IP plugin to the panel - * Qt: set breeze as the default theme - * Revert "GTK3: remove side marging of titlebuttons inside - default-decoration headerbar" - * Add xfce4-panel-genmon-vpnip.sh script for xfce panel - * Xfce: add cpugraph plugin to the panel - * Xfce: set number of workspaces to 4 - * Xfce: organize panel widgets - * Xfce: add cpugraph configuration - * Xfce: move panel active indicator - * Update css files - * Xfce: only show icons in panel tasklist - * Fix lintian error package-contains-file-in-etc-skel - * Move lintian overrides for package-contains-file-in-etc-skel to the - correct package - * Xfce: remove separator after whiskermenu panel widget - * Xfce: add shadow to whiskermenu button - * Disable unwanted backgrounds in gnome-background-properties - * Disable unwanted backgrounds in KDE - * Fix kali-themes.postrm script - * Force install updated config files - * Properly remove diverted wallpapers after package remove - * Gnome-Shell: Make folder shadow a bit lighter to improve contrast - * GTK3: remove side marging of titlebuttons inside default-decoration - headerbar - * Update css files - * Xfce: fix panel widget IDs - * Copy gsettings from kali-defaults and reorganize them - * Gnome-Shell: shrink dash and add padding - * Xfce: if installed, replace default-browser with firefox in xfce4-panel - * Xfce: configure lockscreen before shutdown - * Force install xfce4-session.xml config file - * Xfce: add trigger to include extra apps in xfce-settings-manager - * GTK3: remove shadow to default-decoration titlebar - * Revert "Xfce: add trigger to include extra apps in xfce-settings-manager" - * Xfce: include extra apps in xfce-settings-manager - * Gnome-Shell: remove dash-to-dock padding - * KDE: configure menu favorites - * Add categories to xfce-text-editor.desktop and update based on mousepad - * GTK3: improve backdrop window shadow - * Xfce: replace mousepad with xfce-text-editor in the panel - * Xfce: fix bug in xfwm theme with titlbuttons and cursor - * Xfce: update xfwm theme assets - * Xfce: add powershell to terminals drop-down - * Move kwin-style-kali dependency to kali-desktop-kde - * Configure onboard as virtual keyboard for lightdm - * Add settings for onboard theme - * Icons: Update flat-remix icon theme - - [ Arnaud Rebillout ] - * Add lightdm-gtk-greeter.conf to files to update (postinst) - * Sort list of files to update (postinst) - * Revert "Qt: set breeze as the default theme" - * Drop diversion of Debian wallpapers - * Simplify backgrounds diversion, now that there's only one file - - -- Arnaud Rebillout Tue, 09 Nov 2021 18:55:18 +0700 - -kali-themes (2021.4.1) kali-dev; urgency=medium - - * Gnome-Shell: Update for GNOME 40 - * Gnome-Shell: Update for GNOME 41 - * Update breaks gnome-shell to (<< 40.2)' - * Fix indentation in control file - * GTK3: theme titlebuttons only inside headerbars - * Revert "GTK3: theme titlebuttons only inside headerbars" - * KDE: Add new kwin theme based on breeze - * Move kwin5 theme inside src folder - * KDE: change kwin library name to kali-breeze - * KDE: fix kwin theme cmake build script - * KDE: configure packaging of kwin theme - * Fix Makefile install for kwin theme - * KDE: Add kwin theme lib to kali-themes-common package - * KDE: remove aurorae themes - * KDE: recover aurorae themes to prevent ugly fallback kwin theme - * KDE: configure titlebuttons - * Fix lintian errors - * Move kwin5 to a separate package - * Add missing '.install' text in debian/kwin5-style-kali file - * Xfce: new titlebuttons for xfwm4 - * GTK3: new titlebuttons design - * GTK4: new titlebuttons design - * GTK3: add styles for budgie desktop - * Regenerate css files - * Xfce: update themerc files - * Xfce: improve xfwm4 themes with rounded corners - * Xfce: fix xfwm4 bottom-right assets - * Xfce: regenerate xfwm4 assets - * KDE: replace kwrite with kate - * Fix kwin theme package name - * Force install for /etc/xdg/kwinrc - * Avoid theme update for older kali-desktop-kde installations - * Add kwin-style-kali to kali-themes - * Fix force install /etc/xdg/kwinrc - * Remove strict version dependency of kwin-style-kali - * Move GNOME 40 themes to separate branch for release - * Xfce: hide content of windows when resizing - * Xfce: configure cycle_raise and borderless_maximize in xfwm - * Force install xfwm4.xml - * KDE: update previews of look-and-feel themes - * Update changelog for 2021.4.1 - * Set Breaks gnome-shell back to 3.38 as themes for gnome 40 have been - reverted - * Update changelog - * Move kwin themes to a separate package - * Revert "Move GNOME 40 themes to separate branch for release" - * Revert "Set Breaks gnome-shell back to 3.38 as themes for gnome 40 have - been reverted" - - -- Daniel Ruiz de Alegría Wed, 13 Oct 2021 10:33:55 +0200 - -kali-themes (2021.4.0) kali-dev; urgency=medium - - * Add symlinks for kali-tools - * GTK3: Remove icon scale to xfce power widget - * GTK3: Improve legibility of nautilus sidebar on backdrop - * GTK3: Update theme css - * GTK2: Fix missing hacks and apps rc files - * Add librsvg2-common dependency - - -- Daniel Ruiz de Alegría Wed, 15 Sep 2021 09:43:38 +0200 - -kali-themes (2021.3.2) kali-dev; urgency=medium - - * Move kali-panel-menu.svg icon from kali-menu - * KDE: fix panel launchers - * Add Breaks and Replaces kali-menu (<< 2021.3.2) - - -- Daniel Ruiz de Alegría Fri, 27 Aug 2021 13:48:30 +0200 - -kali-themes (2021.3.1) kali-dev; urgency=medium - - * Replace gtk2-engines-murrine with gtk2-engines-pixbuf from kali-themes-common package suggests - * Fix default-browser.desktop - - -- Daniel Ruiz de Alegría Tue, 17 Aug 2021 17:33:55 +0200 - -kali-themes (2021.3.0) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Improve gtk-sourceview's colorschemes - * Remove qterminal setting MotionAfterPaste - * GTK2: Create new dark theme based on adwaita - * GTK2: Create new light theme based on adwaita - * Use the correct engine for gtk2 themes - * Revert "Use the correct engine for gtk2 themes" - * Use the correct engine for gtk2 themes - * GTK2: Add volume to tabs - * GTK2: Render assets - * GTK3: update libhandy to 1.2.3 - * GTK3: fix stackswitcher-button checked background - * GTK3: update sync script for 3.24.30 - * GTK3: generate CSS - * Xfce: add keyboard shortcut for xfce4-taskmanager - * Xfce: remove shortcut for kazam - * Force update of qterminal settings - * Add helper-script for the default browser to fix isues with firefox and - root user - * Force update of kdeglobals and xfce4/helpers.rc - * Remove sensible-utils - * Fix default browser in KDE and XFCE - * Remove executable permissions to gtkrc theme files - * Icons: Update from upstream 20210620 - * GTK3: improve visibility and theme of xfce's notifications and logout - dialog - * GTK3: improve button's background and shadows - * GTK3: improve design of sidebar row - * GTK3: fix border-color for colored buttons - * GTK3: Join sidebars with left headerbars - * Fix background of checked stackswitcher button - * Fix background color of hovered popover elements - * GTK3: regenerate CSS theme files - * Icons: fix Flat-Remix-Blue-Light/actions/symbolic/ symlink to - Flat-Remix-Blue-Dark theme - - [ Arnaud Rebillout ] - * Order mimeapps.list alphabetically - - -- Arnaud Rebillout Fri, 13 Aug 2021 22:40:00 +0700 - -kali-themes (2021.2.4) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Icons: Update flat-remix icon theme - * Xfce: change firefox link with default-browser - * install_config_files: xfce4-panel settings - - -- Arnaud Rebillout Thu, 20 May 2021 09:51:05 +0700 - -kali-themes (2021.2.3) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add 'open as root' action for thunar - * install_config_files: thunar accels.scm and uca.xml - * Improve icons for thunar actions - * GTK3 & GTK4 tweaks - - -- Arnaud Rebillout Tue, 18 May 2021 13:47:02 +0700 - -kali-themes (2021.2.2) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Run screenshot sound in the background - * Tweaks qterminal settings - - [ Arnaud Rebillout ] - * Fix Kali-Light/gtk-3.0/assets dir to symlink - - -- Arnaud Rebillout Tue, 11 May 2021 21:34:43 +0700 - -kali-themes (2021.2.1) kali-dev; urgency=medium - - * Update xfce panel favorites - * Xfce: Add root terminal to menu favorites - * Add grid background to gedit - * Configure mousepad text-editor - * Add panel favorites for KDE (fixes #123) - * Remove qterminal history limit - * GTK3: make dark buttons lighter - * GTK3: fix dark button hover animation - * GTK3: update _drawing.scss.patch with new changes - * GTK3: Update 3.24.28 - * GTK3: change tabs background color - * GTK3: increase app notification border-radius - * GTK3: make backdrop border-color more visible - * GTK4: Add gtk4 theme with custom kali colors - * GTK3: Match gtk4 widget sizes - * GTK4: Add assets - * GTK4: Add missing assets - * GTK4: Update 4.1.0 - * GTK3: Renamve gtk 3 css files - * Reorganize scss source files - * GTK4: Add _common-tweaks and _applications scss - * GTK4: Customize button widgets - * GTK4: Customize headerbar - * GTK4: Customize stackswitcher - * GTK4: Customize entries - * GTK4: Add volume to button widgets - * GTK4: Customize tabs - * GTK4: Customize headerbar inside dialog window - * GTK4: Fix inset shadow of entry widgets - * GTK4: Remove shadows to disabled buttons - * GTK4: Customize switches - * GTK4: Tweak switch slider on backdrop state - * GTK4: Customize check and radio widgets - * GTK4: Add setting for compact widgets - * Revert "GTK3: Match gtk4 widget sizes" - * GTK4: Reduce button border-radius - * GTK4: Fix tab paddings - * GTK4: Customize tree views - * GTK4: Customize window decoration - * Update symbolic assets for GTK4 - * GTK4: add missing $_wm_border variable - * GTK themes' makefile, ensure all directories are created - * sass make build, run clean first - * GTK3 & GTK4: regenerate css files - * Fix ln inside gtk3's makefile - * GTK4: match gtk3, make dark buttons lighter - * GTK4: match gtk3 tabs background - * GTK4: regenerate css - * Force install updates inside etc files - * Xfce: add keyboard shortcut for root-terminal - - -- Daniel Ruiz de Alegría Tue, 20 Apr 2021 12:34:47 +0200 - -kali-themes (2021.2.0) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add subterminal colapse shortcut for qterminal - * GTK3: Update 3.24.26 - * GTK3: Make scrollbar slider smaller - * GTK3: Regenerate css - * Xfce & GTK3: Fix battery icon size in xfce4-panel - * GTK3: Update 3.24.27 - * Icons: Add airgeddon & fix ac-adapter-symbolic - * GTK3: Make backdrop border color more visible - * Xfce: Add root terminal to panel - * Set the new default wallpapers - * Add missing comma for debian/control - * Set kali-wallpapers-2020.4 dependency >= 2021.2.0 - * Set lightdm theme to light - * Force install updates inside etc files - - -- Arnaud Rebillout Thu, 01 Apr 2021 10:05:20 +0700 - -kali-themes (2021.1.3) kali-dev; urgency=medium - - * Revert: "Xfce: remove xcape and use super key to show the menu" - * Force install xfce4-keyboard-shortcuts.xml - * Set min height and width for qt-fusion custom scrollbars - - -- Daniel Ruiz de Alegría Fri, 12 Feb 2021 12:50:22 +0100 - -kali-themes (2021.1.2) kali-dev; urgency=medium - - * Force update qt5ct.conf - * Gnome-Shell: Update for gnome 3.38.3 - * Icons: Fix image-vnd.adobe.photoshop mimetype icon and remove emotes - broken symlink - - -- Daniel Ruiz de Alegría Thu, 04 Feb 2021 12:05:39 +0100 - -kali-themes (2021.1.1) kali-dev; urgency=medium - - * Remove qt4 settings - * Remove qt5-gtk2-platformtheme dependency and configure fusion theme - * Xfce: improve mimetype settings (fixes #97) - * Fix qt5ct settings - * Remove TODO - * GTK3: Update gtk->3.24.24 libhandy->1.0.3 & prepare for gtk4 - * GTK3: make buttons flat for dark theme - * GTK3: use the same color for tabs as for buttons - * GTK3: remove shadow from nautilus sidebar - * GTK3: add shadow to headerbars - * GTK3: darken headerbar for light theme - * GTK3: regenerate css files - * GTK3: Remove shadow from stackswitcher buttons on backdrop mode - * GTK3: Remove shadow from treeview's headerbar on backdrop mode - * Remove Trolltech.conf from maintainer scripts - * Icons: Update Flat-Remix theme - * Fix dpkg-divert, remove old configuration file Trolltech.conf - - -- Daniel Ruiz de Alegría Wed, 27 Jan 2021 10:56:22 +0100 - -kali-themes (2021.1.0) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * KDE: increase fixed font size - * Xfce: configure tasklist to close window on middle-click - * Xfce: configure xfwm4 default workspace names to only show the number - * GTK3: lighten backdrop_borders_color - * GTK3: Make nautilus path-bar-box border lighter in backdrop mode - * Xfce: configure thunar pathbar - * Add kali color-scheme for terminator #96 - * Add kali color-scheme for mate-terminal #96 - * gsettings-override fix mate-terminal path - * Add Kali color-scheme for tilix terminal - * Add kali color-scheme for tilix #96 - * Fix sass build Makefile - * Gnome-Shell: update gnome 3.38.2 - * Icons: Update Flat-Remix icon theme - * Add alt+num shortcuts for qterminal (fixes #108) - * Remove qterminal's FixedTabWidth and reduce TerminalMargin - * Add shortcuts for qterminal terminal splitting - * Rename Thunar with thunar as Xfce FileManager - * Xfce: revert whiskermenu logout button removal - * Icons: Update Flat-Remix icon theme with new Xfce 4.16 icons - * Icons: Fix shadows for mimetype icons and 2 new app icons - * GTK3: Updated theme - * Icons: Add missing app icon xfsm-lock - * Icons: add symbolic icons for xfsm-* - * Xfce: update panel settings for xfce 4.16 - * Xfce: remove xcape and use super key to show the menu - * Xfce: xfwm4 show titlebar app icon - * Force update setting files - - [ Raphaël Hertzog ] - * Bump Standards-Version to 4.5.1 - * Add a supplementary lintian override - - -- Daniel Ruiz de Alegría Tue, 05 Jan 2021 14:41:37 +0100 - -kali-themes (2020.4.4) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Improve notification after screenshot in Xfce - * Move all wallpapers to a kali-wallpapers - * Recover bin/update-default-backgrounds - - [ Raphaël Hertzog ] - * Provide the /usr/share/backgrounds/kali-16x9/default symlink in - kali-themes-common. - And have the corresponding dependency to kali-wallpapers-2020.4 in - kali-themes-common too to ensure the symlink points to an existing file. - * Keep kali-wallpapers-2019.4 in Recommends as a nice way to transition - users - - -- Raphaël Hertzog Wed, 11 Nov 2020 11:07:36 +0100 - -kali-themes (2020.4.3) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Backgrounds: Add new kali-geometric wallpaper - * Backgrounds: Add kali-geometric to gnome backgrounds - * Improve build scripts - * GTK3: Move application specific css inside gtk.css and gtk-dark.css - * Remove unneeded index.theme files for XFWM4 themes - * Update gitignore - * GTK3: Remove application imports - * GTK2: Fix the font color for selected menubar-item on dark theme - * Gnome-Shell: Theme update for 3.38 - * KDE: revert menu icon to the default logo and remove the custom panel layout - as it is not working - * Icons: Update Flat-Remix theme - * Backgrounds: Ensure Kali wallpapers are listed first on gnome - * Configure whiskermenu to switch categories on hover - * Automatically save screenshot on Xfce - * Add sound to xfce4-screenshooter - * Force xfce4-keyboard-shortcuts.xml update - * Fix SASS upstream sync scripts - * Backgrounds: Add kali-legacy and kali-light-strips - * Backgrounds: configure the new images for 2020.4 - * Backgrounds: Automate the configuration of the default backgrounds - * Backgrounds: Fix images with banding - * Gnome-Shell: update gnome 3.38.1 - * GTK3: new theme for whiskermenu - * Make whiskermenu wider - * Only show setting button in whiskermenu - * Backgrounds: move old backgrounds to kali-legacy-wallpapers - * Icons: Update Flat-Remix icon theme - * Icons use symbolic icon for edit-find action icon - * Move all backgrounds to kali-wallpapers package - - [ Raphaël Hertzog ] - * Use kali-wallpapers-2020.4 to store the new wallpapers - - -- Raphaël Hertzog Mon, 02 Nov 2020 21:48:20 +0100 - -kali-themes (2020.4.2) kali-dev; urgency=medium - - * GTK3: Add inner shadow to button-like widgets to add some volume - * Icons: Fix Flat-Remix with QT HiDPI settings breaks qterminal (Fixes #57) - * Icons: fix relative symlinks - * Set Flat-Remix as default icon theme for qt apps - * GTK3: Update 3.24.23 - * Revert "Recover thunar root user warning" - * Add libhandy sources for GTK3 themes - * GTK3: Fix border-color for the slider of the switch when it's disabled - * GTK3: Use custom floating-bar styles only for nautilus - * GTK3: reduce headerbar's kali logo - * Make mousepad use the system's font - * GTK3: update theme tweaks for the new libhandy viewswitcher - * GTK3: Replaced hardcoded white color for selected items with - $selected_fg_color - - -- Daniel Ruiz de Alegría Mon, 28 Sep 2020 15:55:21 +0200 - -kali-themes (2020.4.1) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * GTK3: Update 3.24.22 - * Gnome-Shell: Update 3.36.5 - * GTK3: Fix disabled check and radio widgets are not visible using the light theme - * Force update for modified files inside /etc/xdg - - -- Raphaël Hertzog Fri, 04 Sep 2020 15:37:58 +0200 - -kali-themes (2020.4.0) kali-dev; urgency=medium - - * Set default window-size for qterminal - * Prevent workspace change when dragging windows on Xfce - * Fix qterminal's font issue - - -- Daniel Ruiz de Alegría Wed, 02 Sep 2020 13:56:44 +0200 - -kali-themes (2020.3.2) kali-dev; urgency=medium - - * Remove /boot/grub/themes/kali/background.png symlink first before trying - to copy over it... - - -- Raphaël Hertzog Mon, 20 Jul 2020 18:31:03 +0200 - -kali-themes (2020.3.1) kali-dev; urgency=medium - - * Don't try to copy or create symlinks in /boot - - -- Raphaël Hertzog Mon, 20 Jul 2020 17:41:13 +0200 - -kali-themes (2020.3.0) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Update symbolic icons - * Icons: recover previous ac-adapter-symbolic icon - * Icons: Update Flat-Remix icon theme - * GTK3: pull upstream theme changes for 3.24.20 - * GTK3: Remove outline border from message dialog - * Icons: Add gnome on-screen keyboard key icons - * Gnome-Shell: pull upstream theme changes for 3.36.2 - * Set firefox as default browser for KDE - * Add favorite apps to KDE panel - * KDE: Move panel workspace-switcher after favorite apps - * KDE: Increase size of menu icon - * KDE: improve aurorae theme with blur window effect - * GTK3: Improve OSD visibility - * GTK3: Lighten OSD background color - * GTK3: Custom placessidebar for Nautilus - * GTK3: change drop_target_color - * GTK3: reduce headerbar height for apps using hdyviewswitcher - * GTK3: remove background from left nested headerbar - * Improve gtk's source color-schemes - * GTK3: improve entry visibility - * GTK3: change headerbar's entry background - * Use same background for grub theme and desktop-base grub image - * GTK3: Theme whiskermenu - * GTK3: Regenerate css files - * GTK3: Darken Xfce-notification background color - * GTK3: fix whishkermenu not showing selected row - * Copy gnome-system-monitor color-tweaks from kali-defaults - * GTK3: Improve nautilus floating-bar design - * Gnome-Shell: Upload for gnome-shell 3.36.4 - * GTK: Upload for gtk 3.24.21 - * GTK3: Fix floating-bar transparent text for light theme - - [ DяA ] - * Icons: 102 new app icons - - -- Daniel Ruiz de Alegría Fri, 10 Jul 2020 12:38:44 +0200 - -kali-themes (2020.2.3) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Sync kali-menu icons - * Add plasma-shell themes - * Remove repeated word from changelog - * Remove lintian warning timestamped-gzip - * Fix broken KDE desktop with qt5ct Fixes #75 - * Align lightdm entries Fixes #63 - * Force upgrade the modified configuration files since kali 2020.1.2 - * Backgrounds: Set new default backgrounds - * Fix kali-desktop-base install scripts - * Backgrounds: Remove kali 2019.4 backgrounds - * Force upgrade config files - - [ Raphaël Hertzog ] - * Use relative symlinks in /usr/share/desktop-base/kali-theme - * Use alternatives pointing to "kali-theme" and not "active-theme" - * Drop unused lintian overrides - * Revert "Backgrounds: Remove kali 2019.4 backgrounds" - * Use a new default path for XFCE background - - -- Raphaël Hertzog Mon, 04 May 2020 18:39:28 +0200 - -kali-themes (2020.2.2) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Backgrounds: Add kali-neon background - * Replace lightdm-greeter user icon with kali emblem - * GTK3: Add ligthdm custom themes - * Backgrounds: Add Kali-Blur background - * Improve user icon for sddm - * KDE: Change screenlocker background - * KDE: Add look-and-feel themes - * GTK3: fix lightdm password entry background - * GTK3: add shadows to lightdm widgets - * QT: Add custom color-schemes for qt5ct - * Add file search option to thunar's menu - * Readjust whiskermenu height - * Add status notifier plugin to xfce4-panel - * Icons: Update Flat-Remix icon theme - * Gnome-Shell: clone upstream 3.36.1 theme code - * Gnome-Shell: move theme changes to _common-tweaks.scss - * Gnome-Shell: fix gnome 3.36 theme Fixes #60 - * Gnome-Shell: increase switch contrast - * Gnome-Shell: remove unnecessary key icons - * Gnome-Shell: improve osd window text visibility - * GTK3: theme changes for gtk 3.24.17 - * GTK3: kali theme tweaks for gtk 3.24.17 - * Gnome-Shell: add missing pad-osd.css file from gnome-shell upstream - * Update files-to-divert - * KDE: Fix missing monospace font - * GTK3: Add separation border for non CSD headerbar - * Gnome-Shell: change window-clone-border color - * Backgrounds: fix gnome-backgrounds.xml - * GTK3: Fix checkbox icon color - * Fix gdm kali logo too big - * Gnome-Shell: Remove dash border - * Force upgrade to gnome-shell 3.36 or kali-desktop-xfce 2020.2.18 - - -- Daniel Ruiz de Alegría Wed, 22 Apr 2020 03:31:25 +0200 - -kali-themes (2020.2.1) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * KDE: Add color-scheme themes - * KDE: Add aurorae themes - * KDE: Add konsole color-schemes - * KDE: Add transparency to konsole theme - * KDE: Configure default theme settings - * KDE: Set workspaces number to 2 - * KDE: Configure default terminal profiles - * GTK2: Configure themes for KDE - * KDE: change fixed font to Fira Code 9 - * KDE: set default sddm theme - * Add missing files to divert - * GTK3: fix tooltip outline - * GTK3: update popover and menu background and shadows - * GTK3: lighten borders_color - * GTK3: change scrollbar colors - * GTK3: update upstream 3.24.14 - * GTK3: add inset shadow to switches - * GTK3: recover menu volumized check and radio widgets - * GTK3: improve app notification design - * Set default qterminal window position - * Configure whiskermenu icon size - * Backgrounds: Add kali-trail background - * Backgrounds: Add kali-strips background - * Backgrounds: Reorder backgrounds - * Backgrounds: Improve kali-dark background - * Backgrounds: Fix kde background naming; Add background variants for - different aspect ratios - * Backgrounds: Reconfigure main desktops default background - * Backgrounds: Add Kali-Mesh background - - [ Raphaël Hertzog ] - * Improvements to kali-desktop-base postinst - * Update Standards-Version - * Update lintian override for absolute symlinks in source package - * Move back all wallpapers into /usr/share/backgrounds/kali/ - * Point default XFCE wallpaper to a new directory dedicated to 16x9 - wallpapers. That way when the user wants to change the default wallpaper, - they only see a single file for each wallpaper instead of being - overwhelmed by the alternative ratio. - * Move update-maintainer-scripts to bin/ - * Automate the update of share/backgrounds/kali-16x9/ - - -- Raphaël Hertzog Tue, 24 Mar 2020 11:28:17 +0100 - -kali-themes (2020.2.0) kali-dev; urgency=medium - - * Fix network card app icon - * Refactor GTK3 theme to depend on upstream scss code - * GTK3 theme: Lighten dark-fill color - * GTK3 theme: Increase dark theme's shadow color opacity - * GTK3 theme: Change checked button background and inset shadow - * GTK3 theme: Improve selected widget outline - * GTK3 theme: Make dark theme menus more visible - * GTK3 theme: Redesign check and radio widgets - * Make xcape autorun file only launch for Xfce - * GTK3 theme: Add Gedit custom widget styles - * Replace SCSS ruby-sass compiler with libsass - * GTK3 theme: Update Nautilus widget styles - * GTK3 theme: Make button outline darker than text outline - * Move qt5-style-plugins dependency to kali-meta - * Fix qt autoHiDPI malfunction - * Update WPScan app icon - * Add theHarvester app icon - * Add wfuzz app icon - * Add 188 app symlinks - * Fix network app icons wrongly linked to zenmap - * Move user avatar to kali-defaults - * Add preferences-desktop-cursors app icon - * Replace gtk2 qt style plugin with qt5ct - * GTK3: remove titlebutton backdrop border - * GTK3: Roud bottom decoration edges - * GTK3: remove titlebutton backdrop background - * GTK3: reduce non csd headerbar height - - [ Raphaël Hertzog ] - * Force upgrade of kali-desktop-xfce to 2020.2.11 - - -- Daniel Ruiz de Alegría Sun, 01 Mar 2020 17:09:24 +0100 - -kali-themes (2020.1.2) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add kali-logo icon - * Increase whiskermenu height to fit all default kali categories - * Fix light gnome-shell theme, volume dialog's barlevel not visible - * Gnome-shell themes: add shadow to icons in osd dialogs - * Add kali app icons - * Recover thunar root user warning - * Chage gdm logo background to white - * Fix network-card app icon - * Add category icons to sync Flat-Remix theme - * Update kali emblem icon - * Configure Kali-Dark gnome-shell theme - - -- Daniel Ruiz de Alegría Fri, 17 Jan 2020 04:21:47 +0100 - -kali-themes (2020.1.1) kali-dev; urgency=medium - - * Add Firefox and Chrome to compton shadow-exclusion - * Change terminal color-scheme white color - * Update Flat-Remix icon theme - * Add source files - * Set Kali-Dark as default color-scheme for gedit - * Customize gnome-terminal - * Change gnome-shell monospace font - * Change checked button indicator position according to xfce4-panel orientation - * Change selected widget outline style - * Add nautilus custom styles - * Change nautilus diskspace colors - * Add new gnome-shell dark/light themes - - -- Daniel Ruiz de Alegría Thu, 09 Jan 2020 15:19:46 +0100 - -kali-themes (2020.1.0) kali-dev; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add xfwm4 HiDPI themes - * Reduce whiskermenu height to avoid cutting icons - * Add updated Flat-Remix desktop icon - * Increase whiskermenu size - * Add compton configuration file - * Add terminal brighter bold colors - * Improve GTK2 themes menu toolbar design - * Qterminal hide tab bar with only one tab - * Improve GTK2 themes menu design - * Lighten actions and symbolic icons for Flat-Remix dark icon theme - - [ Raphaël Hertzog ] - * Avoid conffiles prompts for newly diverted files during upgrades - * Add /etc/xdg/compton.conf to the list of diverted files - * Force upgrade the modified configuration files - - -- Raphaël Hertzog Tue, 03 Dec 2019 15:06:00 +0100 - -kali-themes (2019.4.18) kali-experimental; urgency=medium - - * Disable generic names but still use a generic name for mousepad in - favorites section - * Force upgrade config files - * Revert "Move close/max/min buttons on the left of windows" - - -- Raphaël Hertzog Thu, 21 Nov 2019 15:23:17 +0100 - -kali-themes (2019.4.17) kali-experimental; urgency=medium - - [ Raphaël Hertzog ] - * Show generic application names - * Switch the whiskermenu to have categories on the left - * Move close/max/min buttons on the left of windows - * Force upgrade config files - - [ Daniel Ruiz de Alegría ] - * Add kali-bugs and kali-docs icons - - -- Raphaël Hertzog Wed, 20 Nov 2019 18:35:16 +0100 - -kali-themes (2019.4.16) kali-experimental; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Disable workspace cycling via desktop scrolling or window dragging - * Fix terminal dark color not visible with dark color-scheme - * Add new Flat-Remix kali custom icons - - -- Raphaël Hertzog Wed, 20 Nov 2019 13:40:58 +0100 - -kali-themes (2019.4.15) kali-experimental; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Show qterminal menu - * Fix xfwm4 square corner while window content is loading - - [ Raphaël Hertzog ] - * Configure the default avatar - * Force upgrade all config files - - -- Raphaël Hertzog Tue, 19 Nov 2019 10:58:42 +0100 - -kali-themes (2019.4.14) kali-experimental; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Move virtual desktops view to the left side - * Move kazam shortcut to Super + PtrSc - * Add screenshot shorcuts - - -- Raphaël Hertzog Fri, 15 Nov 2019 16:31:57 +0100 - -kali-themes (2019.4.13) kali-experimental; urgency=medium - - * Add dependency on sensible-utils to please lintian - * Use relative path for the background picture in the grub theme - * Add kazam to the XFCE panel - * Force upgrade all config files - * Configure CTRL+Print in XFCE to start kazam - - -- Raphaël Hertzog Thu, 14 Nov 2019 10:42:57 +0100 - -kali-themes (2019.4.12) kali-experimental; urgency=medium - - [ Raphaël Hertzog ] - * Put back debian-sensible-browser as default browser - * Force upgrade all config files with this version - - [ Daniel Ruiz de Alegría ] - * Move kali light background logo position - - -- Raphaël Hertzog Tue, 12 Nov 2019 11:19:21 +0100 - -kali-themes (2019.4.11) kali-experimental; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add kali light background and replace kali rings for login and lock screen - * Add new grub backgrounds - * Minify backgrounds - * Fix background gradient banding - * Replace Qterminal background transparency with window transparency - * Move panel action buttons position and force symbolic icons - - [ Raphaël Hertzog ] - * Set environment variables in /etc/X11/Xsession.d/90kali-themes too - * Don't use any background image for qterminal, just transparency - * Force upgrade all config files again - - -- Raphaël Hertzog Mon, 11 Nov 2019 14:05:52 +0100 - -kali-themes (2019.4.10) kali-experimental; urgency=medium - - * Configure qterminal as the default terminal and firefox-esr as the default - browser - * Disable profile edition when clicking on user face in menu - * Tweak the default apps shown in the favorites section of XFCE - * Force the upgrade of kali-menu to 2019.4.4 or higher. - * Reduce number of default workspaces to 2 - * Add lockscreen and logout buttons in the panel - * Force update of all config files on upgrade files. - It's an extra safety to have a clean start and it makes it easier - for others to test. - - -- Raphaël Hertzog Fri, 08 Nov 2019 19:19:51 +0100 - -kali-themes (2019.4.9) kali-experimental; urgency=medium - - [ Raphaël Hertzog ] - * Add the logo-text and logo-text-version variants as symlinks to logo.svg - * Configure gdm to display our logo - * Move plymouth theme setting to kali-themes - * Always add the missing diversions on upgrade - * Add empty directories to kali-desktop-base so that update-alternatives can - create symlinks in them. - * Force upgrade of kali-desktop-xfce to 2019.4.16 to ensure we have - whiskerplugin. - - [ Daniel Ruiz de Alegría ] - * Fix light variant qterminal theme - * Fix grub fallback background color - * Add kali-logo and kali-rings svg backgrounds - * Enable whiskermenu sub-categories - * Fix kali-blue-matrix background - - -- Raphaël Hertzog Thu, 07 Nov 2019 15:49:36 +0100 - -kali-themes (2019.4.8) kali-experimental; urgency=medium - - * Drop 1920x1080 from the list of resolutions to try for GRUB - * Fix path to background images in XFCE and lightdm config - * Fix gsettings to actually enable the correct theme - * Add gsettings overriding the background images for GNOME - * Update files with latest changes from Daniel - * Change priority of gsettings to be above kali-defaults/desktop-base - * Move all files installed below /usr/share in the same directory. - Also move the grub theme to /usr/share/grub/themes/kali/ as installing - files in /boot/ is problematic on arm where /boot is often a vfat - partition that doesn't support hardlinks as required by dpkg. - * Instead copy grub theme to /boot during postinst. - The goal is to not break ARM images using vfat for /boot while - still providing the theme in /boot so that it can be available - even when /usr/share/ is not available. - * Fix path to grub backgrounds in update-alternatives calls - * Use dark theme by default in GNOME too - * Drop the "Provides: desktop-base" on kali-desktop-base so that we can - still force the installation of desktop-base with a Depends on it. - - -- Raphaël Hertzog Thu, 07 Nov 2019 10:57:41 +0100 - -kali-themes (2019.4.7) kali-experimental; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Update new kali icon themes with latest changes - * Update new kali window themes with latest changes - - -- Raphaël Hertzog Thu, 07 Nov 2019 00:19:39 +0100 - -kali-themes (2019.4.6) kali-experimental; urgency=medium - - [ Daniel Ruiz de Alegría ] - * Add new grub backgrounds - * Add new login screen background - * Add new lock screen backgrounds - * Add new wallpapers screen background - - [ Raphaël Hertzog ] - * Update kali-desktop-base alternatives to point to the new theme. - Handle properly upgrade from old desktop-base as well as from old - kali-desktop-base. - * Install all configuration files provided by Daniel - * Add gsettings for mousepad - * Add new dependencies for kali-themes - * Drop remaining files from the former themes - * Add gnome-theme-kali transitional package - * Use 16x9 background in GRUB - - -- Raphaël Hertzog Thu, 07 Nov 2019 00:07:57 +0100 - -kali-themes (2019.4.5) kali-experimental; urgency=medium - - [ Sophie Brun ] - * Add missing Provides - * Change name to kali-themes and kali-themes-common - - [ Raphaël Hertzog ] - * Put both plymouth themes in the same directory - * Rename emblems-debian directory into emblems - * Split kali-theme into multiple top-level directories - * Drop executable permissions on many icons - * Review maintainer scripts - - -- Raphaël Hertzog Fri, 01 Nov 2019 19:51:44 +0100 - -kali-themes (2019.4.4) kali-experimental; urgency=medium - - * Fix debian/kali-theme.preinst for xfce - - -- Sophie Brun Thu, 31 Oct 2019 17:43:17 +0100 - -kali-themes (2019.4.3) kali-experimental; urgency=medium - - * Fix debian/kali-theme-common.postinst - - -- Sophie Brun Thu, 31 Oct 2019 09:46:55 +0100 - -kali-themes (2019.4.2) kali-experimental; urgency=medium - - * Fix debian/kali-theme.preinst - - -- Sophie Brun Wed, 23 Oct 2019 10:05:30 +0200 - -kali-themes (2019.4.1) kali-experimental; urgency=medium - - * Add missing Breaks and Replaces desktop-base - - -- Sophie Brun Tue, 22 Oct 2019 16:23:59 +0200 - -kali-themes (2019.4.0) kali-experimental; urgency=low - - * Initial Release. - - -- Daniel Ruiz de Alegría Wed, 02 Oct 2019 12:39:20 +0200 diff --git a/debian/control b/debian/control deleted file mode 100644 index d0a56401..00000000 --- a/debian/control +++ /dev/null @@ -1,123 +0,0 @@ -Source: kali-themes -Section: misc -Priority: optional -Maintainer: Kali Developers -Uploaders: - Daniel Ruiz de Alegría , - Raphaël Hertzog , -Build-Depends: - debhelper-compat (= 13), - librsvg2-bin, - optipng, -Standards-Version: 4.6.2 -Rules-Requires-Root: no -Vcs-Git: https://gitlab.com/kalilinux/packages/kali-themes.git -Vcs-Browser: https://gitlab.com/kalilinux/packages/kali-themes - -Package: kali-themes-common -Architecture: all -Depends: - kali-wallpapers-2024, - ${misc:Depends}, -Suggests: - gtk2-engines-pixbuf, - kali-wallpapers-2019.4, - kali-wallpapers-2020.4, - kali-wallpapers-2021.4, - kali-wallpapers-2022, - kali-wallpapers-2023, - kali-wallpapers-legacy, - librsvg2-common, -Breaks: - desktop-base (<< 10.0.3+kali2), - gnome-theme-kali (<< 2019.4), - kali-desktop-kde (<< 2021.4.1), - kali-menu (<< 2021.3.2), -Replaces: - desktop-base (<< 10.0.3+kali2), - gnome-theme-kali (<< 2019.4), - kali-menu (<< 2021.3.2), -Provides: - gnome-theme-kali, -Description: Kali Themes (data files) - This package contains multiple themes for kali. It includes graphical toolkit - themes, icon themes, color schemes, desktop backgrounds and more. - . - This package only contains the actual files, it doesn't change any system - setting and doesn't enable any Kali theme by default. - -Package: kali-desktop-base -Architecture: all -Depends: - kali-themes-common (= ${source:Version}), - ${misc:Depends}, -Description: Kali version of Debian's desktop-base package - This empty package provides hooks into the various alternatives defined by - Debian's desktop-base to provide consistent Kali branding through the whole - distribution. - -Package: kali-themes -Architecture: all -Depends: - fonts-cantarell, - fonts-firacode, - gtk2-engines-pixbuf, - kali-themes-common (= ${source:Version}), - librsvg2-common, - plymouth-label, - ${misc:Depends}, -Breaks: - gnome-shell (>= 46~), - gnome-shell (<< 45~), - kali-defaults (<< 2019.4.0), - kali-desktop-xfce (<< 2020.2.18), - kali-menu (<< 2019.4.4), -Replaces: - kali-defaults (<< 2019.4.0), -Description: Configure all desktops to use the Kali theme - Installing this package should configure most desktops to use the Kali theme - by default. - . - The actual artwork files are provided by kali-themes-common but this package - provides configuration files and other settings for each desktop so that - they use the Kali theme by default. - -Package: gnome-theme-kali -Section: oldlibs -Architecture: all -Depends: - kali-themes, - ${misc:Depends}, -Description: Transitional package to install kali-themes - All the theme related files have been moved to kali-themes. - . - This dummy package can be safely removed once kali-themes is installed on the - system. - -Package: kali-themes-mobile -Architecture: all -Depends: - kali-themes (= ${source:Version}), - kali-wallpapers-mobile-2023, - adw-gtk3-kali, - ${misc:Depends}, -Description: Configure Phosh desktop to use the Kali theme - Installing this package should configure Phosh desktop to use the Kali theme - by default. - -Package: kali-themes-purple -Architecture: all -Depends: - kali-themes (= ${source:Version}), - ${misc:Depends}, -Breaks: - kali-themes (<< 2023.3.1), -Replaces: - kali-themes (<< 2023.3.1), -Description: Configure all desktops to use the Kali Purple theme - Installing this package should configure most desktops to use the Kali Purple - theme by default. - . - The actual artwork files are provided by kali-themes-common but this package - provides configuration files and other settings for each desktop so that - they use the Kali Purple theme by default. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 28099091..00000000 --- a/debian/copyright +++ /dev/null @@ -1,31 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: kali-themes -Source: https://gitlab.com/kalilinux/packages/kali-themes.git - -Files: * -Copyright: 2015-2019 Offensive Security -License: GPL-3.0+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL-3'. -Comments: Beware some of the graphical elements are protected by the - trademark law. See: https://www.kali.org/trademark-policy/ - . - The initial theme has been created by Jared Sot for - Offensive Security. - . - The theme has been created by Daniel Ruiz de Alegría for - Offensive Security. diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index d9115b43..00000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -debian-branch = kali/master -debian-tag = kali/%(version)s -pristine-tar = True - -[pq] -patch-numbers = False - -[dch] -multimaint-merge = True diff --git a/debian/gnome-theme-kali.postinst b/debian/gnome-theme-kali.postinst deleted file mode 100644 index 1139aca0..00000000 --- a/debian/gnome-theme-kali.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl "2019.4"; then - # Cleanup diversion setup by former real package - dpkg-divert --rename --package gnome-theme-kali \ - --divert /usr/share/gnome-shell/theme/gnome-shell.css.original \ - --remove /usr/share/gnome-shell/theme/gnome-shell.css -fi - -#DEBHELPER# diff --git a/debian/kali-ci.yml b/debian/kali-ci.yml deleted file mode 100644 index 058e396d..00000000 --- a/debian/kali-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -include: - - https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml diff --git a/debian/kali-desktop-base.dirs b/debian/kali-desktop-base.dirs deleted file mode 100644 index 48acebfc..00000000 --- a/debian/kali-desktop-base.dirs +++ /dev/null @@ -1,7 +0,0 @@ -/usr/share/desktop-base -/usr/share/icons/vendor/128x128/emblems -/usr/share/icons/vendor/256x256/emblems -/usr/share/icons/vendor/64x64/emblems -/usr/share/icons/vendor/scalable/emblems -/usr/share/images/desktop-base -/usr/share/wallpapers diff --git a/debian/kali-desktop-base.lintian-overrides b/debian/kali-desktop-base.lintian-overrides deleted file mode 100644 index 940e6801..00000000 --- a/debian/kali-desktop-base.lintian-overrides +++ /dev/null @@ -1,7 +0,0 @@ -package-contains-empty-directory [usr/share/desktop-base/] -package-contains-empty-directory [usr/share/icons/vendor/128x128/emblems/] -package-contains-empty-directory [usr/share/icons/vendor/256x256/emblems/] -package-contains-empty-directory [usr/share/icons/vendor/64x64/emblems/] -package-contains-empty-directory [usr/share/icons/vendor/scalable/emblems/] -package-contains-empty-directory [usr/share/images/desktop-base/] -package-contains-empty-directory [usr/share/wallpapers/] diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst deleted file mode 100644 index 9cd279e0..00000000 --- a/debian/kali-desktop-base.postinst +++ /dev/null @@ -1,187 +0,0 @@ -#!/bin/sh -set -e - - -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then - # Vendor logo alternative - update-alternatives --install \ - /usr/share/images/vendor-logos \ - vendor-logos \ - /usr/share/images/kali-logos 200 \ - --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor.png \ - emblem-vendor-64 \ - /usr/share/icons/desktop-base/64x64/emblems/emblem-kali.png \ - --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor.png \ - emblem-vendor-128 \ - /usr/share/icons/desktop-base/128x128/emblems/emblem-kali.png \ - --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png \ - emblem-vendor-256 \ - /usr/share/icons/desktop-base/256x256/emblems/emblem-kali.png \ - --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg \ - emblem-vendor-scalable \ - /usr/share/icons/desktop-base/scalable/emblems/emblem-kali.svg \ - - # Theme package alternatives - update-alternatives --install \ - /usr/share/desktop-base/active-theme \ - desktop-theme \ - /usr/share/desktop-base/kali-theme 200 - - # Desktop background alternatives - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-background \ - desktop-background /usr/share/backgrounds/kali-16x9/default 210 - - # Set up an alternative for the XML version of the background - # (for GNOME) - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-background.xml \ - desktop-background.xml /usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml 210 - - # Set up an alternative for the XML version of the lock screen - # (for GNOME) - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-lockscreen.xml \ - desktop-lockscreen.xml /usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml 210 - - # Set up an alternative for the wallpaper for Plasma 5/KDE - update-alternatives --install \ - /usr/share/wallpapers/DebianTheme \ - desktop-plasma5-wallpaper /usr/share/desktop-base/kali-theme/wallpaper 210 - - # Login theme - # Highest priority for active theme - update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ - desktop-login-background /usr/share/desktop-base/kali-theme/login/background.svg 210 - - # Set up an alternative for the GRUB background/colors config - # Highest priority for active theme - # Favor widescreen / hi-res background for efi installations detected - # by the presence of grub-efi* packages (not the grub-efi*-bin which don’t - # necessary account for grub being the active bootloader). - if dpkg-query --list grub-efi* | grep -v "^... grub-efi[^[:space:]]*-bin" | grep -q "^[ih][HUFWti] " ; then - echo "grub-efi* packages found, using 16/9 as default grub background ratio" - grub_first_ratio="16x9" - grub_second_ratio="4x3" - else - echo "No grub-efi* package found, using 4/3 as default grub background ratio" - grub_first_ratio="4x3" - grub_second_ratio="16x9" - fi - active_grub_first_ratio=/usr/share/grub/themes/kali/grub-${grub_first_ratio}.png - active_grub_second_ratio=/usr/share/grub/themes/kali/grub-${grub_second_ratio}.png - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub ${active_grub_first_ratio} 200 \ - --slave /usr/share/desktop-base/grub_background.sh \ - desktop-grub.sh /usr/share/grub/themes/kali/grub_background.sh - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-grub.png \ - desktop-grub ${active_grub_second_ratio} 190 \ - --slave /usr/share/desktop-base/grub_background.sh \ - desktop-grub.sh /usr/share/grub/themes/kali/grub_background.sh - - # Apply GRUB background update into /boot - # Try detecting active grub packages (so not -doc, -common, -bin) as a hint - # that GRUB is being used as bootloader before calling update-grub. - # Some people use the *-bin packages without using GRUB as bootloader - # (see #851893 for more context). - if dpkg-query --list "grub-*" | grep -v "^... grub\(-common\|-emu\|[^[:space:]]*\(-bin\|-doc\)\)" | grep -q "^[ih][HUFWti] " \ - && command -v update-grub > /dev/null ; then - # Ensure the background image file has actually been written to disc - # before updating. - sync - # Report success whatever grub return status. This is needed at least - # in live systems for installation to succeed (see #850601). - # Until we find a better solution like detecting we’re in a live image - # and not calling update-grub at all. - update-grub || echo "Updating grub failed, report success anyway!" - fi - - if command -v update-initramfs > /dev/null; then - update-initramfs -u - fi - -fi - -desktop_base_version=$(dpkg-query -f'${Version}' -W desktop-base 2>/dev/null || true) -if [ "$1" = "configure" ]; then - if dpkg --compare-versions "$desktop_base_version" lt-nl 10.0.3+kali3 || \ - dpkg --compare-versions "$2" lt-nl "2019.4.6"; then - # Remove alternatives for the old theme - - # Background images - while read theme filename; do - update-alternatives --remove \ - desktop-background \ - /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename $priority - done << EOF -kali 1024x768.svg -kali 1280x720.svg -kali 1280x800.svg -kali 1280x1024.svg -kali 1600x1200.svg -kali 1920x1080.svg -kali 1920x1200.svg -kali 2560x1440.svg -kali 2560x1600.svg -kali 3840x2160.svg -EOF - # Remove gnome-background.xml alternatives - update-alternatives --remove \ - desktop-background.xml \ - /usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml - - # Remove desktop-lockscreen.xml alternatives - update-alternatives --remove \ - desktop-lockscreen.xml \ - /usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml - - # Remove Plasma 5/KDE wallpaper alternatives - update-alternatives --remove \ - desktop-plasma5-wallpaper \ - /usr/share/desktop-base/kali-theme/wallpaper - - # Remove login theme alternatives - update-alternatives --remove \ - desktop-login-background \ - /usr/share/desktop-base/kali-theme/login/background.svg - - # Remove grub alternatives - update-alternatives --remove \ - desktop-grub \ - /usr/share/desktop-base/kali-theme/grub/grub-4x3.png - update-alternatives --remove \ - desktop-grub \ - /usr/share/desktop-base/kali-theme/grub/grub-16x9.png - - elif dpkg --compare-versions "$2" lt-nl "2020.2.3"; then - # Remove invalid alternatives that moved to /usr/share/desktop-base/active-theme/* - update-alternatives --remove \ - desktop-background \ - /usr/share/backgrounds/kali/kali-logo-16x9.png - - update-alternatives --remove \ - desktop-background.xml \ - /usr/share/backgrounds/kali/kali-logo.xml - - update-alternatives --remove \ - desktop-lockscreen.xml \ - /usr/share/backgrounds/kali/kali-light.xml - - update-alternatives --remove \ - desktop-plasma5-wallpaper \ - /usr/share/wallpapers/KaliLogo - - update-alternatives --remove \ - desktop-login-background \ - /usr/share/backgrounds/kali/kali-light.svg - - elif dpkg --compare-versions "$2" lt-nl "2024.1.0"; then - update-alternatives --remove \ - desktop-background \ - /usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png - fi -fi - -#DEBHELPER# diff --git a/debian/kali-desktop-base.prerm b/debian/kali-desktop-base.prerm deleted file mode 100644 index fc66446c..00000000 --- a/debian/kali-desktop-base.prerm +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = "remove" ]; then - # Remove vendor logos alternative, all slaves get removed automatically - update-alternatives --remove \ - vendor-logos \ - /usr/share/desktop-base/kali-logos - - # Remove background alternatives for theme packages - update-alternatives --remove \ - desktop-background \ - /usr/share/backgrounds/kali-16x9/default - - # Remove desktop-background.xml alternatives - update-alternatives --remove \ - desktop-background.xml \ - /usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml - - # Remove desktop-lockscreen.xml alternatives - update-alternatives --remove \ - desktop-lockscreen.xml \ - /usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml - - # Remove Plasma 5/KDE wallpaper alternatives - update-alternatives --remove \ - desktop-plasma5-wallpaper \ - /usr/share/desktop-base/kali-theme/wallpaper - - # Remove login theme alternatives - update-alternatives --remove \ - desktop-login-background \ - /usr/share/desktop-base/kali-theme/login/background.svg - - # Remove GRUB alternatives - update-alternatives --remove \ - desktop-grub \ - /usr/share/grub/themes/kali/grub-4x3.png - update-alternatives --remove \ - desktop-grub \ - /usr/share/grub/themes/kali/grub-16x9.png - - # Remove theme package alternatives - update-alternatives --remove \ - desktop-theme \ - /usr/share/desktop-base/kali-theme -fi - -#DEBHELPER# diff --git a/debian/kali-themes-common.dirs b/debian/kali-themes-common.dirs deleted file mode 100644 index 34698b26..00000000 --- a/debian/kali-themes-common.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/share/xfce4-panel-profiles/layouts diff --git a/debian/kali-themes-common.install b/debian/kali-themes-common.install deleted file mode 100644 index b3b00638..00000000 --- a/debian/kali-themes-common.install +++ /dev/null @@ -1,5 +0,0 @@ -# Those are created by "make install" -share/* usr/share/ -usr/share/icons/ -usr/share/images/ -usr/share/xfce4-panel-profiles/ diff --git a/debian/kali-themes-common.lintian-overrides b/debian/kali-themes-common.lintian-overrides deleted file mode 100644 index ea6337d3..00000000 --- a/debian/kali-themes-common.lintian-overrides +++ /dev/null @@ -1,12 +0,0 @@ -# This is fine, we use "TryExec" to hide it when it's not available -desktop-command-not-in-package mousepad [usr/share/applications/xfce-text-editor.desktop] -# We don't want this desktop file to be easily found in searches as it -# duplicates another desktop file. It's here mainly to appear in the -# Xfce favorite section under a generic name that we control ("Text -# Editor" instead of "Mousepad") -desktop-entry-lacks-keywords-entry [usr/share/applications/xfce-text-editor.desktop] -# We don't want this desktop file to be easily found in searches as it -# is only used to set the default browser in some desktops -desktop-entry-lacks-keywords-entry [usr/share/applications/default-browser.desktop] -# This is not documentation -package-contains-documentation-outside-usr-share-doc [usr/share/grub/themes/kali/theme.txt] diff --git a/debian/kali-themes-common.maintscript b/debian/kali-themes-common.maintscript deleted file mode 100644 index f529ee31..00000000 --- a/debian/kali-themes-common.maintscript +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/themes/Kali-Light/gtk-3.0/assets ../../Kali-Dark/gtk-3.0/assets 2021.2.2~ diff --git a/debian/kali-themes-mobile.gsettings-override b/debian/kali-themes-mobile.gsettings-override deleted file mode 100644 index bee3c1c2..00000000 --- a/debian/kali-themes-mobile.gsettings-override +++ /dev/null @@ -1,10 +0,0 @@ -[org.gnome.desktop.background] -picture-options = 'zoom' -picture-uri = 'file:///usr/share/backgrounds/kali/nethunter-pro-red-blue-1x1.png' -picture-uri-dark = 'file:///usr/share/backgrounds/kali/nethunter-pro-red-blue-1x1.png' - -[org.gnome.desktop.interface] -icon-theme = 'Adwaita+Flat-Remix-Blue' - -[sm.puri.phoc] -scale-to-fit = true diff --git a/debian/kali-themes-mobile.postinst b/debian/kali-themes-mobile.postinst deleted file mode 100644 index 59e5cd19..00000000 --- a/debian/kali-themes-mobile.postinst +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -PLASMA_DESKTOP_FILE=/usr/share/plasma/desktoptheme/kali/metadata.desktop - -if [ "$1" = "configure" ]; then - dpkg-divert --no-rename --package kali-themes-mobile \ - --divert "${PLASMA_DESKTOP_FILE}.original" \ - --add "${PLASMA_DESKTOP_FILE}" - cp "${PLASMA_DESKTOP_FILE}" "${PLASMA_DESKTOP_FILE}.original" - - cat >> "${PLASMA_DESKTOP_FILE}" <<- EOF - [Wallpaper] - defaultWallpaperTheme=NethunterProRedBlue - defaultWidth=3800 - defaultHeight=3800 - EOF -fi - -#DEBHELPER# diff --git a/debian/kali-themes-mobile.postrm b/debian/kali-themes-mobile.postrm deleted file mode 100644 index 4ef9151c..00000000 --- a/debian/kali-themes-mobile.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -PLASMA_DESKTOP_FILE=/usr/share/plasma/desktoptheme/kali/metadata.desktop - -if [ "$1" = "remove" ]; then - rm -f "${PLASMA_DESKTOP_FILE}" - dpkg-divert --rename --package kali-themes-mobile \ - --divert "${PLASMA_DESKTOP_FILE}.original" \ - --remove "${PLASMA_DESKTOP_FILE}" -fi - -#DEBHELPER# diff --git a/debian/kali-themes-purple.gsettings-override b/debian/kali-themes-purple.gsettings-override deleted file mode 100644 index 74ee54cd..00000000 --- a/debian/kali-themes-purple.gsettings-override +++ /dev/null @@ -1,32 +0,0 @@ -[org.gnome.desktop.background] -picture-options = 'zoom' -picture-uri = 'file:///usr/share/desktop-base/kali-theme/wallpaper/gnome-background-purple.xml' -picture-uri-dark = 'file:///usr/share/desktop-base/kali-theme/wallpaper/gnome-background-purple.xml' - -[org.gnome.desktop.interface] -color-scheme = 'prefer-light' -gtk-theme = 'adw-gtk3' -icon-theme = 'Flat-Remix-Purple-Light' - -[org.gnome.desktop.wm.preferences] -theme = 'adw-gtk3' - -[org.gnome.gedit.preferences.editor] -scheme = 'Kali-Light' - -[org.gnome.TextEditor] -style-scheme = 'Kali-Light' - -[org.gnome.shell] -favorite-apps = ['org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.TextEditor.desktop', 'firefox-esr.desktop'] - -[org.gnome.shell.extensions.user-theme] -name = 'Kali-Purple-Light' - -[org.gnome.Terminal.Legacy.Settings] -theme-variant = 'light' - -# Configuration for xfce's text-editor -[org.xfce.mousepad.preferences.view] -color-scheme = 'Kali-Light' - diff --git a/debian/kali-themes-purple.install b/debian/kali-themes-purple.install deleted file mode 100644 index c74f7a13..00000000 --- a/debian/kali-themes-purple.install +++ /dev/null @@ -1,2 +0,0 @@ -face-purple.svg usr/share/kali-themes -etc-purple/* etc/ diff --git a/debian/kali-themes-purple.links b/debian/kali-themes-purple.links deleted file mode 100644 index 1d815d03..00000000 --- a/debian/kali-themes-purple.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/backgrounds/kali-16x9/kali-purple-whirlwind.jpg /usr/share/backgrounds/kali-16x9/default-purple diff --git a/debian/kali-themes-purple.lintian-overrides b/debian/kali-themes-purple.lintian-overrides deleted file mode 100644 index badf4903..00000000 --- a/debian/kali-themes-purple.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -package-contains-file-in-etc-skel [etc/skel/.config/*] diff --git a/debian/kali-themes-purple.postinst b/debian/kali-themes-purple.postinst deleted file mode 100644 index 91b98138..00000000 --- a/debian/kali-themes-purple.postinst +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -ICON_FILE=/etc/skel/.face - -if [ "$1" = "configure" ]; then - dpkg-divert --rename --package kali-themes-purple \ - --divert "${ICON_FILE}.original" \ - --add "${ICON_FILE}" - cp /usr/share/kali-themes/face-purple.svg "${ICON_FILE}" -fi - -#DEBHELPER# diff --git a/debian/kali-themes-purple.postrm b/debian/kali-themes-purple.postrm deleted file mode 100644 index c694d55f..00000000 --- a/debian/kali-themes-purple.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -ICON_FILE=/etc/skel/.face - -if [ "$1" = "remove" ]; then - rm -f "${ICON_FILE}" - dpkg-divert --rename --package kali-themes-purple \ - --divert "${ICON_FILE}.original" \ - --remove "${ICON_FILE}" -fi - -#DEBHELPER# diff --git a/debian/kali-themes.gsettings-override b/debian/kali-themes.gsettings-override deleted file mode 100644 index e462f02b..00000000 --- a/debian/kali-themes.gsettings-override +++ /dev/null @@ -1,116 +0,0 @@ -[com.gexperts.Tilix.Profile] -background-transparency-percent = 5 -palette = ['#1F2229', '#D41919', '#5EBDAB', '#FEA44C', '#367bf0', '#9755b3', '#49AEE6', '#E6E6E6', '#198388', '#EC0101', '#47D4B9', '#FF8A18', '#277FFF', '#962ac3', '#05A1F7', '#FFFFFF'] - -[org.gnome.desktop.background] -picture-options = 'zoom' -picture-uri = 'file:///usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml' -picture-uri-dark = 'file:///usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml' - -[org.gnome.desktop.interface] -color-scheme = 'prefer-dark' -gtk-theme = 'adw-gtk3-dark' -icon-theme = 'Flat-Remix-Blue-Dark' -monospace-font-name = 'Fira Code Medium 10' - -[org.gnome.desktop.screensaver] -picture-options = 'zoom' -picture-uri = 'file:///usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml' - -[org.gnome.desktop.wm.keybindings] -show-desktop = ['d', 'd', 'd'] -switch-applications = ['Tab'] -switch-applications-backward = ['Tab'] -switch-windows = ['Tab'] -switch-windows-backward = ['Tab'] - -[org.gnome.desktop.wm.preferences] -button-layout = 'appmenu:minimize,maximize,close' -theme = 'adw-gtk3-dark' - -# Configuration for gnome's image-viewer -[org.gnome.eog.ui] -disable-close-confirmation = true -sidebar = false - -[org.gnome.gedit.preferences.editor] -background-pattern = 'grid' -scheme = 'Kali-Dark' - -[org.gnome.TextEditor] -show-grid = true -style-scheme = 'Kali-Dark' - -[org.gnome.gnome-system-monitor] -cpu-colors = [(0, '#fd3535'), (1, '#fd7d00'), (2, '#ffc730'), (3, '#0ca15e'), (4, '#14816c'), (5, '#4aaee6'), (6, '#367bf0'), (7, '#265ab1'), (8, '#153873'), (9, '#8c42ab'), (10, '#b8174c'), (11, '#d41919')] -cpu-stacked-area-chart = true -mem-color = '#B8174C' -net-in-color = '#367BF0' -net-out-color = '#D41919' -swap-color = '#19a187' - -[org.gnome.shell] -disable-extension-version-validation = true -enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com','places-menu@gnome-shell-extensions.gcampax.github.com','dash-to-dock@micxgx.gmail.com','ProxySwitcher@flannaghan.com','ubuntu-appindicators@ubuntu.com','user-theme@gnome-shell-extensions.gcampax.github.com','ding@rastersoft.com','tiling-assistant@leleat-on-github'] -favorite-apps = ['org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.TextEditor.desktop', 'firefox-esr.desktop', 'kali-msfconsole.desktop', 'org.wireshark.Wireshark.desktop', 'kali-burpsuite.desktop', 'cherrytree.desktop'] - -[org.gnome.shell.extensions.dash-to-dock] -custom-theme-shrink=true -show-trash = false -running-indicator-style='DOTS' -disable-overview-on-startup = true - -# Configure desktop icons in gnome-shell -[org.gnome.shell.extensions.ding] -icon-size = 'small' -show-home = false -show-trash = false -show-volumes = false - -[org.gnome.shell.extensions.tiling-assistant] -enable-tiling-popup = false - -[org.gnome.shell.extensions.user-theme] -name = 'Kali-Dark' - -[org.gnome.Terminal.Legacy.Profile] -background-transparency-percent = 5 -bold-is-bright = true -palette = ['#1F2229', '#D41919', '#5EBDAB', '#FEA44C', '#367bf0', '#9755b3', '#49AEE6', '#E6E6E6', '#198388', '#EC0101', '#47D4B9', '#FF8A18', '#277FFF', '#962ac3', '#05A1F7', '#FFFFFF'] -scrollback-unlimited = true -use-theme-colors = true -use-transparent-background = true - -[org.gnome.Terminal.Legacy.Settings] -confirm-close = false -theme-variant = 'dark' - -[org.gtk.Settings.FileChooser] -sort-directories-first = true - -[org.mate.terminal.profile] -background-darkness = 0.95 -background-type = 'transparent' -palette = '#1F1F22222929:#D4D419191919:#5E5EBDBDABAB:#FEFEA4A44C4C:#36367B7BF0F0:#97975555B3B3:#4948AEAEE6E6:#E6E6E6E6E6E6:#191983838888:#ECEC01010101:#4747D4D4B9B9:#FFFF8A8A1818:#27277F7FFFFF:#96962A2AC3C3:#0505A1A1F7F7:#FFFFFFFFFFFF' -use-theme-colors = true - -[org.onboard] -layout='Compact' -theme='Droid' -key-label-font='Cantarell' - -# Configuration for xfce's text-editor -[org.xfce.mousepad.preferences.view] -auto-indent = true -color-scheme = 'Kali-Dark' -highlight-current-line = true -match-braces = true -show-line-numbers = true -word-wrap = true - -[org.xfce.mousepad.preferences.window] -toolbar-visible = true -client-side-decorations = false - -[org.xfce.mousepad.preferences.file] -add-last-end-of-line = true diff --git a/debian/kali-themes.install b/debian/kali-themes.install deleted file mode 100644 index 95951fb3..00000000 --- a/debian/kali-themes.install +++ /dev/null @@ -1,2 +0,0 @@ -face-root.svg usr/share/kali-themes -etc diff --git a/debian/kali-themes.lintian-overrides b/debian/kali-themes.lintian-overrides deleted file mode 100644 index 59f83463..00000000 --- a/debian/kali-themes.lintian-overrides +++ /dev/null @@ -1,8 +0,0 @@ -image-file-has-unexpected-name (is SVG) [etc/skel/.face] -package-contains-file-in-etc-skel [etc/skel/.face*] -package-contains-file-in-etc-skel [etc/skel/.local/*] -# Config files for genmon and cpugraph xfce4-panel widgets -# At some point this will be moved to /etc/xdg/xfce4/panel/default.xml -# https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/issues/22 -# https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/issues/13 -package-contains-file-in-etc-skel [etc/skel/.config/*] diff --git a/debian/kali-themes.postinst b/debian/kali-themes.postinst deleted file mode 100644 index c7a2b56c..00000000 --- a/debian/kali-themes.postinst +++ /dev/null @@ -1,177 +0,0 @@ -#!/bin/sh - -set -e - -FILES_TO_DIVERT=" -/etc/gtk-2.0/gtkrc -/etc/lightdm/lightdm-gtk-greeter.conf -/etc/plymouth/plymouthd.conf -/etc/sddm.conf.d/kde_settings.conf -/etc/xdg/alacritty/alacritty.yml -/etc/xdg/compton.conf -/etc/xdg/gtk-3.0/settings.ini -/etc/xdg/kcm-about-distrorc -/etc/xdg/kdeglobals -/etc/xdg/kickoffrc -/etc/xdg/konsolerc -/etc/xdg/kscreenlockerrc -/etc/xdg/kwinrc -/etc/xdg/menus/xfce-settings-manager.menu -/etc/xdg/mimeapps.list -/etc/xdg/picom.conf -/etc/xdg/plasmarc -/etc/xdg/qt5ct/qt5ct.conf -/etc/xdg/qt6ct/qt6ct.conf -/etc/xdg/qterminal.org/qterminal.ini -/etc/xdg/terminator/config -/etc/xdg/Thunar/accels.scm -/etc/xdg/Thunar/uca.xml -/etc/xdg/xfce4/helpers.rc -/etc/xdg/xfce4/panel/default.xml -/etc/xdg/xfce4/terminal/terminalrc -/etc/xdg/xfce4/whiskermenu/defaults.rc -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml -/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml -/etc/xdg/xfce-mimeapps.list -/etc/xdg/yakuakerc -" # END FILES_TO_DIVERT - -install_all() { - local opt=$1 - local file= - for file in $FILES_TO_DIVERT; do - install_config_file "$file" "$opt" - done -} - -install_config_file() { - local file=$1 - local opt=$2 - local orig_file="/usr/share/kali-themes$file" - if [ "$opt" = "force" ] || ([ ! -e "$file" ] && [ -e "$orig_file" ]); then - echo "Installing $orig_file as $file" - mkdir -p "$(dirname "$file")" - cp "$orig_file" "$file" - fi -} - -remove_config_file() { - local file=$1 - rm -f "$file" - dpkg-divert --rename --package kali-themes \ - --divert "$file.original" \ - --remove "$file" -} - -if [ "$1" = "configure" ]; then - if [ -z "$2" ]; then - # Initial install - install_all force - else - # Upgrade all files once - if dpkg --compare-versions "$2" lt "2019.4.18"; then - install_all force - fi - if dpkg --compare-versions "$2" lt "2020.2.3"; then - # Force upgrade modified config files - install_config_file /etc/xdg/xfce4/terminal/terminalrc force - install_config_file /etc/xdg/kscreenlockerrc force - fi - if dpkg --compare-versions "$2" lt "2021.1.1"; then - remove_config_file /etc/xdg/Trolltech.conf - fi - if dpkg --compare-versions "$2" lt "2021.3.0"; then - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml force - install_config_file /etc/xdg/qterminal.org/qterminal.ini force - install_config_file /etc/xdg/kdeglobals force - install_config_file /etc/xdg/xfce4/helpers.rc force - fi - if dpkg --compare-versions "$2" lt "2021.4.1"; then - install_config_file /etc/xdg/kwinrc force - fi - if dpkg --compare-versions "$2" lt "2021.4.2"; then - install_config_file /etc/xdg/kickoffrc force - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml force - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml force - fi - if dpkg --compare-versions "$2" lt "2022.1.0"; then - install_config_file /etc/xdg/qt5ct/qt5ct.conf force - install_config_file /etc/lightdm/lightdm-gtk-greeter.conf force - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml force - fi - if dpkg --compare-versions "$2" lt "2022.2.0"; then - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml force - fi - if dpkg --compare-versions "$2" lt "2022.4.3"; then - install_config_file /etc/xdg/mimeapps.list force - install_config_file /etc/xdg/picom.conf force - install_config_file /etc/xdg/terminator/config force - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml force - fi - if dpkg --compare-versions "$2" lt "2022.4.4"; then - install_config_file /etc/xdg/xfce-mimeapps.list force - fi - if dpkg --compare-versions "$2" lt "2023.1.0"; then - install_config_file /etc/xdg/menus/xfce-settings-manager.menu force - install_config_file /etc/xdg/Thunar/accels.scm force - install_config_file /etc/xdg/Thunar/uca.xml force - install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml force - fi - if dpkg --compare-versions "$2" lt "2023.1.3"; then - install_config_file /etc/xdg/alacritty/alacritty.yml force - fi - if dpkg --compare-versions "$2" lt "2023.1.6"; then - install_config_file /etc/xdg/kcm-about-distrorc force - fi - if dpkg --compare-versions "$2" lt "2023.4.1"; then - install_config_file /etc/xdg/xfce4/whiskermenu/defaults.rc force - fi - if dpkg --compare-versions "$2" lt "2024.1.3"; then - install_config_file /etc/xdg/xfce4/panel/default.xml force - fi - # Install remaining new files - install_all - fi - # Configure /root/.face to have a red-background avatar - if [ ! -e /root/.face ]; then - cp /usr/share/kali-themes/face-root.svg /root/.face - fi - ln -sf /root/.face /root/.face.icon - # If installed, replace default-browser with firefox in xfce4-panel - if dpkg-query --list firefox-esr | grep -q "^[ih][HUFWti] " ; then - echo "firefox-esr package found, replacing default-browser in xfce4-panel" - sed -i 's/xfce4-web-browser/firefox-esr/' /etc/xdg/xfce4/panel/default.xml - fi - # Use lighter configuration for xfce4-panel in arm devices - if dpkg --print-architecture | grep -q arm; then - sed -i '/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/xdg/xfce4/terminal/terminalrc b/etc/xdg/xfce4/terminal/terminalrc deleted file mode 100644 index 48b468a4..00000000 --- a/etc/xdg/xfce4/terminal/terminalrc +++ /dev/null @@ -1,6 +0,0 @@ -[Configuration] -BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT -FontUseSystem=TRUE -ColorUseTheme=TRUE -BackgroundDarkness=0.95 -ColorPalette=#1F2229;#D41919;#5EBDAB;#FEA44C;#367bf0;#9755b3;#49AEE6;#E6E6E6;#198388;#EC0101;#47D4B9;#FF8A18;#277FFF;#962ac3;#05A1F7;#FFFFFF diff --git a/etc/xdg/xfce4/whiskermenu/defaults.rc b/etc/xdg/xfce4/whiskermenu/defaults.rc deleted file mode 100644 index 0eb8b3f1..00000000 --- a/etc/xdg/xfce4/whiskermenu/defaults.rc +++ /dev/null @@ -1,25 +0,0 @@ -item-icon-size=2 -category-icon-size=1 -hover-switch-category=true -launcher-show-description=false -button-icon=kali-panel-menu -position-search-alternate=false -position-categories-alternate=true -position-profile-alternate=true -load-hierarchy=true -menu-width=570 -menu-height=670 -show-command-profile=false -favorites=exo-terminal-emulator.desktop,root-terminal.desktop,exo-file-manager.desktop,xfce-text-editor.desktop,exo-web-browser.desktop,kali-www.desktop,kali-docs.desktop,kali-bugs.desktop,offsec-training.desktop,exploit-database.desktop,vulnhub.desktop -command-settings=xfce4-settings-manager -show-command-settings=true -show-command-lockscreen=false -show-command-switchuser=false -show-command-logoutuser=false -show-command-restart=false -show-command-shutdown=false -show-command-suspend=false -show-command-hibernate=false -show-command-logout=true -show-command-menueditor=false -show-command-profile=false diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml deleted file mode 100644 index 59a3673a..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml deleted file mode 100644 index 172c4f4d..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml deleted file mode 100644 index b842de52..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml deleted file mode 100644 index d9786fdb..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml deleted file mode 100644 index dbb6cc8c..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index 4d8154ed..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index a69323c1..00000000 --- a/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/xdg/yakuakerc b/etc/xdg/yakuakerc deleted file mode 100644 index 16074ada..00000000 --- a/etc/xdg/yakuakerc +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -Skin=Kali-Dark - -[Desktop Entry] -DefaultProfile=Kali-Dark.profile diff --git a/face-purple.svg b/face-purple.svg deleted file mode 100644 index ed69a81e..00000000 --- a/face-purple.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/face-root.svg b/face-root.svg deleted file mode 100644 index ff8694f7..00000000 --- a/face-root.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/kali-logos/Makefile b/kali-logos/Makefile deleted file mode 100644 index 10f8d4f9..00000000 --- a/kali-logos/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -dir = usr/share/images/kali-logos - -.PHONY: build clean install - -LOGOS = $(basename $(wildcard *.svg)) -$(info Logos: '$(LOGOS)') -RESOLUTIONS := 64 128 256 -$(info Resolutions: '$(RESOLUTIONS)') - -# The build: target should depend on all PNGs to generate -$(info $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png))) -build: $(foreach SVG,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES).png)) - -# Dynamically add rules for PNG generation for each resolution, for each logo file -define SVG_TO_PNG_RULE -$1-$2.png: $1.svg - rsvg-convert $$< -h $2 -o $$@.raw - optipng $$@.raw -out $$@ -endef -$(foreach LOGO,$(LOGOS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(LOGO),$(RES))))) - -clean: - rm -f *.png.raw - rm -f *.png - -install: - install -d $(DESTDIR)/$(dir) - $(INSTALL_DATA) $(wildcard *.svg) $(DESTDIR)/$(dir) - $(INSTALL_DATA) $(wildcard *.png) $(DESTDIR)/$(dir) - -include ../Makefile.inc diff --git a/kali-logos/logo-text-version.svg b/kali-logos/logo-text-version.svg deleted file mode 120000 index 1003e528..00000000 --- a/kali-logos/logo-text-version.svg +++ /dev/null @@ -1 +0,0 @@ -logo.svg \ No newline at end of file diff --git a/kali-logos/logo-text.svg b/kali-logos/logo-text.svg deleted file mode 120000 index 1003e528..00000000 --- a/kali-logos/logo-text.svg +++ /dev/null @@ -1 +0,0 @@ -logo.svg \ No newline at end of file diff --git a/kali-logos/logo.svg b/kali-logos/logo.svg deleted file mode 100644 index 1c5b04cd..00000000 --- a/kali-logos/logo.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/themes/Kali/sass/common/_colors.scss b/src/themes/Kali/sass/common/_colors.scss index c24bef46..935b76b6 100644 --- a/src/themes/Kali/sass/common/_colors.scss +++ b/src/themes/Kali/sass/common/_colors.scss @@ -4,6 +4,9 @@ //@import '_palette.scss'; $is_highcontrast: false; +$contrast: 'normal'; + +$background_mix_factor: if($variant == 'light', 12%, 9%); // base color for light theme $_dark_base_color: #272a34; @@ -56,16 +59,19 @@ $osd_outer_borders_color: transparentize($osd_fg_color, 0.9); $sidebar_bg_color: mix($bg_color, $base_color, 50%); $base_hover_color: transparentize($fg_color, 0.95); -$panel_bg: transparentize($bg_color, if($variant=='light', 0.1, 0.2)); -$panel_fg: if($variant=='light', darken($fg_color, 10%), $fg_color); +// panel colors +$panel_bg_color: transparentize($bg_color, if($variant=='light', 0.1, 0.2)); +$panel_fg_color: if($variant=='light', darken($fg_color, 10%), $fg_color); + +// card elements +$card_bg_color: mix($fg_color, $bg_color, $background_mix_factor); +$card_shadow_color: transparent; +$card_shadow_border_color: $card_bg_color; $tooltip_borders_color: $osd_outer_borders_color; $shadow_color: transparentize(black, if($variant == 'light', 0.9, 0.7)); -// buttons -$button_mix_factor: if($variant == 'light', 10%, 9%); - // notifications $bubble_buttons_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%)); @@ -116,19 +122,26 @@ $backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdro //special cased widget colors $suggested_bg_color: $selected_bg_color; $suggested_border_color: $selected_borders_color; + $progress_bg_color: $selected_bg_color; $progress_border_color: $selected_borders_color; + $checkradio_bg_color: $selected_bg_color; $checkradio_fg_color: $selected_fg_color; $checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color,20%), darken($checkradio_bg_color,40%)); + $switch_bg_color: $selected_bg_color; $switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),darken($switch_bg_color,30%)); + +$focus_color: $selected_bg_color; $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.5), transparentize($selected_bg_color, 0.3)); + $alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7)); $dim_label_opacity: 0.55; // Gnome's color palette -$light_1: white; -$light_3: red; // not used after theme tweaks -$dark_5: black; -$orange_3: $warning_color; +$_base_color_light: #ffffff; +$light_1: #ffffff; +$orange_3: $warning_color; // privacy_indicator_color +$orange_4: $warning_color; // privacy_indicator_color +$red_4: $error_color; // recording_indicator_color diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss index 347ef4c2..828761c8 100644 --- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss +++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss @@ -9,7 +9,7 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8); // Dropshadow for large icons .icon-dropshadow { - icon-shadow: 0 1px 5px $shadow_color; + icon-shadow: 0 2px 4px $shadow_color; } /* Slider */ @@ -19,21 +19,6 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8); -slider-handle-radius: 0; } -/* Message List */ -.message-list-controls { - spacing: $base_padding * 2; - @include fontsize(10); -} - -.message { - .message-content { - padding: $base_padding; - spacing: 0; - } - .message-title { padding-top: .5em; } - .message-secondary-bin > .event-time { padding-bottom: .5em; } -} - /* Notifications & Message Tray */ .notification-banner { box-shadow: $dialog_box_shadow; } @@ -84,7 +69,7 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8); #panel { $_panel_bg: transparentize($bg_color, .2); $_panel_fg: if($variant=='light', black, white); - $_panel_text_shadow: 0 1px 2px transparentize(black, 0.7); + $_panel_text_shadow: 0 1px 2px transparentize(black, 0.8); background: $_panel_bg; text-shadow: $_panel_text_shadow; box-shadow: none; @@ -152,6 +137,7 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8); border: none; text-shadow: $_text-shadow; transition-duration: 200ms; + selection-background-color: transparentize($selected_bg_color, .7); &, StLabel.hint-text { color: $osd_fg_color; } @@ -201,23 +187,26 @@ $dialog_box_shadow: 0 2px 6px -2px transparentize(black, .8); } /* App Grid */ -#overview, .app-well-app { color: $osd_fg_color; } - -// Icon tiles in the app grid -.app-well-app.app-folder { - @include overview_icon(white, $flat: false); - .overview-icon { - @extend %overview-transparent-bg; +.overview-tile { + &, .app-folder-dialog & { + background: transparent; + &, &:hover, &:active, &:checked, &:focus, &:highlighted, &:selected { + &:hover, &:active, &:focus { background: transparentize(white, .8); } + } } } +// app folders +.overview-tile.app-folder { + @extend %overview-transparent-bg; +} + .app-folder-dialog { background: black; box-shadow: 0 0 100px lighten(black, 4%); } /* OSD */ - // Raise volume and workspace-switcher osd dialogs .osd-window, .workspace-switcher { margin-bottom: 128px; diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss index 41454e26..a4394ddb 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-high-contrast.scss @@ -1,33 +1,7 @@ $variant: 'dark'; +$contrast: "high"; @import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors @import "gnome-shell-sass/_drawing"; @import "gnome-shell-sass/_common"; @import "gnome-shell-sass/_widgets"; - -.toggle-switch { width: 48px; } -.toggle-switch { - background-image: url("assets/toggle-off-hc.svg"); - &:checked { background-image: url("assets/toggle-on-hc.svg"); } -} - -//force opaque panel -#panel { - &.login-screen, - &.unlock-screen, - &:overview { - background-color: #000; - } - - .panel-button { - color: #fff !important; - } -} - -//thumbnail app icons no dropshadow and forced color -.window-picker .icon-dropshadow { - icon-shadow: none; - background-color: $osd_bg_color; - padding: $base_padding * 2; - border-radius: $modal_radius; -} diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss index ebb9a017..ffd4e9fc 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_colors.scss @@ -1,61 +1,53 @@ -// When color definition differs for dark and light variant, -// it gets @if-ed depending on $variant +// +// Main color definitions +// +// When color definition differs for dark and light variant, it gets @if-ed depending on $variant @import '_palette.scss'; +@import '_default-colors.scss'; -$is_highcontrast:false; -// base color for light theme -$_dark_base_color: desaturate($dark_4, 100%); +// global colors +$base_color: if($variant == 'light', $light_1, $_base_color_dark); +$bg_color: if($variant == 'light', $_base_color_light, lighten($base_color, 5%)); +$fg_color: if($variant == 'light', $_base_color_dark, $light_1); -$base_color: if($variant == 'light', $light_1, $_dark_base_color); -$bg_color: if($variant == 'light', $light_2, lighten($base_color, 5%)); -$fg_color: if($variant == 'light', $_dark_base_color, white); +// OSD elements +$osd_fg_color: $light_1; +$osd_bg_color: lighten($_base_color_dark, 5%); -$selected_fg_color: $light_1; -$selected_bg_color: $blue_3; -$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 20%)); +// system elements (e.g. the overview) that are always dark +$system_base_color: $_base_color_dark; +$system_fg_color: $_base_color_light; -$borders_color: if($variant == 'light', transparentize($fg_color, .85), transparentize($fg_color, .9)); +// panel colors +$panel_bg_color: if($variant == 'light', $_base_color_light, $dark_5); +$panel_fg_color: if($variant == 'light', $_base_color_dark, $light_1); + +// card elements +$card_bg_color: if($variant == 'light', $light_1, lighten($bg_color, 7%)); +$card_shadow_color: if($variant == 'light', transparentize($dark_5, .97), transparent); +$card_shadow_border_color: if($variant == 'light', transparentize($dark_5, .91), transparent); + +// +// Derived Colors +// +// colors based on the global defines above + +// borders +$borders_color: transparentize($fg_color, $border_opacity); $outer_borders_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%)); -$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%)); -$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%)); - -$warning_color: if($variant == 'light', $yellow_4, $yellow_3); -$error_color: if($variant == 'light', $red_4, $red_3); -$success_color: if($variant == 'light', $green_4, $green_5); -$destructive_color: $error_color; - -// color definitions for OSD elements -$osd_fg_color: $light_1; -$osd_bg_color: lighten($_dark_base_color, 5%); - -// derived osd colors -$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5); -$osd_insensitive_fg_color: mix($osd_fg_color, $osd_bg_color, 70%); +// osd colors $osd_borders_color: transparentize($osd_fg_color, 0.9); $osd_outer_borders_color: transparentize($osd_fg_color, 0.98); -$shadow_color: if($variant == 'light', rgba(0,0,0,.05), rgba(0,0,0,0.2)); - -// buttons -$button_mix_factor: if($variant == 'light', 12%, 9%); - -// notifications -$bubble_buttons_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%)); - -// color definitions for system elements (e.g. the overview) -$system_base_color: $_dark_base_color; // always dark -$system_fg_color: $light_2; - -// derived system colors +// system colors $system_bg_color: lighten($system_base_color, 5%); $system_borders_color: transparentize($system_fg_color, .9); $system_insensitive_fg_color: mix($system_fg_color, $system_bg_color, 50%); $system_overlay_bg_color: mix($system_base_color, $system_fg_color, 90%); // for non-transparent items, e.g. dash -// derived global colors // insensitive state $insensitive_fg_color: if($variant == 'light', mix($fg_color, $bg_color, 60%), mix($fg_color, $bg_color, 50%)); $insensitive_bg_color: mix($bg_color, $base_color, 60%); @@ -72,3 +64,6 @@ $hover_fg_color: if($variant=='light', darken($fg_color,9%), lighten($fg_color, // active state $active_bg_color: if($variant=='light', darken($bg_color, 11%), lighten($bg_color, 12%)); $active_fg_color: if($variant=='light', darken($fg_color, 11%), lighten($fg_color, 12%)); + +// selection colors +$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%)); \ No newline at end of file diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss index 50eb0841..908749c8 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss @@ -25,29 +25,41 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; /* Global Values */ -// padding, margin and spacing -$base_padding: 6px; -$base_margin: 4px; +// Base values of elements of the shell in their smallest "unit". +// These are used in calculations elsewhere to have elements in proportion +$base_font_size: 10pt; // font size +$base_padding: 6px; // internal padding of elements +$base_margin: 4px; // margin between elements +$base_border_radius: 8px; // radii on all elements -// border radii -$base_border_radius: 8px; +// Radius used to make sure elements that have rounded corners stay as such. +// This is a workaround for 50% not working. +$forced_circular_radius: 999px; // radii of things that display over other things, e.g. popovers -$modal_radius: $base_border_radius*2; // 24px +$modal_radius: $base_border_radius * 2; // Chroma key to flag when a background-color is always occluded, not visible. // This allows any box-shadow behind it to be rendered more efficiently by // omitting the middle rectangle. $invisible_occluded_bg_color: rgba(3,2,1,0); -// fonts -$base_font_size: 10; -$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2)); +// Fixed icon sizes +$base_icon_size: 16px; +$medium_icon_size: $base_icon_size * 1.5; // 24px +$large_icon_size: $base_icon_size * 2; // 32px -// icons -$base_icon_size: 1.09em; -$large_icon_size: $base_icon_size*2; // 32px -// $base_icon_size: 16px; +// Scaled values +// Used in elements that follow text scaling factors +$scaled_padding: to_em(6px); // same as $base_padding + +// Used for symbolic icons that scale +$scalable_icon_size: to_em(16px); +$medium_scalable_icon_size: $scalable_icon_size * 1.5; +$large_scalable_icon_size: $scalable_icon_size * 2; + +// animation definition +$ease_out_quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); // Stage stage { @@ -56,29 +68,31 @@ stage { } /* Common Stylings */ +%reset { + background: none; + box-shadow: none; + border: none; + border-radius: 0; + padding: 0; + margin: 0; +} // icon tiles %tile { - border-radius: $base_border_radius * 2; // 16px + border-radius: $base_border_radius * 2; padding: $base_padding; spacing: $base_padding; - border: 2px solid transparent; - transition-duration: 200ms; text-align: center; - color: inherit; - - @if $is_highcontrast { - border-color: $hc_inset_color; - } + transition-duration: 100ms; } -// normal button styling +// common button styling %button_common { border-radius: $base_border_radius; - border-style: solid; - border-width: 1px; + padding: $base_padding * .5 $base_padding * 4; font-weight: bold; - padding: $base_padding*.5 $base_padding*4; + transition: border-width 300ms $ease_out_quad, + box-shadow 300ms $ease_out_quad; } %button { @@ -90,35 +104,84 @@ stage { &:selected, &:active { @include button(active);} &:checked { @include button(checked);} - &.default { @include button(default);} +} - &.flat { - @include button(normal, $flat:true); - &:focus { @include button(focus, $flat:true);} - &:hover { @include button(hover, $flat:true);} - &:insensitive { @include button(insensitive, $flat:true);} - &:selected, - &:active { @include button(active, $flat:true);} - &:checked { @include button(checked, $flat:true);} - &.default { @include button(default, $flat:false);} +%flat_button { + @include button(normal, $style: flat); + &:focus { @include button(focus, $style: flat);} + &:hover { @include button(hover, $style: flat);} + &:insensitive { @include button(insensitive, $style: flat);} + &:selected, + &:active { @include button(active, $style: flat);} + &:checked { @include button(checked, $style: flat);} +} + +%default_button { + @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color, $style: default); + &:focus { @include button(focus, $c:$selected_bg_color, $tc:$selected_fg_color, $style: default);} + &:hover { @include button(hover, $c:$selected_bg_color, $tc:$selected_fg_color, $style: default);} + &:insensitive { @include button(insensitive, $c:$selected_bg_color, $tc:$selected_fg_color, $style: default);} + &:active { @include button(active, $c:$selected_bg_color, $tc:$selected_fg_color, $style: default);} +} + +// items in popover menus +%menuitem { + font-weight: normal; + spacing: $base_padding; + transition-duration: 100ms; + padding: $base_padding * 1.5 $base_padding * 2; +} + +// common style for card elements +%card_common { + border-radius: $base_border_radius * 1.5; + padding: $scaled_padding * 2; + margin: $base_margin; + background-color: $card_bg_color; + box-shadow: 0 1px 2px 0 $card_shadow_color; + // bit of a hack here with border since we can't have double box-shadow + border: 1px solid $card_shadow_border_color; + + @if $contrast == 'high' { + border-color: transparent; + box-shadow: none; } } +%card { + @extend %card_common; + @include button(normal, $style: card); + &:hover { @include button(hover, $style: card);} + &:active { @include button(active, $style: card);} + &:focus { @include button(focus, $style: card);} + &:insensitive { @include button(insensitive, $style: card);} +} + +%card_flat { + @extend %card_common; + border: 1px solid transparent !important; // override of the button style needed here + @include button(undecorated, $style: flat); + &:hover { @include button(hover, $style: flat);} + &:active { @include button(active, $style: flat);} + &:focus { @include button(focus, $style: card);} + &:insensitive { @include button(insensitive, $style: card);} +} + // normal entry style %entry_common { border-radius: $base_border_radius; - padding: $base_padding*1.5 $base_padding*1.5; + padding: $base_padding * 1.5 $base_padding * 1.5; selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; } %entry { @extend %entry_common; - @include entry(normal, $c:$fg_color); - &:hover { @include entry(hover, $c:$fg_color);} - &:focus { @include entry(focus, $c:$fg_color);} - &:insensitive { @include entry(insensitive, $c:$fg_color);} + @include entry(normal); + &:hover { @include entry(hover);} + &:focus { @include entry(focus);} + &:insensitive { @include entry(insensitive);} StLabel.hint-text { color: transparentize($fg_color, 0.3); @@ -134,33 +197,36 @@ stage { &:ltr {margin-right: 1px;} &:rtl {margin-left: 1px;} - @include button(normal, $c:$bubble_buttons_color); - &:insensitive { @include button(insensitive, $c:$bubble_buttons_color);} - &:focus { @include button(focus, $c:$bubble_buttons_color);} - &:hover { @include button(hover, $c:$bubble_buttons_color);} - &:active { @include button(active, $c:$bubble_buttons_color);} - &:checked { @include button(checked, $c:$bubble_buttons_color);} + // needs a 1px adjustment to fit exactly into the outer radius + $bubble_button_radius: $modal_radius - 1px; + + @include button(normal, $style: bubble); + &:focus { @include button(focus, $style: bubble);} + &:hover { @include button(hover, $style: bubble);} + &:active { @include button(active, $style: bubble);} + &:checked { @include button(checked, $style: bubble);} + &:insensitive { @include button(insensitive, $style: bubble);} &:first-child:ltr { - border-radius: 0 0 0 $modal_radius; + border-radius: 0 0 0 $bubble_button_radius; } &:last-child:ltr { - border-radius: 0 0 $modal_radius; + border-radius: 0 0 $bubble_button_radius; margin-right: 0 !important; } &:first-child:rtl { - border-radius: 0 0 $modal_radius; + border-radius: 0 0 $bubble_button_radius; } &:last-child:rtl { - border-radius: 0 0 0 $modal_radius; + border-radius: 0 0 0 $bubble_button_radius; margin-left: 0 !important; } &:first-child:last-child { - border-radius: 0 0 $modal_radius $modal_radius; + border-radius: 0 0 $bubble_button_radius $bubble_button_radius; margin-left: 0 !important; margin-right: 0 !important; } @@ -172,11 +238,11 @@ stage { border: 1px solid transparentize($light_1, 0.9); color: $light_1; - border-radius: 99px; + border-radius: $forced_circular_radius; padding: $base_padding $base_padding * 2; text-align: center; - @if $is_highcontrast { + @if $contrast == 'high' { background-color: black; border-color: $hc_inset_color; } @@ -185,47 +251,47 @@ stage { /* General Typography */ %large_title { font-weight: 300; - @include fontsize(24); + @include fontsize(24pt); } %title_1 { font-weight: 800; - @include fontsize(20); + @include fontsize(20pt); } %title_2 { font-weight: 800; - @include fontsize(15); + @include fontsize(15pt); } %title_3 { font-weight: 700; - @include fontsize(15); + @include fontsize(15pt); } %title_4 { font-weight: 700; - @include fontsize(13); + @include fontsize(13pt); } %heading { font-weight: 700; - @include fontsize(11); + @include fontsize(11pt); } %caption_heading { font-weight: 700; - @include fontsize(9); + @include fontsize(9pt); } %caption { font-weight: 400; - @include fontsize(9); + @include fontsize(9pt); } %smaller { font-weight: 400; - @include fontsize(8); + @include fontsize(8pt); } %monospace {font-family: monospace;} @@ -237,21 +303,20 @@ stage { color: $osd_fg_color; background-color: $osd_bg_color; border: 1px solid $osd_outer_borders_color; - border-radius: 999px; - padding: $base_padding*2; - - @if $is_highcontrast { - border: 2px solid $hc_inset_color; + border-radius: $forced_circular_radius; + padding: $base_padding * 2; + @if $contrast == 'high' { + @include draw_hc_inset($width: 2px,$border: true); } } // entries %osd_entry { @extend %entry_common; - @include entry(normal, $c:$osd_fg_color,); - &:hover { @include entry(hover, $c:$osd_fg_color);} - &:focus { @include entry(focus, $c:$osd_fg_color);} - &:insensitive { @include entry(insensitive, $c:$osd_fg_color);} + @include entry(normal, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true); + &:hover { @include entry(hover, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);} + &:focus { @include entry(focus, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);} + &:insensitive { @include entry(insensitive, $c:$osd_fg_color, $bc:$osd_bg_color, $always_dark: true);} StLabel.hint-text {color: transparentize($osd_fg_color, 0.3); } } @@ -259,18 +324,22 @@ stage { // buttons on OSD elements %osd_button { @extend %button_common; - @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true); - &:insensitive { @include button(insensitive, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true);} - &:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true);} - &:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true);} - &:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true);} - &:outlined,&:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true);} + @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true); + &:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);} + &:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);} + &:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);} + &:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);} + &:insensitive { @include button(insensitive, $tc:$osd_fg_color, $c:$osd_bg_color, $always_dark: true);} } %osd_button_flat { - @extend %osd_button; - @include button(undecorated, $osd:true); - &:insensitive { @include button(undecorated, $tc:$osd_fg_color, $c:$osd_bg_color, $osd:true);} + @extend %button_common; + @include button(normal, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true); + &:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);} + &:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);} + &:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);} + &:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);} + &:insensitive { @include button(insensitive, $tc:$osd_fg_color, $c:$osd_bg_color, $style: flat, $always_dark: true);} } /* System Elements */ @@ -278,15 +347,14 @@ stage { // entries %system_entry { @extend %entry_common; - @include entry(normal, $c:$system_fg_color,); - &:hover { @include entry(hover, $c:$system_fg_color);} - &:focus { @include entry(focus, $c:$system_fg_color, $fc:$selected_bg_color);} - &:insensitive { @include entry(insensitive, $c:$system_fg_color);} + @include entry(normal, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true); + &:hover { @include entry(hover, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);} + &:focus { @include entry(focus, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);} + &:insensitive { @include entry(insensitive, $c:$system_fg_color, $bc:$system_bg_color, $always_dark: true);} StLabel.hint-text { color: transparentize($system_fg_color, 0.3);} } - // buttons %system_button { @include button(normal, $tc:$system_fg_color, $c:$system_bg_color); @@ -294,5 +362,30 @@ stage { &:focus { @include button(focus, $tc:$system_fg_color, $c:$system_bg_color);} &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_bg_color);} &:active { @include button(active, $tc:$system_fg_color, $c:$system_bg_color);} - &:outlined,&:checked { @include button(checked, $tc:$system_fg_color, $c:$system_bg_color);} + &:checked { @include button(checked, $tc:$system_fg_color, $c:$system_bg_color);} } + +/* Lockscreen Elements */ + +// buttons +%lockscreen_button { + @extend %button_common; + @include button(normal, $tc:$system_fg_color, $style: lockscreen); + &:focus { @include button(focus, $tc:$system_fg_color, $style: lockscreen);} + &:hover { @include button(hover, $tc:$system_fg_color, $style: lockscreen);} + &:active { @include button(active, $tc:$system_fg_color, $style: lockscreen);} + &:checked { @include button(checked, $tc:$system_fg_color, $style: lockscreen);} + &:insensitive { @include button(insensitive, $tc:$system_fg_color, $style: lockscreen);} +} + +// entries +%lockscreen_entry { + @extend %entry_common; + @include entry(normal, $c:$system_fg_color, $style: lockscreen, $always_dark: true); + &:hover { @include entry(hover, $c:$system_fg_color, $style: lockscreen, $always_dark: true);} + &:focus { @include entry(focus, $c:$system_fg_color, $style: lockscreen, $always_dark: true);} + &:insensitive { @include entry(insensitive, $c:$system_fg_color, $style: lockscreen, $always_dark: true);} + + StLabel.hint-text { color: transparentize($system_fg_color, 0.3);} +} + diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch index 0ef0abc6..f1488794 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss.patch @@ -1,4 +1,4 @@ -44c44 -< $base_font_size: 11; +30c30 +< $base_font_size: 11pt; // font size --- -> $base_font_size: 10; +> $base_font_size: 10pt; // font size diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_default-colors.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_default-colors.scss new file mode 100644 index 00000000..6c700871 --- /dev/null +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_default-colors.scss @@ -0,0 +1,54 @@ +// Named Colors + +// base colors +$_base_color_dark: desaturate($dark_4, 100%); +$_base_color_light: desaturate($light_2, 100%); + +// colors for destructive elements +$destructive_bg_color: if($variant == 'light', $red_3, $red_4); +$destructive_fg_color: $light_1; +$destructive_color: $destructive_bg_color; + +// colors for levelbars, entries, labels and infobars +$success_bg_color: if($variant == 'light', $green_4, $green_5); +$success_fg_color: $light_1; +$success_color: $success_bg_color; + +$warning_bg_color: if($variant == 'light', $yellow_4, $yellow_3); +$warning_fg_color: transparentize(black, .2); +$warning_color: $warning_bg_color; + +$error_bg_color: if($variant == 'light', $red_3, $red_4); +$error_fg_color: $light_1; +$error_color: $error_bg_color; + +// colors for selected or default elements +$selected_bg_color: if($variant == 'light', $blue_4, $blue_3); +$selected_fg_color: $light_1; + +// link colors +$link_color: if($variant == 'light', $blue_4, $blue_2); +$link_visited_color: transparentize($link_color, .6); + +// special cased widget definitions +$background_mix_factor: if($variant == 'light', 12%, 9%); // used to boost the color of backgrounds in different variants +$border_opacity: if($variant == 'light', .85, .9); // change the border opacity in different variants + +// shadows +$shadow_color: if($variant == 'light', rgba(0,0,0,.05), rgba(0,0,0,0.2)); +$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2)); + +// focus colors +$focus_color: $selected_bg_color; +$focus_border_color: transparentize($focus_color, 0.5); + +// High Contrast overrides +@if $contrast == 'high' { + // increase border opacity + $border_opacity: .5; + // remove shadows + $shadow_color: transparent; + $text_shadow_color: transparent; + // less transparent focus color + $focus_border_color: transparentize($focus_color, 0.2); +} diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss index 85f16fb3..5d56d4c1 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_drawing.scss @@ -1,355 +1,378 @@ +// +// Drawing functions +// + +// Function to convert px values to em +@function to_em($input, $base: 16px) { + // multiplied and divided by 1000 to make up for round() shortcoming + $em_value: ($input / $base) * 1.091 * 1000; + @return round($em_value) / 1000 * 1em; +} + +// Boost the contrast of a color by mixing it with high contrast defined colors +@function hc_color_mix($c, $mc:$hc_mix_color, $mf:$hc_mix_factor) { + // + // $c: input color + // $mc: mix color, defined in High Contrast specific stylesheet + // $mf: mix factor (%), defined in High Contrast specific stylesheet + // + @return mix($c, $mc, $mf); +} + +// Function to mix the color and make the focus background +@function focus_bg_color($bg, $fc:$focus_color) { + @return mix($fc, $bg, 5%); +} + +// // Drawing mixins +// -// generic drawing of more complex things +// Draw the inset for High Contrast elements +@mixin draw_hc_inset($width: 1px, $ic: $hc_inset_color, $border: false, $no_inset: false) { + // + // $width width of the inset, in pixels + // $ic color of the inset + // + // $border if true, use a border instead of a box-shadow to draw inset + // $no_inset if true, override the mixin to not draw an iset + // -@function draw_widget_edge($c:$outer_borders_color) { -// outer highlight "used" on most widgets - @return 0 1px $c; + box-shadow: inset 0 0 0 $width $ic; + + // draw inset as border + @if $border { + border: $width solid $ic; + box-shadow: none; + } + + // don't draw an inset at all + @if $no_inset { + box-shadow: none; + border: none; + } } -// provide font size in rem, with px fallback -@mixin fontsize($size: 24, $base: 16) { - font-size: round($size) + pt; - //font-size: ($size / $base) * 1rem; +// Draw the focus ring +@mixin focus_ring($width: 2px, $fc: $focus_border_color, $border: false) { + box-shadow: inset 0 0 0 $width $fc !important; + @if $border { + border:$width solid $fc !important; + box-shadow: none; + } } -@mixin draw_shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) { -// -// Helper function to stack up to 4 box-shadows; -// - @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; } - @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; } - @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; } - @else { box-shadow: $shadow1; } +// Mixin to convert provided font size in pt to em units +@mixin fontsize($size, $base: 16px, $unit: pt) { + // if pt, convert into unitless value with the assumption: 1pt = 1.091px + $adjusted_size: if($unit == pt, $size * 1.091, $size) * 1000; + $rounded_size: round($adjusted_size / $base) / 1000; + font-size: $rounded_size * 1em; + // font-size: round($size) + pt; } +// Function to fill the background of a panel button +@mixin panel_button_fill($bg) { + // use a box-shadow to fill the background + // this is done because panel buttons use a transparent border to fake padding + box-shadow: inset 0 0 0 100px $bg; +} -// Text entries -@mixin entry($t, $c, $fc:$selected_bg_color) { -// -// Entries drawing function -// -// $t: entry type -// $c: text color, used to derive background color of entries -// -// possible $t values: normal, focus, insensitive -// - transition-duration: 100ms; +// Text entries drawing function +@mixin entry($type, $c:$fg_color, $bc:$bg_color, $style: null, $always_dark: false) { + // + // $type: entry type, possible values: normal, focus, hover, insensitive + // $c: text color + // $bc: background color + // $always_dark: override the light theme check to use dark colors, true or false + // - @if $t==normal { - background-color: transparentize($c, 0.85); - color: transparentize($c,0.3); + // entry colors + $entry_fg_color: $c; + $entry_bg_color: mix($c, $bc, $background_mix_factor); + $entry_focus_color: $focus_color; - @if $is_highcontrast { - box-shadow: inset 0 0 0 1px $hc_inset_color; + // entry color overrides for lockscreen style + @if $style == 'lockscreen' { + $entry_bg_color: transparentize($c, .9); + $entry_focus_color: transparentize($entry_fg_color, 0.6); + @if $contrast == 'high' { + $entry_focus_color: transparentize($entry_fg_color, 0.3); } } - @if $t==focus { - background-color: mix(transparentize($c, 0.75), $fc, 95%); - box-shadow: inset 0 0 0 2px transparentize($fc, 0.3); - color: $c; - &:hover {} + // background color adjustment factors + // the % a color is lightened or darkened for button states + $hover_factor: 4%; + $insensitive_factor: 3%; + + // entry state background colors + $hover_entry_bg_color: if($variant == 'light', darken($entry_bg_color, $hover_factor), lighten($entry_bg_color, $hover_factor)); + $insensitive_entry_bg_color: if($variant == 'light', lighten($entry_bg_color, $insensitive_factor), darken($entry_bg_color, $insensitive_factor)); + + // override entry background colours if element is always dark + @if $always_dark { + $hover_entry_bg_color: lighten($entry_bg_color, $hover_factor); + $insensitive_entry_bg_color: darken($entry_bg_color, $insensitive_factor); } - @if $t==hover { - background-color: transparentize($c, 0.75); + @if $contrast == 'high' { + @include draw_hc_inset(); } - @if $t==insensitive { - background-color:transparentize($c, 0.75); - color: transparentize($c, 0.5); - } -} - -// On-screen Keyboard -@mixin keyboard_key($t, $c:$osd_bg_color, $tc:$osd_fg_color) { -// -// Keyboard key drawing function -// -// $t: key type, -// $c: base key color for colored* types -// $tc: optional text color for colored* types -// -// possible $t values: -// normal, hover, active, insensitive, insensitive-active, -// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active, -// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated -// - - // normal key - @if $t==normal { - color: $tc; - background-color: lighten($c, 3%); + // normal + @if $type == 'normal' { + background-color: $entry_bg_color; + color: transparentize($c, 0.3); } - // focused key - @if $t==focus { - color: $tc; - background-color: mix(lighten($c, 3%), $selected_bg_color, 90%); - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4); - &:hover { - background-color: mix(lighten($c, 8%), $selected_bg_color, 90%); - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3); - } - &:active { - background-color: mix(lighten($c, 10%), $selected_bg_color, 90%); - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3); + // focus styles + @if $type == 'focus' { + @include focus_ring(); + background-color: focus_bg_color($entry_bg_color); + color: $entry_fg_color; + + // lockscreen style + @if $style == 'lockscreen' { + @include focus_ring($fc:$entry_focus_color); + background-color: focus_bg_color($entry_bg_color, $fc:$entry_focus_color); } } - // hover key - @else if $t==hover { - color: $tc; - background-color: lighten($c, 7%); + // hover styles + @if $type == 'hover' { + background-color: $hover_entry_bg_color; + color: $entry_fg_color; } - // active key - @else if $t==active { - color: $tc; - background-color: lighten($c, 10%); - } - - // checked key - @else if $t==checked { - color: $tc; - background-color: lighten($c, 15%); - } - - // insensitive key - @else if $t==insensitive { - color: $insensitive_fg_color; - background-color: $insensitive_bg_color; - } - - // reset - @else if $t==undecorated { - background-color: transparent; - background-image: none; + // insensitive styles + @if $type == 'insensitive' { + background-color: $insensitive_entry_bg_color; + color: transparentize($entry_fg_color, 0.5); } } -// + // Button drawing function -// -// $t: button type, -// $c: base button colors, derived from fg_color -// $tc: base button colors, derived from fg_color -// -// possible $t values: -// normal, hover, active, insensitive, insensitive-active, -// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active, -// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated -// -// since buttons are all flat an borderless now the mixin is simpler +@mixin button($type, $tc:$fg_color, $c:$bg_color, $style: null, $always_dark: false) { + // + // $type: button type, possible values: + // - normal, focus, hover, active, checked, insensitive, default, undecorated + // $c: button bg color, derived from bg_color + // $tc: button text color, derived from fg_color + // $style: button style, possible values: card, bubble, flat, default + // $always_dark: override the light theme check to use dark colors, true or false + // -@mixin button($t, $tc:$fg_color, $c:$bg_color, $flat: false, $osd: false) { + // mix input colors to get button background color + $button_bg_color: mix($tc, $c, $background_mix_factor); - $button_bg_color: mix($tc, $c, $button_mix_factor); - transition-duration: 100ms; + // background color override for card elements + @if $style == 'card' { $button_bg_color: $card_bg_color;} + // background color mix override for flat style; the button bg color is the background color input + @if $style == 'flat' { $button_bg_color: $c;} + // background color mix override for default button style + @if $style == 'default' { $button_bg_color: $c;} - @if $osd { - $button_bg_color: transparentize($tc, 0.9); + // background color adjustment factors + // the % a color is lightened or darkened for button states + $hover_factor: 4%; + $active_factor: 9%; + $checked_factor: 8%; + $insensitive_factor: 3%; + + // flat style overrides + @if $style == 'flat' { + $hover_factor: 7%; // stronger factor in flat style } - // normal button - @if $t==normal { + // button base state background colors + $hover_button_bg_color: if($variant == 'light', darken($button_bg_color, $hover_factor), lighten($button_bg_color, $hover_factor)); + $active_button_bg_color: if($variant == 'light', darken($button_bg_color, $active_factor), lighten($button_bg_color, $active_factor)); + $checked_button_bg_color: if($variant == 'light', darken($button_bg_color, $checked_factor), lighten($button_bg_color, $checked_factor)); + $insensitive_button_bg_color: if($variant == 'light', lighten($button_bg_color, $insensitive_factor), darken($button_bg_color, $insensitive_factor)); + + // button extended state background colors + $active_hover_button_bg_color: if($variant == 'light', darken($active_button_bg_color, $hover_factor), lighten($active_button_bg_color, $hover_factor)); + $checked_hover_button_bg_color: if($variant == 'light', darken($checked_button_bg_color, $hover_factor), lighten($checked_button_bg_color, $hover_factor)); + $checked_active_button_bg_color: if($variant == 'light', darken($checked_button_bg_color, $active_factor), lighten($checked_button_bg_color, $active_factor)); + + // override button background colours if element is always dark + @if $always_dark { + $hover_button_bg_color: lighten($button_bg_color, $hover_factor); + $active_button_bg_color: lighten($button_bg_color, $active_factor); + $checked_button_bg_color: lighten($button_bg_color, $checked_factor); + $insensitive_button_bg_color: darken($button_bg_color, $insensitive_factor); + // extended + $active_hover_button_bg_color: lighten($active_button_bg_color, $hover_factor); + $checked_hover_button_bg_color: lighten($checked_button_bg_color, $hover_factor); + $checked_active_button_bg_color: lighten($checked_button_bg_color, $active_factor); + } + + // background color override for buttons that use transparency + // styles: notification bubbles, lockscreen + @if $style == 'bubble' or $style == 'lockscreen' { + $button_bg_color: transparentize($tc, .9); + $hover_button_bg_color: transparentize($tc, .87); + $active_button_bg_color: transparentize($tc, .84); + $active_hover_button_bg_color: transparentize($tc, .81); + } + + // flat style overrides + @if $style == 'flat' { + $insensitive_button_bg_color: $button_bg_color; + } + + // high contrast overrides + @if $contrast == 'high' { + // override button background colors for high contrast + $button_bg_color: hc_color_mix($button_bg_color); + $hover_button_bg_color: hc_color_mix($hover_button_bg_color); + $active_button_bg_color: hc_color_mix($active_button_bg_color); + $checked_button_bg_color: hc_color_mix($checked_button_bg_color); + + // also draw the inset border + @include draw_hc_inset(); + + // duplicate flat bg color for High Contrast + @if $style == 'flat' { + $button_bg_color: $c; + } + + @if $style == 'default' { + @include draw_hc_inset($no_inset: true); + } + } + + // normal style + @if $type == 'normal' { color: $tc; background-color: $button_bg_color; - @if $flat { - background-color: transparent; - } - @if $is_highcontrast { - box-shadow: inset 0 0 0 1px $hc_inset_color; - } - } - // focused button - @if $t==focus { - color: $tc; - background-color: mix($button_bg_color, $selected_bg_color, 90%); - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4) !important; - &:hover { - background-color: mix(lighten($button_bg_color, 3%), $selected_bg_color, 90%); - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3) !important; - } - &:active { - background-color: mix(lighten($button_bg_color, 6%), $selected_bg_color, 90%); - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3) !important; + // no inset in High Contrast when the style is flat + @if $style == 'flat' and $contrast == 'high' { + @include draw_hc_inset($no_inset: true); } } // hover button - @else if $t==hover { + @else if $type == 'hover' { color: $tc; - background-color: if($variant == 'light', darken($button_bg_color, 3%), lighten($button_bg_color, 3%)); - - @if $is_highcontrast == "true" { - box-shadow: inset 0 0 0 1px lighten($button_inset_color, 3%); - background-color: mix(lighten($button_bg_color, 3%), $button_inset_color, 10%); - } + background-color: $hover_button_bg_color; } // active button - @else if $t==active { + @else if $type == 'active' { color: $tc; - background-color: if($variant == 'light', darken($button_bg_color, 6%), lighten($button_bg_color, 6%)); - @if $is_highcontrast == "true" { - box-shadow: inset 0 0 0 1px lighten($button_inset_color, 6%); - background-color: mix(lighten($button_bg_color, 6%), $button_inset_color, 10%); + background-color: $active_button_bg_color; + &:hover { background-color: $active_hover_button_bg_color;} + &:focus { + // otherwise use focus bg color mixin + $bg: focus_bg_color($active_button_bg_color); + background-color: $bg; } } // checked button - @else if $t==checked { + @else if $type == 'checked' { color: $tc; - background-color: if($variant == 'light', darken($button_bg_color, 9%), lighten($button_bg_color, 9%)); - @if $is_highcontrast == "true" { - box-shadow: inset 0 0 0 1px lighten($button_inset_color, 9%); - background-color: mix(lighten($button_bg_color, 9%), $button_inset_color, 10%); - } - &:hover { background-color: lighten($button_bg_color, 12%);} - &:active { background-color: lighten($button_bg_color, 15%);} + background-color: $checked_button_bg_color; + &:hover { background-color: $checked_hover_button_bg_color;} + &:active { background-color: $checked_active_button_bg_color;} } // insensitive button - @else if $t==insensitive { - color: if($variant == 'light', transparentize($tc, .6), transparentize($tc, .5)); - background-color: if($variant == 'light', transparentize($tc, .9), transparentize($tc, .95)); - } + @else if $type == 'insensitive' { + $insensitive_button_fg_color: if($variant == 'light', transparentize($tc, .6), transparentize($tc, .5)); + color: $insensitive_button_fg_color; + background-color: $insensitive_button_bg_color; - // default/suggested button - @else if $t==default { - background-color: $selected_bg_color; - color: $selected_fg_color; - - &:focus { - box-shadow: inset 0 0 0 2px transparentize($selected_fg_color, .4) !important; - } - &:hover, &:focus { - background-color: lighten($selected_bg_color, 5%); - color: lighten($selected_fg_color, 5%); - } - &:active { - background-color: darken($selected_bg_color, 7%); - color: darken($selected_fg_color, 7%); - } - &:insensitive { - @include button(insensitive); - background-color: transparentize($selected_bg_color, .5); - color: transparentize($selected_fg_color, .5); + // no outline in High Contrast for insensitive buttons + @if $contrast == 'high' { + @include draw_hc_inset($no_inset: true); } } - // reset - @else if $t==undecorated { + // focused button + @else if $type == 'focus' { + color: $tc; + @include focus_ring(); + + // use a different focus ring color for default style + @if $style == 'default' { + @include focus_ring($fc:$selected_borders_color); + } + // change background color if style is flat + @if $style == 'flat' { + $button_bg_color: transparentize($button_bg_color, 0.75); + } + + background-color: focus_bg_color($button_bg_color); + + &:hover { + background-color: focus_bg_color($hover_button_bg_color); + } + } + + // reset (unstyled button) + @else if $type == 'undecorated' { background-color: transparent; - background-color: none; + border-color: transparent; box-shadow: none; + &:insensitive { - @include button(insensitive); - background-color: transparent; + background-color: transparent !important; } } } -// tile -@mixin tile_button($color, $flat: true) { +// Helper mixin for button-like elements with an icon +@mixin tile_button($fg:$system_fg_color, $bg:$system_bg_color, $raised: false, $system: true) { + // + // $fg: foreground color + // $bg: background color + // + // $raised: uses raised style, true or false + // $system: uses system styles, true or false + // + @extend %tile; - @if $flat { - background-color: transparent; + + @if $raised { + @include button(normal, $tc:$fg, $c:$bg, $always_dark: $system); + &:focus { @include button(focus, $tc:$fg, $c:$bg, $always_dark: $system);} + &:hover { @include button(hover, $tc:$fg, $c:$bg, $always_dark: $system);} + &:active { @include button(active, $tc:$fg, $c:$bg, $always_dark: $system);} + &:highlighted,&:selected, + &:checked { @include button(checked, $tc:$fg, $c:$bg, $always_dark: $system);} + &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $always_dark: $system);} } @else { - background-color: transparentize($color, .84); - @if $is_highcontrast { - box-shadow: inset 999px 0 0 0 transparentize($color, .2); // bit of a hack - } - } - &:hover { background-color: transparentize($color, .9);} - &:selected, &:focus { - background-color: transparentize($color, .87); - &:hover { background-color: transparentize($color, .84);} - &:active { background-color: transparentize($color, .87);} - } - &:active { background-color: transparentize($color, .84);} - &:outlined, &:checked { - background-color: transparentize($color, .81); - &:active { background-color: transparentize($color, .78);} - &:hover { background-color: transparentize($color, .75);} + @include button(normal, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system); + &:focus { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} + &:hover { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} + &:active { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} + &:highlighted,&:selected, + &:checked { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} + &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} } + &:drop { - border: 2px solid transparentize($selected_bg_color, .2); //already 2px transparent so no jumping background-color: transparentize($selected_bg_color, .8); - } -} - -// overview icon, dash, app grid -@mixin overview_icon($color, $flat: true) { - transition-duration: 400ms; - .overview-icon { - @extend %tile; - } - @if $flat { - .overview-icon { background-color: transparent;} - } @else { - .overview-icon { background-color: transparentize($color, .93); } - } - &:hover .overview-icon { background-color: transparentize($color, .87);} - - &:selected .overview-icon, - &:focus .overview-icon { - background-color: transparentize($color, .87); - &:hover .overview-icon { background-color: transparentize($color, .84);} - &:active .overview-icon { background-color: transparentize($color, .87);} - } - &:active .overview-icon { background-color: transparentize($color, .84);} - &:outlined .overview-icon, - &:checked .overview-icon { - background-color: transparentize($color, .81); - &:active .overview-icon { background-color: transparentize($color, .78);} - &:hover .overview-icon { background-color: transparentize($color, .75);} - } - &:drop .overview-icon { - border: 2px solid transparentize($selected_bg_color, .2); //already 2px transparent so no jumping - background-color: transparentize($selected_bg_color, .8); - } -} - -// styling for elements within popovers that look like notifications -@mixin card($flat: false) { - border-radius: $base_border_radius*1.5; - margin: $base_margin; - - @if $flat { - @include button(undecorated); - box-shadow: none !important; - } @else { - @include button(normal); - } - &:hover {@include button(hover);} - &:active {@include button(active);} - &:focus {@include button(focus);} - &:insensitive { - @include button(insensitive); - @if $flat { - background-color: transparent; - } + box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, .2); } } // styling for all menuitems in popovers -@mixin menuitem($bg, $flat: true) { +@mixin menuitem($bg, $style: flat) { + + // extend common styles + @extend %menuitem; // lighten the background color always $bg: lighten($bg,5%); - font-weight: normal; - spacing: $base_padding; - transition-duration: 100ms; - padding: $base_padding*1.5 $base_padding*2; - - @if $flat { + @if $style == 'flat' { @include button(undecorated); - box-shadow: none !important; } @else { @include button(normal, $c:$bg); } @@ -359,85 +382,84 @@ } &:active {@include button(active, $c:$bg);} &:checked {@include button(checked, $c:$bg);} + &:insensitive {@include button(insensitive, $c:$bg);} } -// // Panel menu/button drawing function -// -// $bg: background color, derived from $panel_fg_color -// $fg: foreground color, also derived from $panel_fg_color -// -// $flat: if true, the button is filled instead of transparent -// $highlighted_child: if true, applies some special overrides for to a -// child element, see _panel.scss for details -// $child_class: class name of the child element -// - -@mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $flat: true, $highlighted_child: false, $child_class:"") { +@mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $style: null, $highlighted_child: false, $child_class:"") { + // + // $bg: background color, derived from $panel_fg_color + // $fg: foreground color, also derived from $panel_fg_color + // $style: can be set to 'filled' if button uses a colored background + // + // $highlighted_child: if true, applies some special overrides for to a + // child element, see _panel.scss for details + // $child_class: class name of the child element + // transition-duration: 150ms; border: 3px solid transparent; - border-radius: 99px; + background-color: transparent; + border-radius: $forced_circular_radius; font-weight: bold; - background-color: transparent; color: $fg; - @if $flat { - box-shadow: none; + // background fill defines + $fill: transparent; + $hover_fill: transparentize($fg, .83); + $active_fill: transparentize($fg, .72); + $active_hover_fill: transparentize($fg, .68); - &:active, &:focus, &:checked { - box-shadow: inset 0 0 0 100px transparentize($fg, 0.75); - &:hover { - box-shadow: inset 0 0 0 100px transparentize($fg, 0.65); - } - } + @if $style == 'filled' { + $fill: $bg; + $hover_fill: if($variant == 'light', darken($bg, 5%), lighten($bg, 5%)); + $active_fill: if($variant == 'light', darken($bg, 9%), lighten($bg, 9%)); + $active_hover_fill: if($variant == 'light', darken($bg, 11%), lighten($bg, 11%)); + } - &:hover { - box-shadow: inset 0 0 0 100px transparentize($fg, 0.8); - } + @include panel_button_fill($fill); - } @else { - box-shadow: inset 0 0 0 100px transparentize($bg, 0.2); + &:focus, &:hover { + @include panel_button_fill($hover_fill); + } - &:active, &:focus, &:checked { - box-shadow: inset 0 0 0 100px $bg; - &:hover { - box-shadow: inset 0 0 0 100px transparentize($bg, 0.05); - } - } + &:active, &:checked { + @include panel_button_fill($active_fill); - &:hover { - box-shadow: inset 0 0 0 100px transparentize($bg, 0.1); + &:hover{ + @include panel_button_fill($active_hover_fill); } } // some overrides to style a child element @if $highlighted_child { - box-shadow: none !important; + // remove the common styles from the parent + background: none !important; + box-shadow: none !important; + border: none !important; + + // add them to the child #{$child_class} { transition-duration: 150ms; border: 3px solid transparent; - border-radius: 99px; + border-radius: $forced_circular_radius; } - &:active, &:focus, &:checked { - box-shadow: none !important; - + &:focus, &:hover { #{$child_class} { - box-shadow: inset 0 0 0 100px transparentize($fg, 0.75); - - &:hover { - box-shadow: inset 0 0 0 100px transparentize($fg, 0.65) !important; - } + @include panel_button_fill($hover_fill); } } - &:hover { - box-shadow: none !important; + &:active, &:checked { #{$child_class} { - box-shadow: inset 0 0 0 100px transparentize($fg, 0.8); + @include panel_button_fill($active_fill); + + &:hover { + @include panel_button_fill($active_hover_fill); + } } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss index ee16a714..9eac62d9 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_widgets.scss @@ -21,7 +21,6 @@ @import 'widgets/ibus-popup'; // Notifications @import 'widgets/notifications'; -@import 'widgets/hotplug'; // Dialogs @import 'widgets/dialogs'; // OSDs diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss index 3c8eda41..fcada18a 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss @@ -1,13 +1,14 @@ /* App Grid */ $app_icon_size: 96px; +$app_folder_size: 720px; // app icons .icon-grid { row-spacing: $base_padding * 2; column-spacing: $base_padding * 2; - max-row-spacing: $base_padding * 7; - max-column-spacing: $base_padding * 7; + max-row-spacing: $base_padding * 6; + max-column-spacing: $base_padding * 6; page-padding-top: $base_padding * 4; page-padding-bottom: $base_padding * 4; page-padding-left: $base_padding * 3; @@ -16,41 +17,69 @@ $app_icon_size: 96px; /* App Icons */ -// Icon tiles in the app grid -.app-well-app { - @include overview_icon($system_fg_color); +// items in the app grid and dash +.overview-tile { + @include tile_button($bg:$system_base_color); + // override the %tile style + border-radius: $base_border_radius*3; + padding: $base_padding * 2; + + // the icon itself .overview-icon { - padding: $base_padding*2; - border-radius: $base_border_radius*3; - color: $system_fg_color; - } - .overview-icon.overview-icon-with-label { - > StBoxLayout { - spacing: $base_padding; + // item with a label + &.overview-icon-with-label { + > StBoxLayout { + spacing: $base_padding; + } } } } // app folders -.app-well-app.app-folder { - @include overview_icon($system_fg_color, $flat: false); +.app-folder { + @include tile_button($bg:$system_base_color, $raised: true); } -// expanded folder -.app-folder-dialog { - border-radius: $modal_radius*4; - background-color: $system_overlay_bg_color; - padding: $base_padding*2; - box-shadow:inset 0 0 0 1px $system_borders_color; +// Running app indicator (also shown in dash) +.app-grid-running-dot { + height: 5px; + width: 5px; + border-radius:5px; + background-color: $system_fg_color; - @if $is_highcontrast { - box-shadow:inset 0 0 0 2px $hc_inset_color; + @if $contrast == 'high' { + margin-bottom: 4px; + } @else { + margin-bottom: 2px; + } +} + +.app-folder-dialog-container { + // pad the top with panel height so the folder doesn't overlap the panel on smaller resolutions + padding-top: $panel_height; +} + +// Expanded app folder dialog +.app-folder-dialog { + width: $app_folder_size; + height: $app_folder_size; + + border-radius: $modal_radius * 4; + background-color: $system_overlay_bg_color; + color: $system_fg_color; + + @if $contrast == 'high' { + padding: 0 2px; + box-shadow: inset 0 0 0 2px $hc_inset_color; + } @else { + padding: 0 1px; + box-shadow: inset 0 0 0 1px $system_borders_color; } & .folder-name-container { - padding: 24px 36px 0; - spacing: 12px; + padding: $base_padding * 4 $base_padding * 6; + padding-bottom: 0; & .folder-name-label, & .folder-name-entry { @@ -58,50 +87,30 @@ $app_icon_size: 96px; } & .folder-name-entry { + @extend %system_entry; width: 12em; - color: $system_fg_color !important; - } - - /* FIXME: this is to keep the label in sync with the entry */ - & .folder-name-label { padding: 5px 7px; color: $system_fg_color; } - - & .edit-folder-button { - @extend %button; - padding: 0; - width: 36px; - height: 36px; - border-radius: 99px; - & > StIcon { icon-size: $base_icon_size } } } - & .icon-grid { - row-spacing: $base_padding * 2; - column-spacing: $base_padding * 5; - page-padding-top: 0; - page-padding-bottom: 0; - page-padding-left: 0; - page-padding-right: 0; + & .icon-button { + @include button(normal, $tc:$system_fg_color, $c:$system_overlay_bg_color, $always_dark: true); + &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_overlay_bg_color, $always_dark: true);} + &:active { @include button(active, $tc:$system_fg_color, $c:$system_overlay_bg_color, $always_dark: true);} } & .page-indicators { - margin-bottom: 18px; + margin-bottom: $base_padding * 4; } -} -.app-folder-dialog-container { - padding: $base_padding*2; - width: 720px; - height: 720px; -} + & .page-navigation-arrow { + @include button(normal, $tc:$system_fg_color, $c:$system_overlay_bg_color, $style: flat, $always_dark: true); + &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_overlay_bg_color, $style: flat, $always_dark: true);} + &:active { @include button(active, $tc:$system_fg_color, $c:$system_overlay_bg_color, $style: flat, $always_dark: true);} + } -// Running app indicator (also shown in dash) -.app-well-app-running-dot { - height: 5px; - width: 5px; - border-radius:5px; - margin-bottom: 8px; - background-color: $system_fg_color; + & .overview-tile { + @include tile_button($bg:$system_overlay_bg_color); + } } // Rename popup for app folders @@ -113,15 +122,16 @@ $app_icon_size: 96px; } // App Grid pagination indicators +$page_indicator_size: 10px; .page-indicator { padding: $base_padding $base_padding * 2 0; transition-duration:400ms; .page-indicator-icon { - width: 10px; - height: 10px; - border-radius: 10px; // the same as height&width - background-color: white; + width: $page_indicator_size; + height: $page_indicator_size; + border-radius: $forced_circular_radius; + background-color: $system_fg_color; transition-duration: 400ms; } } @@ -134,13 +144,14 @@ $app_icon_size: 96px; .system-action-icon { background-color: transparentize($system_fg_color,.9); color: $system_fg_color; - border-radius: 99px; + border-radius: $forced_circular_radius; icon-size: $app_icon_size * 0.5; - @if $is_highcontrast { + @if $contrast == 'high' { box-shadow: inset 0 0 0 2px $hc_inset_color; } } +// page navigation .page-navigation-hint { &.dnd { background: rgba(255, 255, 255, 0.1); @@ -151,7 +162,7 @@ $app_icon_size: 96px; background-gradient-start: rgba(255, 255, 255, 0.05); background-gradient-end: transparent; background-gradient-direction: horizontal; - border-radius: $modal_radius*1.5 0px 0px $modal_radius*1.5; + border-radius: $modal_radius * 1.5 0px 0px $modal_radius * 1.5; } &.previous:ltr, @@ -159,25 +170,21 @@ $app_icon_size: 96px; background-gradient-start: transparent; background-gradient-end: rgba(255, 255, 255, 0.05); background-gradient-direction: horizontal; - border-radius: 0px $modal_radius*1.5 $modal_radius*1.5 0px; + border-radius: 0px $modal_radius * 1.5 $modal_radius * 1.5 0px; } } .page-navigation-arrow { - margin: 6px; - padding: 18px; - width: 24px; - height: 24px; - border-radius: 99px; + margin: $base_padding; + padding: $base_padding * 3; + width: $medium_icon_size; + height: $medium_icon_size; + border-radius: $forced_circular_radius; transition-duration: 100ms; > StIcon { color: $system_fg_color;} - @if $is_highcontrast { - @include button(normal, $system_fg_color, transparentize($system_bg_color, 0.5)); - } - - &:insensitive { @include button(undecorated, $system_fg_color, transparentize($system_bg_color, 0.5));} - &:hover { @include button(hover, $system_fg_color, transparentize($system_bg_color, 0.5));} - &:active { @include button(active, $system_fg_color, transparentize($system_bg_color, 0.5));} + @include button(normal, $tc:$system_fg_color, $c:$system_base_color, $style: flat, $always_dark: true); + &:hover { @include button(hover, $tc:$system_fg_color, $c:$system_base_color, $style: flat, $always_dark: true);} + &:active { @include button(active, $tc:$system_fg_color, $c:$system_base_color, $style: flat, $always_dark: true);} } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss index 69ebb301..7d6f2809 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss @@ -9,10 +9,19 @@ // Outline for low res icons .lowres-icon { - icon-shadow: 0 1px 2px rgba(black, 0.3); + icon-shadow: 0 1px 2px rgba(black, 0.2); } // Dropshadow for large icons .icon-dropshadow { - icon-shadow: 0 1px 5px rgba(black, 0.8); + icon-shadow: 0 2px 4px rgba(black, 0.4); + + @if $contrast == 'high' { + icon-shadow: none; + background-color: $osd_bg_color; + padding: $base_padding * 2; + border-radius: $modal_radius; + border: 2px solid $hc_inset_color; + margin: $base_padding * 3; + } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_buttons.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_buttons.scss index 84d23161..60fa4d8d 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_buttons.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_buttons.scss @@ -1,19 +1,39 @@ /* Buttons */ .button { - @extend %button; // that's it - min-height: 22px; + @extend %button; + // uses scalable value since it's a text element + min-height: to_em(22px); + + // default style + &.default { + @extend %default_button; + } + // flat style + &.flat { + @extend %flat_button; + } } .icon-button { - @extend .button; // same style as buttons + @extend %button; - border-radius: 99px; - padding: $base_padding*2; - min-height: 16px; + border-radius: $forced_circular_radius; // is circular + padding: $scaled_padding * 2; + min-height: $scalable_icon_size; StIcon { - icon-size: $base_icon_size; + icon-size: $scalable_icon_size; -st-icon-style: symbolic; } + + // default style + &.default { + @extend %default_button; + } + + // flat style + &.flat { + @extend %flat_button; + } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss index d79e7f5c..c233f22a 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss @@ -2,25 +2,31 @@ // overall menu #calendarArea { - padding: $base_padding - 2px; + padding: $base_margin; } -// Calendar menu side column +.datemenu-popover { + border-radius: $base_border_radius * 1.5 + $base_padding * 3; +} + +// calendar menu side column .datemenu-calendar-column { spacing: $base_padding; - &:ltr {padding-left: $base_padding;} - &:rtl {padding-right: $base_padding;} - .datemenu-displays-box {spacing: $base_padding;} + &:ltr { margin-left: $base_padding;} + &:rtl { margin-right: $base_padding;} + .datemenu-displays-box { + spacing: $base_padding; + } } -/* today button (the date) */ +// today button (the date) .datemenu-today-button { - @include card(flat); + @extend %card_flat; padding: $base_padding * 1.5; // weekday label .day-label { - @extend %heading; + font-weight: bold; } // date label @@ -29,10 +35,11 @@ } } -/* Calendar */ +// the mini calendar .calendar { - @include card(flat); + @extend %card_flat; margin-top: 0; + padding: 0; // month header .calendar-month-header { @@ -40,23 +47,25 @@ // prev/next month icons .calendar-change-month-back StIcon, .calendar-change-month-forward StIcon { - icon-size: $base_icon_size; + icon-size: $scalable_icon_size; } // month label .calendar-month-label { @extend %heading; + @extend %flat_button; + color: $fg_color !important; padding: 8px 0; + width: 10em; + border-radius: $forced_circular_radius; + text-align: center; } .pager-button { - @extend .button, .flat; - padding: 0 !important; - height: 32px; - width: 32px; - margin: 2px; - border-radius: $base_border_radius; - transition-duration: 100ms; + @extend .icon-button, .flat; + height: 2.6em; + width: 2.6em; + padding: 0; } } @@ -64,41 +73,48 @@ .calendar-day { @extend %numeric; @extend %smaller; - @extend .button, .flat; - - border-radius: 99px; - height: 3em !important; - width: 3em !important; + @extend %flat_button; + border-radius: $forced_circular_radius; + height: 3em; + width: 3em; margin: 2px; - padding: 0 !important; - font-weight: 600; + padding: 0; + font-weight: bold; text-align: center; - transition-duration: 100ms; - - // day of week heading - &.calendar-day-heading { - background-color: transparent; - color: $insensitive_fg_color; - height: 0.93em !important; // force heading to be smaller height - padding-top: $base_padding !important; - margin-bottom: 0; - border-radius: 9px; - } &.calendar-weekday {} &.calendar-weekend { color: $insensitive_fg_color; + @if $contrast == 'high' { + font-style: italic; + } } &.calendar-other-month { - color: transparentize($insensitive_fg_color, 0.7) !important; + color: transparentize($fg_color, 0.5); font-weight: normal; + + &.calendar-weekend { + color: transparentize($fg_color, 0.5); + @if $contrast == 'high' { + color: $fg_color; + } + } + + @if $contrast == 'high' { + color: $fg_color; + font-style: italic; // differentiate with a font-style instead of text color + } } &.calendar-today { - @extend .button, .default; - color: $selected_fg_color; /* override weekends */ + @extend %default_button; + // override colors above for when today is a weekend + color: $selected_fg_color !important; + &.calendar-day-with-events { + background-image: url("assets/calendar-today.svg") !important; // always use light asset with .default style + } } &.calendar-day-with-events { @@ -107,129 +123,165 @@ } } + // day of week heading + .calendar-day-heading { + @extend %numeric; + @extend %smaller; + @extend %flat_button; + font-weight: bold; + text-align: center; + margin: $base_margin; + padding: $base_padding * 0.5 $base_padding; + border-radius: $base_border_radius; + } + // week number style .calendar-week-number { - @include fontsize($base_font_size - 4); + @extend %smaller; font-weight: bold; font-feature-settings: "tnum"; text-align: center; - margin: 6px; + margin: $base_padding; padding: 0 $base_padding; - border-radius: 3px; - background-color: transparentize($fg_color, 0.9); + border-radius: $base_border_radius * 0.5; + background-color: transparentize($insensitive_fg_color, .8); color: $insensitive_fg_color; + } +} - @if $is_highcontrast { - border:1px solid $hc_inset_color; +// common style for the date menu widgets +.events-button, +.world-clocks-button, +.weather-button { + @extend %card; +} + +// events +.events-button { + + .events-box { + + // event title + .events-title { + @extend %heading; + color: $insensitive_fg_color; + padding-bottom: $base_padding; + } + + // list of events + .events-list { + spacing: $base_padding; + + // container for an event + .event-box { + spacing: $base_padding; + border-radius: $base_border_radius; + + .event-summary { + @extend %heading; + } + + .event-time { + @extend %numeric; + @extend %caption; + color: $insensitive_fg_color; + } + } + + .event-placeholder { + color: $insensitive_fg_color; + font-style: italic; + } } } } -/* Events */ -.events-button { - @include card; - padding: $base_padding * 2; - - .events-box { - spacing: $base_padding; - } - - .events-list { - spacing: 2 * $base_padding; - color: $fg_color; - } - - .events-title { - @extend %heading; - margin-bottom: $base_margin; - } - - .event-time { - @extend %numeric; - @extend %caption; - color: $insensitive_fg_color; - } -} - -/* World clocks */ +// world clocks .world-clocks-button { - @include card; - padding: $base_padding * 2; - - .world-clocks-grid { - spacing-rows: $base_padding; - spacing-columns: $base_padding * 2; - } // title .world-clocks-header { @extend %heading; color: $insensitive_fg_color; - } - // city label - .world-clocks-city { - color: $fg_color; - } - - // timezone time - .world-clocks-time { - @extend %heading; - @extend %numeric; - color: $fg_color; - - &:ltr {text-align: right;} - &:rtl {text-align: left;} - } - - // timezone offset label - .world-clocks-timezone { - @extend %numeric; - @extend %caption; - color: $insensitive_fg_color; - } -} - -/* Weather */ -.weather-button { - @include card; - padding: $base_padding * 2; - - .weather-box { - spacing: $base_padding + $base_margin; - } - - .weather-header-box { - spacing: $base_padding; - } - - .weather-header { - color: $insensitive_fg_color; - @extend %heading; - - &.location { - font-weight: normal; + // change style when no world clocks are configured + &.no-world-clocks { + color: $fg_color; } } - .weather-grid { + // clocks + .world-clocks-grid { spacing-rows: $base_padding; spacing-columns: $base_padding * 2; - } - .weather-forecast-time { - @extend %numeric; - @extend %caption; - color: darken($fg_color,30%); - padding-top: 0.2em; - padding-bottom: 0.4em; - } + // city label + .world-clocks-city { + } - .weather-forecast-icon { - icon-size: $large_icon_size; - } + // timezone time + .world-clocks-time { + @extend %numeric; + font-weight: bold; - .weather-forecast-temp { - @extend %heading; + &:ltr {text-align: right;} + &:rtl {text-align: left;} + } + + // timezone offset label + .world-clocks-timezone { + @extend %numeric; + @extend %caption; + color: $insensitive_fg_color; + } + } +} + +// weather +.weather-button { + + .weather-box { + spacing: $base_padding; + + // header + .weather-header-box { + spacing: $base_padding; + + .weather-header { + @extend %heading; + color: $insensitive_fg_color; + + // change style when no location is configured + &.no-location { + color: $fg_color; + } + + &.location { + font-weight: normal; + } + } + } + + // weather items + .weather-grid { + spacing-rows: $base_padding; + spacing-columns: $base_padding * 2; + + .weather-forecast-time { + @extend %numeric; + @include fontsize(10pt); + padding-top: 0.2em; + padding-bottom: 0.4em; + } + .weather-forecast-icon { + icon-size: $large_scalable_icon_size; + margin-bottom: $base_margin; + } + + .weather-forecast-temp { + @extend %numeric; + font-weight: bold; + } + } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss index c2c63bad..c72ad916 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss @@ -4,75 +4,92 @@ $dash_background_color: $system_overlay_bg_color; $dash_placeholder_size: 32px; -$dash_padding: $base_padding*2; // 12px +$dash_padding: $base_padding * 2; +$dash_edge_offset: $base_margin * 3; $dash_border_radius: $modal_radius + $dash_padding; +$dash_spacing: $base_margin * 0.5; // container for the dash #dash { - @extend %caption; - margin-top: $dash_padding; + margin-top: $dash_edge_offset; - .placeholder { - // background-image: url("assets/dash-placeholder.svg"); - background-image:none; - background-size: contain; - height: $dash_placeholder_size; - } - - .empty-dash-drop-target { - width: $dash_placeholder_size; - height: $dash_placeholder_size; - } - - // Running app indicator (also shown in app grid) - .app-well-app-running-dot { - margin-bottom: 14px; // hardcoded - } -} - -// background of the dash behind app icons -.dash-background { - background-color: $dash_background_color; - border-radius: $dash_border_radius; - padding: $dash_padding; - spacing: $base_padding; - margin-bottom: $dash_padding; - - @if $is_highcontrast { - border: 2px solid $hc_inset_color; - box-shadow:none; - } -} - -// items on the dash -.dash-item-container { - > * {margin: 0 2px;} - &:ltr{&:first-child {margin-left: 0;}} - &:rtl{&:first-child {margin-right: 0;}} - - // each app item on the dash - .app-well-app .overview-icon { - padding: $base_padding; - border-radius: $base_border_radius*2; - } - - // show apps button - .show-apps { @include overview_icon($system_fg_color);} - - .show-apps, .app-well-app { + // background behind item container + .dash-background { + background-color: $dash_background_color; + border-radius: $dash_border_radius; + padding-top: $dash_padding; padding-bottom: $dash_padding; - color: $system_fg_color; - } -} + padding-left: $dash_padding - $dash_spacing; // subtract the margins added to .overview-tile below + padding-right: $dash_padding - $dash_spacing; -// separator between favourites and running apps -.dash-separator { - width: 1px; - margin: 0 $base_margin; - background-color: $system_borders_color; - margin-bottom: $dash_padding; - @if $is_highcontrast { - width: 2px; + @if $contrast == 'high' { + @include draw_hc_inset($width: 2px); + } + } + + // items on the dash + .dash-item-container { + + .placeholder { + // background-image: url("assets/dash-placeholder.svg"); + background-image: none; + background-size: contain; + height: $dash_placeholder_size; + } + + .empty-dash-drop-target { + width: $dash_placeholder_size; + height: $dash_placeholder_size; + } + + // IMPORTANT: items on the dash need to extend to the edge to be adequate click targets + // as such the %tile style is overriden and button styles are applied to the child class .overview-icon + .show-apps, + .overview-tile { + // remove styles + @extend %reset; + + margin: 0 $dash_spacing; + padding-bottom: $dash_edge_offset; // align with other items + + $fg:$system_fg_color; + $bg:$dash_background_color; + + .overview-icon { + @extend %tile; + @include button(normal, $tc:$fg, $c:$bg, $style: flat, $always_dark: true); + } + + &:focus .overview-icon { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);} + &:hover .overview-icon { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);} + &:active .overview-icon { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);} + &:checked .overview-icon { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);} + } + + // running app dot + .app-grid-running-dot { + // manually position the dot within the dash item + margin-bottom: $dash_padding + $dash_edge_offset - 3px; // 3px = size of dot (5px) subtracted from its translationY from appDisplay.js + } + } + + // separator between pinned and running apps + .dash-separator { + width: 1px; + margin-left:$base_margin; + margin-right:$base_margin; + background-color: $system_borders_color; + + @if $contrast == 'high' { + width: 2px; + background-color: $hc_inset_color; + } + } + + // make sure all dash components have same margin from screen edge + .dash-separator, + .dash-background { + margin-bottom: $dash_edge_offset; } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss index 045ec626..68cc365a 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dialogs.scss @@ -10,8 +10,8 @@ box-shadow: inset 0 0 0 1px $outer_borders_color; .modal-dialog-content-box { - margin: 32px 40px; - spacing: 32px; + margin: $base_margin * 8 $base_margin * 10; + spacing: $base_margin * 8; max-width: 28em; } @@ -32,7 +32,7 @@ /* Message Dialog */ .message-dialog-content { - spacing: 18px; + spacing: $base_padding * 3; .message-dialog-title { text-align: center; @@ -45,7 +45,7 @@ /* Dialog List */ .dialog-list { - spacing: 18px; + spacing: $base_padding * 3; .dialog-list-title { text-align: center; @@ -71,8 +71,8 @@ /* Run Dialog */ .run-dialog { .modal-dialog-content-box { - margin-top: 24px; - margin-bottom: 14px; + margin-top: $base_padding * 4; + margin-bottom: $base_padding * 2; } .run-dialog-entry { width: 20em; } .run-dialog-description { @@ -88,25 +88,25 @@ width: 28em; .modal-dialog-content-box { - margin-bottom: 24px; + margin-bottom: $base_margin * 6; } } .prompt-dialog-password-grid { - spacing-rows: 8px; - spacing-columns: 4px; + spacing-rows: $base_margin * 2; + spacing-columns: $base_margin; .prompt-dialog-password-entry { width: auto; // 4px (spacing) + 16px (spinner-width) - &:ltr { margin-left: 20px; } - &:rtl { margin-right: 20px; } + &:ltr { margin-left: $base_margin+$base_icon_size; } + &:rtl { margin-right: $base_margin+$base_icon_size; } } } .prompt-dialog-password-layout { - spacing: 8px; + spacing: $base_margin * 2; } .prompt-dialog-password-entry { @@ -129,30 +129,30 @@ .polkit-dialog-user-layout { text-align: center; - spacing: 8px; - margin-bottom: 6px; + spacing: $base_margin * 2; + margin-bottom: $base_padding; .polkit-dialog-user-root-label { color: $warning_color; } } /* Audio selection dialog */ .audio-device-selection-dialog { - .modal-dialog-content-box { margin-bottom: 28px; } - .audio-selection-box { spacing: 20px; } + .modal-dialog-content-box { margin-bottom: $base_margin * 7; } + .audio-selection-box { spacing: $base_margin * 5; } } .audio-selection-device { - border-radius: $base_border_radius*2; + border-radius: $base_border_radius * 2; &:hover,&:focus { background-color: $hover_bg_color; } - &:active { + &:active { background-color: $selected_bg_color; color: $selected_fg_color; } } .audio-selection-device-box { - padding: 20px; - spacing: 20px; + padding: $base_margin * 5; + spacing: $base_margin * 5; } .audio-selection-device-icon { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss index a10546fa..41e10f76 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_entries.scss @@ -4,17 +4,17 @@ StEntry { @extend %entry; StIcon.capslock-warning { - icon-size: $base_icon_size; + icon-size: $scalable_icon_size; warning-color: $warning_color; - padding: 0 4px; + padding: 0 $base_margin; } StIcon.peek-password { - icon-size: $base_icon_size; - padding: 0 4px; + icon-size: $scalable_icon_size; + padding: 0 $base_margin; } StLabel.hint-text { - margin-left: 2px; + margin-left: $base_margin * 0.5; } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_hotplug.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_hotplug.scss deleted file mode 100644 index acd0265d..00000000 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_hotplug.scss +++ /dev/null @@ -1,10 +0,0 @@ -// hotplug - -.hotplug-notification-item { - @extend %bubble_button; -} - -.hotplug-notification-item-icon { - icon-size: 24px; - padding: 0 4px; -} diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_ibus-popup.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_ibus-popup.scss index 8cbaa952..c1c0cfad 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_ibus-popup.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_ibus-popup.scss @@ -17,7 +17,7 @@ } .candidate-box { - padding: $base_padding $base_padding*2 $base_padding $base_padding*2; + padding: $base_padding $base_padding * 2 $base_padding $base_padding * 2; border-radius: $base_border_radius; &:selected { background-color: $selected_bg_color; color: $selected_fg_color; } &:hover { background-color: $hover_bg_color; color: $hover_fg_color; } @@ -25,8 +25,8 @@ .candidate-page-button-box { height: 2em; - .vertical & { padding-top: $base_padding*2; } - .horizontal & { padding-left: $base_padding*2; } + .vertical & { padding-top: $base_padding * 2; } + .horizontal & { padding-left: $base_padding * 2; } } .candidate-page-button { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss index 6bac82b4..4c291b58 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_keyboard.scss @@ -1,7 +1,7 @@ /* On-screen Keyboard */ $key_size: 1.2em; -$key_border_radius: $base_border_radius + 4px; // 12px +$key_border_radius: $base_border_radius * 1.25; $key_bg_color: $osd_bg_color; // $default_key_bg_color: darken($key_bg_color, 4%); $default_key_bg_color: lighten($osd_bg_color, 10%); @@ -31,8 +31,7 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); // the keys .keyboard-key { - - @include fontsize($base_font_size + 5); + @include fontsize($base_font_size + 5pt); font-weight: bold; min-height: $key_size; min-width: $key_size; @@ -41,12 +40,12 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); border-radius: $key_border_radius; box-shadow: 0 1px 0 0 $shadow_color; - @include keyboard_key(normal, $key_bg_color, $osd_fg_color); + @include button(normal, $c:$key_bg_color, $tc:$osd_fg_color); - &:focus { @include keyboard_key(focus);} - &:hover { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);} - &:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); } - &:checked { @include keyboard_key(checked, $key_bg_color, $osd_fg_color); } + &:focus { @include button(focus);} + &:hover { @include button(hover, $c:$key_bg_color, $tc:$osd_fg_color);} + &:active { @include button(active, $c:$key_bg_color, $tc:$osd_fg_color); } + &:checked { @include button(checked, $c:$key_bg_color, $tc:$osd_fg_color); } &:grayed { //FIXMEy background-color: darken($bg_color, 3%); @@ -56,10 +55,10 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); // non-character keys &.default-key { - @include keyboard_key(normal, $default_key_bg_color, $osd_fg_color); - &:hover {@include keyboard_key(hover, $default_key_bg_color, $osd_fg_color);} - &:active { @include keyboard_key(active, $default_key_bg_color, $osd_fg_color);} - &:checked { @include keyboard_key(checked, $default_key_bg_color, $osd_fg_color);} + @include button(normal, $c:$default_key_bg_color, $tc:$osd_fg_color); + &:hover { @include button(hover, $c:$default_key_bg_color, $tc:$osd_fg_color);} + &:active { @include button(active, $c:$default_key_bg_color, $tc:$osd_fg_color);} + &:checked { @include button(checked, $c:$default_key_bg_color, $tc:$osd_fg_color);} border-radius: $key_border_radius; // keys that may be latched: ctrl/alt/shift @@ -71,18 +70,18 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); // enter key is suggested-action &.enter-key { - @include keyboard_key(normal, $selected_bg_color, $selected_fg_color); - &:hover { @include keyboard_key(hover, $selected_bg_color, $selected_fg_color);} - &:active {@include keyboard_key(active, $selected_bg_color, $selected_fg_color);} - &:checked {@include keyboard_key(checked, $selected_bg_color, $selected_fg_color);} + @include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color); + &:hover { @include button(hover, $c:$selected_bg_color, $tc:$selected_fg_color);} + &:active { @include button(active, $c:$selected_bg_color, $tc:$selected_fg_color);} + &:checked { @include button(checked, $c:$selected_bg_color, $tc:$selected_fg_color);} border-radius: $key_border_radius; color: $osd_fg_color; } &.shift-key-lowercase {} - + // pressed shift has different style - &.shift-key-uppercase { + &.shift-key-uppercase { background-color: lighten($key_bg_color, 20%); color: $osd_bg_color; &:hover { @@ -92,12 +91,12 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); } // size of icons on keys - StIcon { icon-size: 24px; } + StIcon { icon-size: $medium_icon_size; } } // long press on a key popup .keyboard-subkeys { - -arrow-border-radius: $base_border_radius*2; + -arrow-border-radius: $base_border_radius * 2; -arrow-background-color: $osd_bg_color; -arrow-border-width: 1px; -arrow-border-color: lighten($osd_bg_color, 9%); @@ -107,12 +106,12 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); padding: $base_padding; .keyboard-key { - @include keyboard_key(normal, $key_bg_color, $osd_fg_color); + @include button(normal, $c:$key_bg_color, $tc:$osd_fg_color); - &:focus { @include keyboard_key(focus);} - &:hover { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);} - &:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); } - &:checked { @include keyboard_key(checked, $key_bg_color, $osd_fg_color); } + &:focus { @include button(focus);} + &:hover { @include button(hover, $c:$key_bg_color, $tc:$osd_fg_color);} + &:active { @include button(active, $c:$key_bg_color, $tc:$osd_fg_color); } + &:checked { @include button(checked, $c:$key_bg_color, $tc:$osd_fg_color); } border-radius:$key_border_radius; } @@ -136,24 +135,24 @@ $default_key_bg_color: lighten($osd_bg_color, 10%); // suggestions .word-suggestions { - @include fontsize($base_font_size + 1); + @extend %title_4; spacing: 12px; min-height: 17pt; - padding: $base_padding*2; + padding: $base_padding * 2; color: $osd_fg_color; // each suggestion StButton { margin: 0 3px; min-width: 32px; - border-radius: $base_border_radius - 2px; - padding: 0px $base_padding*3; + border-radius: 4px; + padding: 0px $base_padding * 3; - @include keyboard_key(undecorated, $key_bg_color, $osd_fg_color); + @include button(undecorated, $c:$key_bg_color, $tc:$osd_fg_color); - &:focus { @include keyboard_key(focus);} - &:hover { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);} - &:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); } - &:checked { @include keyboard_key(checked, $key_bg_color, $osd_fg_color); } + &:focus { @include button(focus);} + &:hover { @include button(hover, $c:$key_bg_color, $tc:$osd_fg_color);} + &:active { @include button(active, $c:$key_bg_color, $tc:$osd_fg_color); } + &:checked { @include button(checked, $c:$key_bg_color, $tc:$osd_fg_color); } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-lock.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-lock.scss index 8677ae74..4dc9aec0 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-lock.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_login-lock.scss @@ -1,23 +1,32 @@ -$_gdm_bg: $system_bg_color; +$_gdm_bg: $system_base_color; $_gdm_fg: $system_fg_color; -$_gdm_dialog_width: 23em; +$_gdm_dialog_width: 25em; -// common style for gdm and lockscreen +// common style for login and lockscreen .login-dialog, .unlock-dialog { + color: $_gdm_fg; .caps-lock-warning-label, .login-dialog-message-warning { color: $_gdm_fg; } + + .login-dialog-prompt-layout { + width: $_gdm_dialog_width; + spacing: $base_padding * 1.5; + } } -/* Login Dialog */ +// GDM Login Dialog +// uses dark grey system styles .login-dialog { - background-color: $_gdm_bg; + .login-dialog-prompt-entry { + @extend %system_entry; + } } -// buttons +// buttons on login screen .login-dialog-button { &.cancel-button, @@ -28,50 +37,89 @@ $_gdm_dialog_width: 23em; } &.cancel-button { - padding: $base_padding*1.5; + padding: $base_padding * 1.5; } } .login-dialog-button-box { - width: $_gdm_dialog_width; - spacing: $base_padding*2; + spacing: $base_padding * 2; +} + +.conflicting-session-dialog-content { + spacing: 20px; + + .conflicting-session-dialog-title { + text-align: center; + @extend %title_2; + margin-bottom: 5px; + } + + .conflicting-session-dialog-desc { + text-align: center; + } + + .conflicting-session-dialog-desc-warning { + text-align: center; + color: $warning_color; + } } .login-dialog-logo-bin { - margin:3em 0; + margin: 3em 0; +} + +.login-dialog-banner-view { + max-width: $_gdm_dialog_width; + + .login-dialog-banner { + color: darken($_gdm_fg,10%); + } +} + +.login-dialog-message { + text-align: center; +} + +.login-dialog-user-selection-box { + // padding to ensure the box doesn't overlap the panel + padding-top: 4em; + padding-bottom: 8em; } -.login-dialog-banner { color: darken($_gdm_fg,10%); } -.login-dialog-banner-view { max-width: $_gdm_dialog_width; } -.login-dialog-message { text-align: center; } -.login-dialog-user-selection-box { padding: 100px 0px; } .login-dialog-not-listed-label { - @include fontsize($base_font_size); - font-weight: bold; - color: darken($_gdm_fg,30%); - padding: $base_padding*2; - - .login-dialog-not-listed-button:focus &, - .login-dialog-not-listed-button:hover & { - color: $_gdm_fg; - } - .login-dialog-not-listed-button:focus & { - text-decoration: underline; - } + @extend %heading; + padding: $base_padding; +} + +.login-dialog-not-listed-button { + // use button styling + @extend %button_common; + @include button(normal, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true); + &:focus { @include button(focus, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);} + &:hover { @include button(hover, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);} + &:active { @include button(active, $tc:$_gdm_fg, $c:$_gdm_bg, $style: flat, $always_dark: true);} + + padding: 0 $base_padding; + margin: $base_padding; +} + +// Authentication methods list +.login-dialog-auth-list-view { + -st-vfade-offset: 3em; } -.login-dialog-auth-list-view { -st-vfade-offset: 1em; } .login-dialog-auth-list { - spacing: 6px; + spacing: $base_padding; margin-left: 2em; } + .login-dialog-auth-list-title { margin-left: 2em; } .login-dialog-auth-list-item { - border-radius: $base_border_radius*2; - padding: 4px; + border-radius: $base_border_radius * 2; + padding: $base_margin; color: darken($_gdm_fg,30%); &:focus, &:selected { @@ -81,84 +129,69 @@ $_gdm_dialog_width: 23em; } .login-dialog-auth-list-label { - @include fontsize($base_font_size + 2); - font-weight: bold; - padding-left: 15px; - - &:ltr { padding-left: 14px; text-align: left; } - &:rtl { padding-right: 14px; text-align: right; } + @extend %title_4; + &:ltr { padding-left: $base_padding * 2.5; text-align: left; } + &:rtl { padding-right: $base_padding * 2.5; text-align: right; } } -.login-dialog-user-list-view { -st-vfade-offset: 1em; } -.login-dialog-user-list { - spacing: 12px; +// User list +.login-dialog-user-list-view { width: $_gdm_dialog_width; + -st-vfade-offset: 3em; - .login-dialog-user-list-item { - border-radius: $base_border_radius + 4px; - padding: $base_padding; - background-color: transparentize($_gdm_fg, .95); - color: $_gdm_fg; + .login-dialog-user-list { + margin: 0 $base_margin * 2; // margin to account for scrollbar + spacing: $base_padding * 2; - @if $is_highcontrast { - box-shadow:inset 0 0 0 1px $hc_inset_color;; - } - .user-widget .user-icon { - border: 4px solid transparent; - } + .login-dialog-user-list-item { + // use button styling + @extend %button_common; + @include button(normal, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true); + &:selected, + &:focus { @include button(focus, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);} + &:hover { @include button(hover, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);} + &:active { @include button(active, $tc:$_gdm_fg, $c:$system_base_color, $always_dark: true);} - .login-dialog-timed-login-indicator { - height: 2px; - margin-top: 6px; - background-color: darken($_gdm_fg, 30%); - } + border-radius: $modal_radius; + padding: $base_padding * 1.5; - &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; } - } + // create border for indicating logged in user + .user-icon { + border: 2px solid transparent; + } - &:expanded .login-dialog-user-list-item { - transition-duration: 300ms; - transition-timing-function: ease; + .login-dialog-timed-login-indicator { + height: 2px; + margin-top: $base_padding; + background-color: transparentize($_gdm_fg, .3); + } - &:hover { - background-color: transparentize($_gdm_fg, .9); - color: $_gdm_fg; - } - - &:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - &:hover { background-color: lighten($selected_bg_color,5%); } - } - - &:logged-in { - .user-widget .user-icon { - border-color: $selected_bg_color; + &:logged-in { + // color border for logged-in user + .user-icon { + border-color: $selected_bg_color; + StIcon { + background-color: transparentize($selected_bg_color, .7); + } + } } } } } -.login-dialog-prompt-layout { - spacing: $base_padding*2; - width: 26em; -} - -.login-dialog-prompt-entry { - @extend %system_entry; -} - - -/* Screen Shield */ -// a.k.a. the lockscreen - +// Screen Shield +// a.k.a. the lockscreen, uses transparent styles .unlock-dialog { background-color: transparent; - // %system_entry style override to have neutral focus color with wallpaper background .login-dialog-prompt-entry { - &:focus { @include entry(focus, $c:$system_fg_color, $fc:transparentize($system_fg_color, 0.5));} + @extend %lockscreen_entry; + } + + .button, + .icon-button { + @extend %lockscreen_button; } } @@ -178,7 +211,7 @@ $_gdm_dialog_width: 23em; .unlock-dialog-clock-time { @extend %numeric; - @include fontsize(72); + @include fontsize(72pt); font-weight: 200; } @@ -189,8 +222,8 @@ $_gdm_dialog_width: 23em; .unlock-dialog-clock-hint { margin-top: 2em; - padding: $base_padding $base_padding*3; - border-radius: $base_border_radius*2; + padding: $base_padding $base_padding * 3; + border-radius: $base_border_radius * 2; font-weight: bold; } } @@ -205,8 +238,8 @@ $_gdm_dialog_width: 23em; } .unlock-dialog-notifications-container { - margin: 12px; - spacing: 6px; + margin: $base_margin * 3; + spacing: $base_padding; width: $_gdm_dialog_width; background-color: transparent; @@ -217,7 +250,7 @@ $_gdm_dialog_width: 23em; .notification, .unlock-dialog-notification-source { - padding: 12px 16px; + padding: $base_margin * 3 $base_margin * 4; border: none; background-color: transparentize($_gdm_fg,0.9); color: $_gdm_fg; @@ -227,63 +260,70 @@ $_gdm_dialog_width: 23em; } } +.unlock-dialog-notification-icon { + icon-size: $large_icon_size; +} + .unlock-dialog-notification-label { - padding-left: 12px; + padding-left: $base_padding * 2; padding-right: 0; - &:rtl { padding-right: 12px; padding-left: 0; } + &:rtl { padding-right: $base_padding * 2; padding-left: 0; } } .unlock-dialog-notification-count-text { font-weight: bold; - padding: 0 12px; + padding: 0 $base_padding * 2; color: $_gdm_fg; - background-color: transparentize($_gdm_fg, 0.9); - border-radius: 99px; + background-color: transparentize($_gdm_fg, .9); + border-radius: $forced_circular_radius; } -// User Widget -.user-widget { +.login-dialog, +.unlock-dialog { - .user-widget-label { - color: $_gdm_fg; - } + // User Widget + .user-widget { - // layout of the user list - &.horizontal { - spacing: $base_padding*3; + // common .user-widget-label { - @extend %title_3; + color: $_gdm_fg; } .user-icon { - & StIcon { - padding: 12px; - icon-size: $base_icon_size*2; - width: $base_icon_size*3; - height: $base_icon_size*3; - background-color: transparentize($_gdm_fg, 0.9); + background-color: transparentize($_gdm_fg, .87); + color: $_gdm_fg; + + @if $contrast == 'high' { + background-color: transparentize($_gdm_fg, .7); + box-shadow:inset 0 0 0 1px $hc_inset_color; } } - } - // layout of the login prompt - &.vertical { - spacing: $base_padding*4; - - .user-widget-label { - @extend %title_1; - text-align: center; - margin-bottom: .75em; + // layout of the user list + &.horizontal { + spacing: $base_padding * 3; + .user-widget-label { + @extend %title_3; + } } - .user-icon { - icon-size: $base_icon_size*10; + // layout of the login prompt + &.vertical { + spacing: $base_padding * 4; - & StIcon { - padding: 32px; - icon-size: $base_icon_size*4; - background-color: transparentize($_gdm_fg, 0.9); + .user-widget-label { + @extend %title_1; + text-align: center; + margin-bottom: .75em; + } + + .user-icon { + icon-size: $base_icon_size * 10; + + & StIcon { + padding: $base_padding * 4; + } } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_looking-glass.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_looking-glass.scss index 7cd81e44..7b8d9047 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_looking-glass.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_looking-glass.scss @@ -9,13 +9,13 @@ border-radius: $modal_radius; margin-top: $base_margin; - border-top-width: 0; + border: 2px solid transparent; padding: $base_padding; spacing: $base_padding; box-shadow: 0 2px 4px 0 $shadow_color; - @if $is_highcontrast { - border: 2px solid $hc_inset_color; + @if $contrast == 'high' { + border-color: $hc_inset_color; background-color: $osd_bg_color; box-shadow:none; } @@ -29,7 +29,7 @@ .lg-toolbar-button { @extend %osd_button; - padding: $base_padding $base_padding*2; + padding: $base_padding $base_padding * 2; & > StIcon { icon-size: $base_icon_size; } } @@ -41,9 +41,9 @@ .notebook-tab { @extend %osd_button; - -natural-hpadding: $base_padding*2; - -minimum-hpadding: $base_padding*2; - padding: $base_padding $base_padding*2; + -natural-hpadding: $base_padding * 2; + -minimum-hpadding: $base_padding * 2; + padding: $base_padding $base_padding * 2; } StBoxLayout#EvalBox { padding: 4px; spacing: $base_padding; padding: $base_padding; } @@ -54,7 +54,7 @@ StEntry { @extend %osd_entry; - min-height: 22px; + min-height: to_em(22px); } .shell-link { @@ -97,8 +97,7 @@ } .lg-extension { - padding: $base_padding*2; - @include card; + @extend %card; } .lg-extension-name { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss index 9a9144b8..2b3fd610 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss @@ -12,36 +12,37 @@ .message-list-placeholder { @extend %title_2; - color: $insensitive_fg_color; - + color: transparentize($fg_color, .75); + @if $contrast == 'high' { + color: transparentize($fg_color, .5); + } // icon size and color > StIcon { - icon-size: $base_icon_size*3; // 48px - margin-bottom: $base_margin*3; + icon-size: 96px; // non-em asset size + margin-bottom: $base_margin * 3; -st-icon-style: symbolic; } } } .message-list-sections { - spacing: $base_padding; - margin: 0; - padding-bottom: $base_padding; - // to account for scrollbar &:ltr {margin-right: $base_margin * 3; } &:rtl {margin-left: $base_margin * 3;} + + spacing: $base_padding * 2; } .message-list-section, .message-list-section-list { - spacing: $base_padding; + spacing: $base_padding * 2; } // do-not-disturb + clear button .message-list-controls { // NOTE: remove the padding if notification_bubble could remove margin for drop shadow - padding: $base_padding; + padding: $base_padding * 2; + padding-bottom: $base_padding; spacing: $base_padding; @extend %heading; @@ -62,73 +63,112 @@ // message bubbles .message { - @include card; + @extend %card; + padding: 0; + margin: 0; + border-radius: $modal_radius; - // icon container - .message-icon-bin { - padding: ($base_padding * 3); + // subtract side padding to accommodate the close button's border + &:ltr { padding-right:-2px; }; + &:rtl { padding-left:-2px; }; - &:ltr {padding-right:$base_padding;} - &:rtl {padding-left:$base_padding;} + // message header + .message-header { + padding: 0 $scaled_padding; + margin: $base_padding; + margin-bottom: 0; + spacing: $base_padding; + color: $insensitive_fg_color; - // icon size and color - > StIcon { - icon-size: $large_icon_size; // 32px + // header source icon + .message-source-icon { + icon-size: $scalable_icon_size; // 16px -st-icon-style: symbolic; } - // fallback - > .fallback-app-icon { - width: $base_icon_size; - height: $base_icon_size; + // box that contains the source icon, source name and timestamp of the message + .message-header-content { + spacing: $base_padding; + min-height: to_em(24px); + padding-bottom: $base_padding; + + // header source title + .message-source-title { + font-weight: bold; + } + + // Time label + .event-time { + @extend %caption; + color: $insensitive_fg_color; + // Add bottom padding to align the app name with the time horizontally + padding-bottom: to_em(1px); + + &:ltr { text-align: right }; + &:rtl { text-align: left }; + } + } + + // buttons in the message header + .message-expand-button, + .message-close-button { + @extend .icon-button; + color: $fg_color; + background-color: transparentize($fg_color, .9); + padding: 4px; + &:hover { background-color: transparentize($fg_color, .81);} + &:active, + &:active:hover { background-color: transparentize($fg_color, .76);} + &:insensitive { background-color: transparentize($fg_color, .93);} + } + + .message-expand-button { + padding: 6px; + &:ltr { margin-right: $base_padding; } + &:rtl { margin-left: $base_padding; } } } - // content - .message-content { - spacing: 4px; - padding: ($base_padding*1.5); - margin-bottom: $base_margin*2; - } + // container for message contents + .message-box { + padding: $base_padding; + margin: $base_padding; + margin-top: 0; + spacing: $base_padding; - // title - .message-title { - font-weight: bold; - /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */ - padding-top: 0.57em; - } + // icon of the message + .message-icon { + &:ltr { margin-right:$base_padding;} + &:rtl { margin-left:$base_padding;} - // secondary container in title box - .message-secondary-bin { - padding: 0 $base_margin * 2; + // icon size and color + icon-size: $base_icon_size * 3; // 48px + -st-icon-style: symbolic; - // notification time stamp - > .event-time { - color: transparentize($fg_color, 0.5); - @include fontsize($base_font_size - 2); - /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */ - padding-bottom: 0.13em; + &.message-themed-icon { + border-radius: $forced_circular_radius; // is circular + background-color: transparentize($fg_color, 0.8); + icon-size: $base_icon_size; + min-width: $base_icon_size * 3; + min-height: $base_icon_size * 3; + } + } - &:ltr { text-align: right }; - &:rtl { text-align: left }; + // If the header isn't displayed we need more top margin + &:first-child { + margin-top: $base_padding * 2; + } + + // text of the message + .message-content { + spacing: $base_margin; + + // message title + .message-title { + font-weight: bold; + } } } - - // close button - .message-close-button { - color: $fg_color; - background-color: transparentize($fg_color, 0.8); - border-radius: 99px; - padding: $base_padding - 1px; - margin: 1px; - &:hover {background-color: transparentize($fg_color, 0.7);} - &:active {background-color: transparentize($fg_color, 0.8);} - - > StIcon { icon-size: $base_icon_size; } - } - - // body - .message-body {color: darken($fg_color, 10%);} } // URLs in messages @@ -138,14 +178,14 @@ /* Media Controls */ .message-media-control { - padding: 0 $base_padding*3; - margin: $base_padding*2 0; + padding: 0 $base_padding * 3; border-radius: $base_border_radius; color: $fg_color; + border: 1px solid transparent; - @if $is_highcontrast { - border: 1px solid $hc_inset_color; - margin: $base_padding*2 2px; + @if $contrast == 'high' { + border-color: $hc_inset_color; + margin: $base_padding * 2 2px; } // colors are lightened since the media controls are in a card @@ -161,30 +201,22 @@ &:insensitive { color: lighten($insensitive_fg_color, 5%); - @if $is_highcontrast { + + @if $contrast == 'high' { border-color: transparent; } } - // fix margin for last button - &:last-child:ltr { margin-right: $base_margin*3; } - &:last-child:rtl { margin-left: $base_margin*3; } - & StIcon { icon-size: $base_icon_size; } } -// album-art -.media-message-cover-icon { - icon-size: $base_icon_size*3 !important; // 48px - border-radius: $base_border_radius; +.media-message { + // album-art + .message-icon { + border-radius: $base_border_radius !important; - // when there is no artwork - &.fallback { - color: darken($fg_color, 17%); - background-color: $bg_color; - border: 1px solid transparent; - border-radius: $base_border_radius; - icon-size: $large_icon_size !important; // 32px - padding: ($base_padding*2 + 2); // 16px + &.message-themed-icon { + icon-size: $large_icon_size !important; // 32px + } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss index 8c127de3..35f9dc9a 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_misc.scss @@ -7,21 +7,21 @@ // User icon .user-icon { background-size: contain; + border-radius: $forced_circular_radius; + icon-size: $base_icon_size * 4; + + background-color: transparentize($osd_fg_color,0.95); color: $osd_fg_color; - border-radius: 99px; - icon-size: $base_icon_size * 4; // 64px & StIcon { - background-color: transparentize($osd_fg_color,0.95); - border-radius: 99px; - padding: $base_padding * 2 ; // 12px - width: $base_icon_size * 2.5; height: $base_icon_size * 2.5; // 40px; + padding: $base_padding * 2; } &.user-avatar { box-shadow:inset 0 0 0 1px transparentize($osd_fg_color, 0.9); - @if $is_highcontrast { - box-shadow:inset 0 0 0 1px $hc_inset_color; + + @if $contrast == 'high' { + @include draw_hc_inset(); } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_notifications.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_notifications.scss index edf66c84..0601425b 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_notifications.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_notifications.scss @@ -11,50 +11,15 @@ $notification_banner_width: 34em; border-radius: $modal_radius; margin: $base_margin; - .notification-actions { - spacing: 0; - } - - .notification-button { - @extend %bubble_button; + @if $contrast == 'high' { + @include draw_hc_inset(); } } -// counter -.summary-source-counter { - font-size: $base_font_size - 1pt; - font-weight: bold; - height: 1.6em; - width: 1.6em; - -shell-counter-overlap-x: 3px; - -shell-counter-overlap-y: 3px; - background-color: $selected_bg_color; - color: $selected_fg_color; - border: 2px solid $fg_color; - box-shadow: 0 2px 2px rgba(0,0,0,0.5); - border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%; +.notification-buttons-bin { + spacing: 0; } -// chat bubbles -.chat-body { spacing: 5px; } -.chat-response { margin: 5px; } -.chat-log-message { color: darken($fg_color,10%); } -.chat-new-group { padding-top: 1em; } -.chat-received { - padding-left: 4px; - &:rtl { padding-left: 0px; padding-right: 4px; } -} - -.chat-sent { - padding-left: 18pt; - color: lighten($fg_color, 15%); - &:rtl { padding-left: 0; padding-right: 18pt; } -} - -.chat-meta-message { - padding-left: 4px; - @include fontsize($base_font_size - 2); - font-weight: bold; - color: lighten($fg_color,18%); - &:rtl { padding-left: 0; padding-right: 4px; } +.notification-button { + @extend %bubble_button; } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_osd.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_osd.scss index a8d1a55f..55cf44ac 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_osd.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_osd.scss @@ -7,43 +7,45 @@ $osd_levelbar_height:6px; @extend %heading; text-align: center; font-weight: bold; - spacing: $base_padding * 2; // 12px + spacing: $base_padding * 2; padding: $base_padding * 2 $base_padding * 3; - & > * { spacing: 8px; } + & > * { spacing: $base_margin * 2; } margin-bottom: 4em; - StIcon { icon-size:$large_icon_size;} + StIcon { icon-size: $large_icon_size;} StLabel { - &:ltr { margin-right: 6px; } - &:rtl { margin-left: 6px; } + &:ltr { margin-right: $base_padding; } + &:rtl { margin-left: $base_padding; } } .level { - margin-bottom: 4px; - &:first-child { margin-bottom: 0px; } + margin-bottom: $base_margin; + &:first-child { margin-bottom: 0; } - height: $osd_levelbar_height; - min-width:$base_icon_size * 10; + min-width: 160px; -barlevel-height: $osd_levelbar_height; -barlevel-background-color: transparentize($osd_fg_color, if($variant=='light', 0.7, 0.9)); -barlevel-active-background-color: $osd_fg_color; -barlevel-overdrive-color: $destructive_color; - -barlevel-overdrive-separator-width: 3px; - &:ltr { margin-right: 6px; } - &:rtl { margin-left: 6px; } + -barlevel-overdrive-separator-width: $base_padding * 0.5; + &:ltr { margin-right: $base_padding; } + &:rtl { margin-left: $base_padding; } } } // Monitor number label -.osd-monitor-label { - @extend %osd_panel; +.osd-monitor-label { + background-color: $selected_bg_color; + color: $selected_fg_color; border-radius: $modal_radius; font-size: 3em; font-weight: bold; + font-feature-settings: "tnum"; margin: $base_margin * 3; + padding: $base_padding * 2; text-align: center; - min-width: 1.3em; + min-width: 1.5em; } /* Pad OSD */ diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss index 301875e1..117213e8 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss @@ -9,5 +9,5 @@ } .overview-controls { - padding-bottom: 32px; + padding-bottom: $base_margin * 8; } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss index f19c7c76..2a29eee9 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_panel.scss @@ -1,13 +1,12 @@ /* Top Bar */ // a.k.a. the panel -$privacy_indicator_color: $orange_3; +$privacy_indicator_color: if($variant == 'light', $orange_4, $orange_3); +$recording_indicator_color: $red_4; -$panel_bg_color: if($variant == 'light', $light_3, $dark_5); -$panel_fg_color: if($variant == 'light', $fg_color, darken($fg_color, 5%)); -$panel_border_color: if($variant == 'light', darken($panel_bg_color, 2%), $panel_bg_color); +$transparent_panel_fg_color: $light_1; // always white for transparent lock screens +$system_panel_fg_color: $system_fg_color; // always light for lockscreen, overview -$panel_system_fg_color: $system_fg_color; // always light for lockscreen, overview and other transparent panels $panel_height: 2.2em; $panel_transition_duration: 250ms; // same as the overview transition duration @@ -17,43 +16,46 @@ $panel_transition_duration: 250ms; // same as the overview transition duration height: $panel_height; @extend %numeric; transition-duration: $panel_transition_duration; - box-shadow: inset 0 -1px 0 0 $panel_border_color; // panel menus .panel-button { - @include panel_button($panel_fg_color); + @include panel_button(); -natural-hpadding: $base_padding * 2; -minimum-hpadding: $base_padding; // status area icons .system-status-icon { - icon-size: $base_icon_size; - padding: $base_padding - 1px; + icon-size: $scalable_icon_size; + padding: 0 $base_padding; margin: 0 $base_margin; } - .panel-status-indicators-box .system-status-icon, - .panel-status-menu-box .system-status-icon { - margin: 0; - } - // app menu icon .app-menu-icon { -st-icon-style: symbolic; // dimensions of the icon are hardcoded } - &#panelActivities { - -natural-hpadding: $base_padding * 2.5; + // reduce margin between icons in combined menu + .panel-status-menu-box, + .panel-status-indicators-box { + spacing: $base_margin; + > .system-status-icon { + padding: 0; + } + } + + &#panelActivities { & StBoxLayout { + padding: 0 $scaled_padding * 0.5; // use em padding to keep proportion spacing: 5px; } & .workspace-dot { - border-radius: 999px; - min-width: 8px; - min-height: 8px; + border-radius: $forced_circular_radius; + min-width: $scalable_icon_size * 0.5; + min-height: $scalable_icon_size * 0.5; background-color: $panel_fg_color; } } @@ -62,20 +64,20 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator, &.screen-sharing-indicator { StBoxLayout { - spacing: $base_padding; + spacing: $scaled_padding; } StIcon { - icon-size: $base_icon_size; + icon-size: $scalable_icon_size; } } &.screen-recording-indicator { - @include panel_button($screenshot_ui_button_red, $flat: false); + @include panel_button($bg:$recording_indicator_color, $fg:$_base_color_light, $style: filled); } &.screen-sharing-indicator { - @include panel_button($privacy_indicator_color, $flat: false); + @include panel_button($bg:$privacy_indicator_color, $fg:$_base_color_light, $style: filled); } // clock @@ -83,40 +85,61 @@ $panel_transition_duration: 250ms; // same as the overview transition duration // The clock display needs to have the background on .clock because // we want to exclude the do-not-disturb indicator from the background // see _drawing.scss for override details - @include panel_button($highlighted_child: true, $child_class:".clock"); + @include panel_button($highlighted_child: true, $child_class: '.clock'); .clock { // the highlighted child } + + .messages-indicator { + icon-size: $scalable_icon_size; + } } } - // transparent panel on lock & login screens + // transparent panel on overview, lock & login screens + &:overview, &.unlock-screen, - &.login-screen, - &:overview { + &.login-screen { background-color: transparent; - box-shadow: none; + // unfortunate duplication to keep indicator style in these states .panel-button { - @include panel_button($panel_system_fg_color, $fg:$panel_system_fg_color); + &.screen-recording-indicator { + @include panel_button($bg:$recording_indicator_color, $fg:$_base_color_light, $style: filled); + } + + &.screen-sharing-indicator { + @include panel_button($bg:$privacy_indicator_color, $fg:$_base_color_light, $style: filled); + } + } + } + + // use transparent text styles for lock & login screen panels + &.unlock-screen, + &.login-screen { + .panel-button { + @include panel_button($fg:$transparent_panel_fg_color); + + // clock + &.clock-display { + @include panel_button($fg:$transparent_panel_fg_color, $highlighted_child: true, $child_class: '.clock'); + } + } + } + + // use system text styles for overview panel + &:overview { + .panel-button { + @include panel_button($fg:$system_panel_fg_color); &#panelActivities .workspace-dot { - background-color: $panel_system_fg_color; + background-color: $system_panel_fg_color; } // clock &.clock-display { - @include panel_button($panel_system_fg_color, $fg:$panel_system_fg_color, $highlighted_child: true, $child_class:".clock"); - } - - // unfortunate duplication so these indicators have styles - &.screen-recording-indicator { - @include panel_button($screenshot_ui_button_red, $flat: false); - } - - &.screen-sharing-indicator { - @include panel_button($privacy_indicator_color, $flat: false); + @include panel_button($fg:$system_panel_fg_color, $highlighted_child: true, $child_class: '.clock'); } } } @@ -137,13 +160,13 @@ $panel_transition_duration: 250ms; // same as the overview transition duration // App Menu #appMenu { - spacing: $base_padding; + spacing: $scaled_padding; .label-shadow { color: transparent; } } #appMenu .panel-status-menu-box { - padding: 0 $base_padding; - spacing: $base_padding; + padding: 0 $scaled_padding; + spacing: $scaled_padding; } @@ -151,7 +174,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration .clock-display-box { spacing: 2px; .clock { - padding-left: $base_padding * 2; - padding-right: $base_padding * 2; + padding-left: $scaled_padding * 2; + padding-right: $scaled_padding * 2; } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss index a6ed06d3..7f3df1ac 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss @@ -2,13 +2,13 @@ $menu_bg_color: $bg_color; $menuitem_bg_color: lighten($menu_bg_color, 4%); -$menuitem_border_radius: $base_border_radius*1.5; +$menuitem_border_radius: $base_border_radius * 1.5; $submenu_bg_color: lighten($menu_bg_color, 7%); // the popover itself .popup-menu-boxpointer { - -arrow-rise: $base_margin+2px; // distance from the panel & screen edge + -arrow-rise: $base_padding; // distance from the panel & screen edge } // container of the popover menu @@ -26,7 +26,7 @@ $submenu_bg_color: lighten($menu_bg_color, 7%); .popup-menu-content { padding: $base_padding; background-color: $bg_color; - border-radius: $modal_radius*1.25; + border-radius: $modal_radius * 1.25; border: 1px solid $outer_borders_color; box-shadow: 0 2px 4px 0 $shadow_color; } @@ -40,7 +40,7 @@ $submenu_bg_color: lighten($menu_bg_color, 7%); &:checked { border-radius: $menuitem_border_radius $menuitem_border_radius 0 0 !important; - @if $is_highcontrast { + @if $contrast == 'high' { border: 1px solid $hc_inset_color; border-bottom-width:0; } @@ -67,22 +67,23 @@ $submenu_bg_color: lighten($menu_bg_color, 7%); // symbolic icons in popover .popup-menu-arrow, .popup-menu-icon { - icon-size: 16px !important; // for some reason the variable doesn't work here + icon-size: $scalable_icon_size; } // popover submenus .popup-sub-menu { border-radius: 0 0 $menuitem_border_radius+1px $menuitem_border_radius+1px; margin-bottom: $base_padding; + border: 1px solid transparent; - @if $is_highcontrast { - border: 1px solid $hc_inset_color; + @if $contrast == 'high' { + border-color: $hc_inset_color; } // submenu specific styles .popup-menu-item { border-radius: 0; - @include menuitem($bg:$submenu_bg_color, $flat:false); + @include menuitem($bg:$submenu_bg_color); border-top-width:0; &:last-child { @@ -103,8 +104,8 @@ $submenu_bg_color: lighten($menu_bg_color, 7%); // container for radio and check boxes .popup-menu-ornament { - icon-size: $base_icon_size !important; - width: $base_icon_size; + icon-size: $scalable_icon_size !important; + width: $scalable_icon_size; } // separator @@ -144,8 +145,8 @@ $submenu_bg_color: lighten($menu_bg_color, 7%); // "Open Windows" label > StLabel { @extend %caption_heading; - &:ltr {margin-right: $base_margin*2;} - &:rtl {margin-left: $base_margin*2;} + &:ltr {margin-right: $base_margin * 2;} + &:rtl {margin-left: $base_margin * 2;} } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_quick-settings.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_quick-settings.scss index 9189ac8d..c43081ba 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_quick-settings.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_quick-settings.scss @@ -1,45 +1,46 @@ .quick-settings { - padding: $base_padding*3; - border-radius: $modal_radius*2.25; + padding: $base_padding * 3; + border-radius: $modal_radius * 2.25; .icon-button, .button { - padding: $base_padding*1.75; + padding: $base_padding * 1.75; } } .quick-settings-grid { - spacing-rows: $base_padding*2; - spacing-columns: $base_padding*2; + spacing-rows: $base_padding * 2; + spacing-columns: $base_padding * 2; } .quick-toggle, .quick-menu-toggle { - border-radius: 99px; + border-radius: $forced_circular_radius; min-width: 12em; max-width: 12em; - min-height: 48px; + min-height: $scalable_icon_size * 3; // use icon size so the button scales border:none; } .quick-toggle { - &:checked { @include button(default, $c:$selected_bg_color); } + background-color: none; + &:checked { @extend %default_button;} - & > StBoxLayout { spacing: $base_padding*1.5; } + & > StBoxLayout { spacing: $base_padding * 1.5; } /* Move padding into the box; this is to allow menu arrows to extend to the border */ &.button { padding: 0; } - & > StBoxLayout { padding: 0 $base_padding*2; } - &:ltr > StBoxLayout { padding-left: $base_padding*2.5; } - &:rtl > StBoxLayout { padding-right: $base_padding*2.5; } + & > StBoxLayout { padding: 0 $base_padding * 2; } + &:ltr > StBoxLayout { padding-left: $base_padding * 2.5; } + &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; } .quick-toggle-title { font-weight: bold; } & StBoxLayout > .quick-toggle-subtitle { + @extend %caption; font-weight: normal; - font-size: 12px; } - .quick-toggle-icon { icon-size: $base_icon_size; } + .quick-toggle-icon { icon-size: $scalable_icon_size; } } .quick-menu-toggle { @@ -47,31 +48,31 @@ min-width: auto; max-width: auto; - &:ltr { border-radius: 99px 0 0 99px; } - &:ltr > StBoxLayout { padding-right: $base_padding*1.5; } - &:rtl { border-radius: 0 99px 99px 0; } - &:rtr > StBoxLayout { padding-left: $base_padding*1.5; } + &:ltr { border-radius: $forced_circular_radius 0 0 $forced_circular_radius; } + &:ltr > StBoxLayout { padding-right: $scaled_padding * 1.5; } + &:rtl { border-radius: 0 $forced_circular_radius $forced_circular_radius 0; } + &:rtr > StBoxLayout { padding-left: $scaled_padding * 1.5; } - &:ltr:last-child { border-radius: 99px; } - &:rtl:last-child { border-radius: 99px; } + &:ltr:last-child { border-radius: $forced_circular_radius; } + &:rtl:last-child { border-radius: $forced_circular_radius; } } & .quick-toggle-arrow { - padding: $base_padding $base_padding*1.75; + padding: $scaled_padding $scaled_padding * 1.75; border-width: 0; border-color: transparentize($fg_color, .75); &:checked { - @include button(default, $c:$selected_bg_color); + @extend %default_button; border-color: $selected_borders_color; } &:ltr { - border-radius: 0 99px 99px 0; + border-radius: 0 $forced_circular_radius $forced_circular_radius 0; border-left-width: 1px; } &:rtl { - border-radius: 99px 0 0 99px; + border-radius: $forced_circular_radius 0 0 $forced_circular_radius; border-right-width: 1px; } } @@ -84,33 +85,36 @@ .slider-bin { &:focus {@include button(focus);} - min-height: 16px; // slider size padding: $base_padding; - border-radius: 99px; + border-radius: $forced_circular_radius; } } .quick-toggle-menu { - @include card; + @extend %card; - // override some card styles - background-color: $bg_color !important; - color: $fg_color !important; + &:insensitive { + // override insensitive style on submenu + @include button(normal); + } - border-radius: $base_border_radius*3; - padding: $base_padding*2; - margin: $base_padding*2 $base_padding*3 0; + border-radius: $base_border_radius * 3; - .popup-menu-item > StIcon { -st-icon-style: symbolic; } + margin: $base_padding * 2 $base_padding * 3 0; + + .popup-menu-item > StIcon { + -st-icon-style: symbolic; + icon-size: $scalable_icon_size; + } & .header { - spacing-rows: 0.5 * $base_padding; - spacing-columns: $base_padding*2; - padding-bottom: 2 * $base_padding; + spacing-rows: $base_padding * 0.5; + spacing-columns: $base_padding * 2; + padding-bottom: $base_padding * 2; & .icon { - icon-size: $base_icon_size*1.5; // a non-standard symbolic size but ok - border-radius: 999px; + icon-size: $medium_scalable_icon_size; + border-radius: $forced_circular_radius; padding: 1.5 * $base_padding; background-color: transparentize($fg_color, 0.8); @@ -118,6 +122,14 @@ background-color: $selected_bg_color; color: $selected_fg_color; } + + // draw hc outline + @if $contrast == 'high' { + @include draw_hc_inset(); + &.active { + @include draw_hc_inset($no_inset: true); + } + } } & .title { @@ -134,7 +146,7 @@ } .quick-settings-system-item { - & > StBoxLayout { spacing: 2 * $base_padding; } + & > StBoxLayout { spacing: $base_padding * 2; } & .power-item { min-height: 0; @@ -148,7 +160,7 @@ } .nm-network-item { - .wireless-secure-icon { icon-size: 0.5 * $base_icon_size; } + .wireless-secure-icon { icon-size: $scalable_icon_size * 0.5; } // half-size symbolic } .bt-device-item { @@ -164,23 +176,19 @@ .device-subtitle { color: transparentize($fg_color, 0.5); } -.keyboard-brightness-item .slider { - min-height: 16px; -} - .keyboard-brightness-level { spacing: $base_padding; - .button:checked { @include button(default, $c:$selected_bg_color); } + .button:checked { @extend %default_button; } } // background apps .background-apps-quick-toggle { - min-height: 40px; + min-height: to_em(40px); background-color: transparent; - & StIcon { icon-size: $base_icon_size !important; } + & StIcon { icon-size: $scalable_icon_size !important; } } .background-app-item { @@ -190,9 +198,14 @@ icon-size: $large_icon_size !important; -st-icon-style: regular !important; } - & .close-button { - @extend .icon-button; + & .icon-button { padding: $base_padding; + + // override some background colors since it's a button on an already styled background + // FIXME: may need a generic drawing method for button in menu item in future + background-color: transparentize($fg_color, 0.87); + &:hover { background-color: transparentize($fg_color, 0.78);} + &:active { background-color: transparentize($fg_color, 0.69);} } & .spinner { padding: $base_padding; diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screenshot.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screenshot.scss index 69edb053..05ecd95c 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screenshot.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_screenshot.scss @@ -1,24 +1,15 @@ // Screenshot UI -.icon-label-button-container { - spacing: $base_padding; - @extend %caption; - StIcon { icon-size: 32px;} -} - -$screenshot_ui_panel_padding: $base_padding*3; -$screenshot_ui_shot_cast_margin: 21px; -$screenshot_ui_panel_border_radius: $modal_radius + $screenshot_ui_shot_cast_margin; -$screenshot_ui_shot_cast_spacing: 3px; - -$screenshot_ui_button_red: $error_color; +$screenshot_ui_panel_padding: $base_padding * 3; +$screenshot_ui_panel_border_radius: $modal_radius * 2; +$screenshot_ui_button_red: $red_4; .screenshot-ui-panel { @extend %osd_panel; border-radius: $screenshot_ui_panel_border_radius; padding: $screenshot_ui_panel_padding; // Reduce the bottom padding a little to accommodate the large capture button. - padding-bottom: $screenshot_ui_panel_padding - 6px; + padding-bottom: $screenshot_ui_panel_padding - $base_padding; margin-bottom: 4em; spacing: $base_padding * 2; } @@ -26,36 +17,43 @@ $screenshot_ui_button_red: $error_color; .screenshot-ui-close-button { @extend .window-close; // copy window close button padding: $base_padding !important; // but with more padding - margin-top: 12px; + margin-top: $base_margin * 3; box-shadow: 0 2px 4px 0 $shadow_color; - &.left { margin-left: 12px;} - &.right { margin-right: 12px;} + &.left { margin-left: $base_margin * 3;} + &.right { margin-right: $base_margin * 3;} } .screenshot-ui-type-button { @extend %osd_button_flat; min-width: 48px; - padding: $base_padding * 2 $base_padding * 3 !important; + padding: $base_padding * 2 $base_padding * 3; border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding; + + .icon-label-button-container { + @extend %caption; + spacing: $scaled_padding; + + > StIcon { icon-size: $large_icon_size;} + } } .screenshot-ui-capture-button { - width: 36px; - height: 36px; - border-radius: 99px; + width: $large_icon_size; + height: $large_icon_size; + border-radius: $forced_circular_radius; border: 4px $osd_fg_color; - padding: 4px; + padding: $base_margin; .screenshot-ui-capture-button-circle { background-color: $osd_fg_color; transition-duration: 200ms; &:hover, &:focus { background-color: $hover_bg_color;} - border-radius: 99px; + border-radius: $forced_circular_radius; } &:hover, &:focus { .screenshot-ui-capture-button-circle { - background-color: darken($osd_fg_color, 15%); + background-color: darken($osd_fg_color, 20%); } } @@ -84,32 +82,36 @@ $screenshot_ui_button_red: $error_color; .screenshot-ui-shot-cast-container { background-color: transparentize($osd_fg_color,0.9); - border-radius: $modal_radius; - padding: $screenshot_ui_shot_cast_spacing; - spacing: $screenshot_ui_shot_cast_spacing; + border-radius: $forced_circular_radius; + padding: $base_padding * 0.5; + spacing: $base_padding * 0.5; - &:ltr { margin-left: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding;} - &:rtl { margin-right: $screenshot_ui_shot_cast_margin - $screenshot_ui_panel_padding;} + @if $contrast == 'high' { + @include draw_hc_inset(); + } } +// non-standard button style .screenshot-ui-shot-cast-button { - padding: $base_padding $base_padding*2; + padding: $base_padding $base_padding * 2; background-color: transparent; + border-radius: $forced_circular_radius; + + @if $contrast == 'high' { + @include draw_hc_inset(); + } + + > StIcon { icon-size: $base_icon_size;} + &:hover, &:focus { background-color: transparentize($osd_fg_color, 0.8);} &:active { background-color: transparentize($osd_fg_color, .5);} &:checked { background-color: $osd_fg_color; color: $osd_bg_color;} &:insensitive { color: transparentize($osd_fg_color, 0.5);} - - border-radius: $modal_radius - $screenshot_ui_shot_cast_spacing; - - StIcon { icon-size: $base_icon_size;} } .screenshot-ui-show-pointer-button { @extend %osd_button_flat; - border-radius: 99px; - padding: $base_padding * 2 !important; - StIcon { icon-size: $base_icon_size;} + @extend .icon-button; } .screenshot-ui-area-indicator-shade { @@ -127,15 +129,15 @@ $screenshot_ui_button_red: $error_color; } .screenshot-ui-area-selector-handle { - border-radius: 99px; + border-radius: $forced_circular_radius; background-color: white; box-shadow: 0 1px 3px 2px $shadow_color; - width: 24px; - height: 24px; + width: $medium_icon_size; + height: $medium_icon_size; } .screenshot-ui-window-selector { - background-color: $system_bg_color; + background-color: $system_base_color; .screenshot-ui-window-selector-window-container { margin: 100px; @@ -158,9 +160,9 @@ $screenshot_ui_button_red: $error_color; .screenshot-ui-window-selector-check { transition-duration: 200ms; color: transparent; - border-radius: 99px; + border-radius: $forced_circular_radius; border-width: 12px; - icon-size: 24px; + icon-size: $medium_icon_size; } .screenshot-ui-window-selector-window { @@ -197,5 +199,5 @@ $screenshot_ui_button_red: $error_color; .screenshot-ui-tooltip { @extend %tooltip; text-align: center; - -y-offset: 24px; + -y-offset: $base_margin * 6; } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss index 8b766ba0..1f24d3c5 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-entry.scss @@ -1,15 +1,15 @@ // Search entry .search-entry { - border-radius: 99px; - margin-top: $base_padding*2; + border-radius: $forced_circular_radius; + margin-top: $base_padding * 2; margin-bottom: $base_padding; width: 24em; @extend %system_entry; .search-entry-icon { - icon-size: $base_icon_size; + icon-size: $scalable_icon_size; margin-top: 2px; // center vertically - padding: 0 4px; + padding: 0 $base_margin; } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss index b281ba5b..568dbbd2 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss @@ -6,17 +6,17 @@ } #searchResultsContent { - max-width: 1072px; + max-width: 1044px; } // search results sections "the boxes" .search-section { // This should be equal to #searchResultsContent spacing - spacing: $base_padding*3; + spacing: $base_padding * 3; // separator (unstyled) .search-section-separator { - height: $base_margin*2; // use it as a spacer + height: $base_margin * 2; // use it as a spacer background-color: transparent; } } @@ -25,14 +25,19 @@ .search-section-content { background-color: $system_overlay_bg_color; color: $system_fg_color; - border-radius: $modal_radius*1.5; - padding: $base_padding*2; - margin:0 $base_margin*3; + border-radius: $modal_radius * 1.5; + padding: $base_padding * 2; + margin:0 $base_margin * 3; + border: 2px solid transparent; + + @if $contrast == 'high' { + border-color: $hc_inset_color; + } } %search_section_content_item { - @include tile_button($system_fg_color); - border-radius: $base_border_radius+3px; + @include tile_button($bg:$system_overlay_bg_color); + border-radius: $base_border_radius * 1.65; } // "no results" text @@ -42,13 +47,13 @@ } .grid-search-results { - spacing: $base_padding*5; - margin:0 $base_margin*3; + spacing: $base_padding * 5; + margin:0 $base_margin * 3; } // Search results with icons .grid-search-result { - @extend .app-well-app; + @extend .overview-tile; } // search result provider @@ -86,11 +91,18 @@ // list item title (with leading icon) .list-search-result-title { spacing: $base_padding * 2; - // font-weight: bold; + + @if $contrast == 'high' { + font-weight: bold; + } } // list item description .list-search-result-description { color: $system_insensitive_fg_color; + + @if $contrast == 'high' { + color: $system_fg_color; + } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss index 40ac3465..f7085825 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss @@ -1,12 +1,12 @@ /* Slider */ -$slider_size: 16px; +$slider_size: $scalable_icon_size; .slider { // slider trough -barlevel-height: 4px; -barlevel-background-color: transparentize($fg_color, 0.8); //background of the trough - -barlevel-border-width: 2px; + -barlevel-border-width: 2px; -barlevel-border-color: transparent; // trough border color // fill style -barlevel-active-background-color: $selected_bg_color; @@ -19,4 +19,9 @@ $slider_size: 16px; -slider-handle-radius: $slider_size * 0.5; // half the size of the size -slider-handle-border-width: 0; -slider-handle-border-color: transparent; // because 0 width + + // hc style + @if $contrast == 'high' { + -barlevel-background-color: transparentize($fg_color, 0.6); + } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss index 5136c3cf..bf534b04 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss @@ -1,8 +1,8 @@ /* App Switcher */ // same as dash -$switcher_padding: $base_padding*2; - +$switcher_padding: $base_padding * 2; +$switcher_radius: $modal_radius + $switcher_padding; // the full screen container of the switcher .switcher-popup { @@ -14,7 +14,7 @@ $switcher_padding: $base_padding*2; .switcher-list { @extend %osd_panel; padding: $switcher_padding; - border-radius: $modal_radius+$switcher_padding; + border-radius: $switcher_radius; box-shadow: 0 8px 8px 0 $shadow_color; // container for items in list @@ -24,11 +24,19 @@ $switcher_padding: $base_padding*2; // each item in the list .item-box { - @include tile_button($osd_fg_color); - // override over style so mouse doesn't steal focus + @include tile_button($fg:$osd_fg_color, $bg:$osd_bg_color); + // override %tile style so mouse doesn't steal focus &:hover {background: none;} - @if $is_highcontrast { - box-shadow: inset 0 0 0 999px transparentize($hc_inset_color,0.2); + + // brighter than normal selected style + &:selected { + background-color: transparentize($osd_fg_color, 0.8); + } + + @if $contrast == 'high' { + &:selected { + background-color: transparentize($osd_fg_color, 0.7); + } } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switches.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switches.scss index b7441083..04be8d28 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switches.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switches.scss @@ -2,7 +2,7 @@ // these are equal to the size of the SVG assets $switch_height: 26px; -$switch_width: 48px; +$switch_width: 46px; .toggle-switch { color: $fg_color; @@ -10,7 +10,9 @@ $switch_width: 48px; width: $switch_width; background-size: contain; background-image: if($variant == 'light', url("assets/toggle-off-light.svg"),url("assets/toggle-off.svg")); - &:checked { + &:checked { background-image: if($variant == 'light', url("assets/toggle-on-light.svg"),url("assets/toggle-on.svg")); } + + & StIcon {icon-size: $base_icon_size;} } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss index b46366a8..c500a0af 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss @@ -1,18 +1,10 @@ /* Window Picker */ - -$window_picker_spacing: $base_padding; // 6px -$window_picker_padding: $base_padding * 2; // 12px - -$window_thumbnail_label_color: transparentize($system_bg_color, 0.4); - $window_close_button_color: transparentize(lighten($system_bg_color, 7%), .02); -$window_close_button_size: 30px; -$window_close_button_padding: 3px; // Window picker .window-picker { // Space between window thumbnails - spacing: $window_picker_spacing; + spacing: $base_padding; } // Window titles @@ -24,14 +16,19 @@ $window_close_button_padding: 3px; .window-close { background-color: $window_close_button_color; color: $system_fg_color; - border-radius: 99px; + border-radius: $forced_circular_radius; box-shadow: 0 2px 4px 0 $shadow_color; - padding: $window_close_button_padding; - height: $window_close_button_size; - width: $window_close_button_size; + padding: $base_padding * 0.5; + height: $large_icon_size; + width: $large_icon_size; transition-duration: 100ms; + border: 2px solid transparent; - & StIcon { icon-size: 24px; } // uses non standard icon size + @if $contrast == 'high' { + border-color: $hc_inset_color; + } + + & StIcon { icon-size: $medium_icon_size; } &:hover { background-color: lighten($window_close_button_color, 7%); @@ -41,9 +38,6 @@ $window_close_button_padding: 3px; background-color: lighten($window_close_button_color, 13%); } - @if $is_highcontrast { - border:2px solid $outer_borders_color; - } } .workspace-background { diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss index f06130ba..f3e069f7 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss @@ -1,6 +1,6 @@ /* Workspace Switcher */ -$ws_indicator_height: $large_icon_size; +$ws_indicator_height: 48px; $ws_dot_active: $ws_indicator_height / 3; $ws_dot_inactive: $ws_indicator_height / 6; diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss index 5b4587a0..8b4d74ef 100644 --- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss +++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss @@ -9,10 +9,10 @@ .workspace-thumbnail { color: $system_fg_color; background-color: lighten($system_bg_color, 10%); - border-radius: $base_border_radius*0.5; + border-radius: $base_border_radius * 0.5; border: 1px solid transparent; - @if $is_highcontrast { + @if $contrast == 'high' { border-color: $hc_inset_color; } } diff --git a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh index 94f1e0ac..30e9a035 100755 --- a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh +++ b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh @@ -4,7 +4,7 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' RESET='\033[0m' -VERSION=45.0 +VERSION=46.0 echo printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n" @@ -28,6 +28,7 @@ done <<- EOF gnome-shell-sass/_colors.scss gnome-shell-sass/_palette.scss gnome-shell-sass/_common.scss + gnome-shell-sass/_default-colors.scss gnome-shell-sass/_drawing.scss gnome-shell-sass/_widgets.scss gnome-shell-sass/widgets/_a11y.scss @@ -40,7 +41,6 @@ done <<- EOF gnome-shell-sass/widgets/_dash.scss gnome-shell-sass/widgets/_dialogs.scss gnome-shell-sass/widgets/_entries.scss - gnome-shell-sass/widgets/_hotplug.scss gnome-shell-sass/widgets/_ibus-popup.scss gnome-shell-sass/widgets/_keyboard.scss gnome-shell-sass/widgets/_login-lock.scss diff --git a/src/themes/Kali/sass/gtk3/_applications.scss b/src/themes/Kali/sass/gtk3/_applications.scss index b9ac620d..48fc4396 100644 --- a/src/themes/Kali/sass/gtk3/_applications.scss +++ b/src/themes/Kali/sass/gtk3/_applications.scss @@ -104,7 +104,7 @@ list.tweak-categories separator { /* XFCE4 PANEL */ .xfce4-panel { - &.background { background: $panel_bg; } + &.background { background: $panel_bg_color; } button { border: 0; @@ -113,7 +113,7 @@ list.tweak-categories separator { box-shadow: none; text-shadow: none; background: transparent; - color: $panel_fg; + color: $panel_fg_color; $_highlight_bg_color: if($variant=='light', $bg_color, rgba(black, .2)); @@ -212,7 +212,7 @@ wnck-pager { .lightdm-gtk-greeter { #panel_window { - background: $panel_bg; + background: $panel_bg_color; color: $fg_color; text-shadow: none; -gtk-icon-shadow: none; @@ -220,7 +220,7 @@ wnck-pager { #login_window { border: 0; - background-color: $panel_bg; + background-color: $panel_bg_color; border-radius: $button_radius; box-shadow: inset 0 1px transparentize(white, .85); diff --git a/src/themes/Kali/sass/gtk3/_budgie.scss b/src/themes/Kali/sass/gtk3/_budgie.scss index 6c47dd80..22ebf872 100644 --- a/src/themes/Kali/sass/gtk3/_budgie.scss +++ b/src/themes/Kali/sass/gtk3/_budgie.scss @@ -239,7 +239,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34); // main menu styling .workspace-switcher { .workspace-layout { - border: 0 solid $panel_bg; + border: 0 solid $panel_bg_color; .top &, .bottom & { @@ -254,7 +254,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34); .workspace-item, .workspace-add-button { - border: 0 solid darken($panel_bg, 5%); + border: 0 solid darken($panel_bg_color, 5%); .top &, .bottom & { @@ -269,7 +269,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34); .workspace-item { - &.current-workspace { background-color: darken($panel_bg, 5%); } + &.current-workspace { background-color: darken($panel_bg_color, 5%); } } .workspace-add-button { diff --git a/xfce-panel-profiles/Kali compact/config.txt b/xfce-panel-profiles/Kali compact/config.txt deleted file mode 100644 index ab2f7e06..00000000 --- a/xfce-panel-profiles/Kali compact/config.txt +++ /dev/null @@ -1,53 +0,0 @@ -/configver 2 -/panels [<1>] -/panels/panel-1/icon-size uint32 22 -/panels/panel-1/length uint32 100 -/panels/panel-1/plugin-ids [<1>, <2>, <3>, <4>, <5>, <6>, <7>, <8>, <900>, <10>, <11>, <12>, <14>, <15>, <16>, <17>, <18>, <19>, <20>, <21>, <2200>] -/panels/panel-1/position 'p=6;x=0;y=0' -/panels/panel-1/position-locked true -/panels/panel-1/size uint32 28 -/plugins/plugin-1 'whiskermenu' -/plugins/plugin-10 'separator' -/plugins/plugin-11 'tasklist' -/plugins/plugin-11/grouping uint32 1 -/plugins/plugin-11/middle-click uint32 1 -/plugins/plugin-11/show-handle false -/plugins/plugin-11/show-labels false -/plugins/plugin-12 'separator' -/plugins/plugin-12/expand true -/plugins/plugin-12/style uint32 0 -/plugins/plugin-14 'systray' -/plugins/plugin-14/size-max uint32 22 -/plugins/plugin-14/square-icons true -/plugins/plugin-14/symbolic-icons true -/plugins/plugin-15 'genmon' -/plugins/plugin-16 'pulseaudio' -/plugins/plugin-16/enable-keyboard-shortcuts true -/plugins/plugin-17 'notification-plugin' -/plugins/plugin-18 'power-manager-plugin' -/plugins/plugin-19 'clock' -/plugins/plugin-19/digital-layout uint32 3 -/plugins/plugin-19/digital-time-font 'Cantarell 11' -/plugins/plugin-19/digital-time-format '%_H:%M' -/plugins/plugin-2 'separator' -/plugins/plugin-20 'separator' -/plugins/plugin-20/style uint32 0 -/plugins/plugin-21 'separator' -/plugins/plugin-2200 'actions' -/plugins/plugin-2200/appearance uint32 0 -/plugins/plugin-2200/items [<'-lock-screen'>, <'-switch-user'>, <'-separator'>, <'-suspend'>, <'-hibernate'>, <'-hybrid-sleep'>, <'-separator'>, <'-shutdown'>, <'-restart'>, <'-separator'>, <'+logout'>, <'-logout-dialog'>] -/plugins/plugin-3 'showdesktop' -/plugins/plugin-4 'directorymenu' -/plugins/plugin-4/base-directory '/home/kali' -/plugins/plugin-4/icon-name 'system-file-manager' -/plugins/plugin-5 'launcher' -/plugins/plugin-5/items [<'16732569921.desktop'>] -/plugins/plugin-6 'launcher' -/plugins/plugin-6/items [<'16732569922.desktop'>] -/plugins/plugin-7 'launcher' -/plugins/plugin-7/items [<'16732569923.desktop'>, <'16732569924.desktop'>, <'16732569925.desktop'>] -/plugins/plugin-7/move-first true -/plugins/plugin-8 'separator' -/plugins/plugin-900 'pager' -/plugins/plugin-900/miniature-view true -/plugins/plugin-900/rows uint32 2 diff --git a/xfce-panel-profiles/Kali compact/launcher-5 b/xfce-panel-profiles/Kali compact/launcher-5 deleted file mode 120000 index 086f94e4..00000000 --- a/xfce-panel-profiles/Kali compact/launcher-5 +++ /dev/null @@ -1 +0,0 @@ -../Kali/launcher-5 \ No newline at end of file diff --git a/xfce-panel-profiles/Kali compact/launcher-6 b/xfce-panel-profiles/Kali compact/launcher-6 deleted file mode 120000 index aab62760..00000000 --- a/xfce-panel-profiles/Kali compact/launcher-6 +++ /dev/null @@ -1 +0,0 @@ -../Kali/launcher-6 \ No newline at end of file diff --git a/xfce-panel-profiles/Kali compact/launcher-7 b/xfce-panel-profiles/Kali compact/launcher-7 deleted file mode 120000 index f690d5fe..00000000 --- a/xfce-panel-profiles/Kali compact/launcher-7 +++ /dev/null @@ -1 +0,0 @@ -../Kali/launcher-7 \ No newline at end of file diff --git a/xfce-panel-profiles/Kali compact/whiskermenu-1.rc b/xfce-panel-profiles/Kali compact/whiskermenu-1.rc deleted file mode 120000 index 1fb28584..00000000 --- a/xfce-panel-profiles/Kali compact/whiskermenu-1.rc +++ /dev/null @@ -1 +0,0 @@ -../../etc/xdg/xfce4/whiskermenu/defaults.rc \ No newline at end of file diff --git a/xfce-panel-profiles/Kali/config.txt b/xfce-panel-profiles/Kali/config.txt deleted file mode 100644 index d3742c2f..00000000 --- a/xfce-panel-profiles/Kali/config.txt +++ /dev/null @@ -1,63 +0,0 @@ -/configver 2 -/panels [<1>] -/panels/panel-1/length uint32 100 -/panels/panel-1/plugin-ids [<1>, <2>, <3>, <4>, <5>, <6>, <7>, <8>, <9>, <10>, <11>, <12>, <13>, <14>, <15>, <16>, <17>, <18>, <19>, <20>, <21>, <22>] -/panels/panel-1/position 'p=6;x=0;y=0' -/panels/panel-1/position-locked true -/panels/panel-1/size uint32 34 -/plugins/plugin-1 'whiskermenu' -/plugins/plugin-10 'separator' -/plugins/plugin-11 'tasklist' -/plugins/plugin-11/grouping uint32 1 -/plugins/plugin-11/middle-click uint32 1 -/plugins/plugin-11/show-handle false -/plugins/plugin-11/show-labels false -/plugins/plugin-12 'separator' -/plugins/plugin-12/expand true -/plugins/plugin-12/style uint32 0 -/plugins/plugin-13 'cpugraph' -/plugins/plugin-13/bars 1 -/plugins/plugin-13/bars-color [<0.0>, <1.0>, <0.8784313725490196>, <1.0>] -/plugins/plugin-13/border 0 -/plugins/plugin-13/color-mode 1 -/plugins/plugin-13/foreground-1 [<0.15294117647058825>, <0.46666666666666656>, <1.0>, <1.0>] -/plugins/plugin-13/foreground-2 [<0.0>, <1.0>, <0.8784313725490196>, <1.0>] -/plugins/plugin-13/frame 0 -/plugins/plugin-13/mode 1 -/plugins/plugin-13/size 128 -/plugins/plugin-13/time-scale 0 -/plugins/plugin-13/update-interval 0 -/plugins/plugin-14 'systray' -/plugins/plugin-14/size-max uint32 22 -/plugins/plugin-14/square-icons true -/plugins/plugin-14/symbolic-icons true -/plugins/plugin-15 'genmon' -/plugins/plugin-16 'pulseaudio' -/plugins/plugin-16/enable-keyboard-shortcuts true -/plugins/plugin-17 'notification-plugin' -/plugins/plugin-18 'power-manager-plugin' -/plugins/plugin-19 'clock' -/plugins/plugin-19/digital-layout uint32 3 -/plugins/plugin-19/digital-time-font 'Cantarell 11' -/plugins/plugin-19/digital-time-format '%_H:%M' -/plugins/plugin-2 'separator' -/plugins/plugin-20 'separator' -/plugins/plugin-20/style uint32 0 -/plugins/plugin-21 'separator' -/plugins/plugin-22 'actions' -/plugins/plugin-22/appearance uint32 0 -/plugins/plugin-22/items [<'+lock-screen'>, <'-switch-user'>, <'-separator'>, <'-suspend'>, <'-hibernate'>, <'-hybrid-sleep'>, <'-separator'>, <'-shutdown'>, <'-restart'>, <'-separator'>, <'+logout'>, <'-logout-dialog'>] -/plugins/plugin-3 'showdesktop' -/plugins/plugin-4 'directorymenu' -/plugins/plugin-4/base-directory '/home/kali' -/plugins/plugin-4/icon-name 'system-file-manager' -/plugins/plugin-5 'launcher' -/plugins/plugin-5/items [<'16732569921.desktop'>] -/plugins/plugin-6 'launcher' -/plugins/plugin-6/items [<'16732569922.desktop'>] -/plugins/plugin-7 'launcher' -/plugins/plugin-7/items [<'16732569923.desktop'>, <'16732569924.desktop'>, <'16732569925.desktop'>] -/plugins/plugin-7/move-first true -/plugins/plugin-8 'separator' -/plugins/plugin-9 'pager' -/plugins/plugin-9/miniature-view false diff --git a/xfce-panel-profiles/Kali/launcher-5/16732569921.desktop b/xfce-panel-profiles/Kali/launcher-5/16732569921.desktop deleted file mode 100644 index e507150d..00000000 --- a/xfce-panel-profiles/Kali/launcher-5/16732569921.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Text Editor -Comment=Simple Text Editor -TryExec=mousepad -Exec=mousepad -Icon=accessories-text-editor -Terminal=false -StartupNotify=true -Type=Application -Categories=Utility;TextEditor; -OnlyShowIn=XFCE; -X-XFCE-Source=file:///usr/share/applications/xfce-text-editor.desktop diff --git a/xfce-panel-profiles/Kali/launcher-6/16732569922.desktop b/xfce-panel-profiles/Kali/launcher-6/16732569922.desktop deleted file mode 100644 index 93605d52..00000000 --- a/xfce-panel-profiles/Kali/launcher-6/16732569922.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Name=Firefox ESR -Comment=Browse the World Wide Web -GenericName=Web Browser -X-GNOME-FullName=Firefox ESR Web Browser -Exec=/usr/lib/firefox-esr/firefox-esr %u -Terminal=false -X-MultipleArgs=false -Type=Application -Icon=firefox-esr -Categories=Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; -StartupWMClass=Firefox-esr -StartupNotify=true -X-XFCE-Source=file:///usr/share/applications/firefox-esr.desktop diff --git a/xfce-panel-profiles/Kali/launcher-7/16732569923.desktop b/xfce-panel-profiles/Kali/launcher-7/16732569923.desktop deleted file mode 100644 index 5daa0c86..00000000 --- a/xfce-panel-profiles/Kali/launcher-7/16732569923.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Exec=exo-open --launch TerminalEmulator -Icon=org.xfce.terminalemulator -StartupNotify=true -Terminal=false -Categories=Utility;X-XFCE;X-Xfce-Toplevel; -OnlyShowIn=XFCE; -X-AppStream-Ignore=True -Name=Terminal Emulator -Comment=Use the command line -X-XFCE-Source=file:///usr/share/applications/xfce4-terminal-emulator.desktop diff --git a/xfce-panel-profiles/Kali/launcher-7/16732569924.desktop b/xfce-panel-profiles/Kali/launcher-7/16732569924.desktop deleted file mode 100644 index 91bf8381..00000000 --- a/xfce-panel-profiles/Kali/launcher-7/16732569924.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Root Terminal Emulator -Comment=Opens a terminal as the root user, using sudo to ask for the password -Exec=pkexec x-terminal-emulator -Icon=utilities-root-terminal -StartupNotify=false -Terminal=false -Type=Application -Categories=System;Utility;TerminalEmulator; -X-Kali-Package=kali-menu -X-XFCE-Source=file:///usr/share/applications/root-terminal.desktop diff --git a/xfce-panel-profiles/Kali/launcher-7/16732569925.desktop b/xfce-panel-profiles/Kali/launcher-7/16732569925.desktop deleted file mode 100644 index 3cb11655..00000000 --- a/xfce-panel-profiles/Kali/launcher-7/16732569925.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=PowerShell -Comment=PowerShell is an automation and configuration management platform -Encoding=UTF-8 -Exec=pwsh -Icon=kali-pwsh -StartupNotify=false -Terminal=true -Type=Application -Categories=System;Utility; -X-Kali-Package=powershell -X-XFCE-Source=file:///usr/share/applications/kali-pwsh.desktop diff --git a/xfce-panel-profiles/Kali/whiskermenu-1.rc b/xfce-panel-profiles/Kali/whiskermenu-1.rc deleted file mode 120000 index 1fb28584..00000000 --- a/xfce-panel-profiles/Kali/whiskermenu-1.rc +++ /dev/null @@ -1 +0,0 @@ -../../etc/xdg/xfce4/whiskermenu/defaults.rc \ No newline at end of file diff --git a/xfce-panel-profiles/Makefile b/xfce-panel-profiles/Makefile deleted file mode 100644 index 6320b0a6..00000000 --- a/xfce-panel-profiles/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -dir = usr/share/xfce4-panel-profiles/layouts -TAROPTS := --sort=name --format ustar - -.PHONY: build clean install - -build: - for layout in */; do \ - (cd "$${layout}" \ - && tar $(TAROPTS) -cvjhf "../$$(basename "$${layout}").tar.bz2" *;) \ - done - -clean: - rm -f *.tar.bz2 - -install: - install -d $(DESTDIR)/$(dir) - $(INSTALL_DATA) *.tar.bz2 $(DESTDIR)/$(dir) - -include ../Makefile.inc