Skip to content

Commit 88d86f3

Browse files
committed
Tidy up theme colour settings for GTK+3
1 parent f509ddf commit 88d86f3

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

debian/raspberrypi-ui-mods.postinst

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ case "${1}" in
6565
CHANGED_FILES="${CHANGED_FILES} \
6666
${CONF_DIR}/gtk-3.0/gtk.css"
6767
fi
68-
if dpkg --compare-versions "${2}" lt "1.20161206"; then
68+
if dpkg --compare-versions "${2}" lt "1.20180926"; then
6969
CHANGED_FILES="${CHANGED_FILES} \
7070
${CONF_DIR}/gtk-3.0/settings.ini"
7171
fi

usr/bin/startlxde-pi

-10
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ if [ ! -f "$LXSESSION_CONF_DIR/autokey.sh" ]; then
3939
cp /etc/xdg/lxsession/LXDE-pi/autokey.sh "$LXSESSION_CONF_DIR/autokey.sh"
4040
fi
4141

42-
# Copy gtk.css and settings.ini (required for GTK3 themes to work correctly)
43-
if [ ! -f "$XDG_CONFIG_HOME/gtk-3.0/gtk.css" ]; then
44-
mkdir -p "$XDG_CONFIG_HOME/gtk-3.0"
45-
cp /usr/share/raspi-ui-overrides/gtk.css "$XDG_CONFIG_HOME/gtk-3.0/"
46-
fi
47-
if [ ! -f "$XDG_CONFIG_HOME/gtk-3.0/settings.ini" ]; then
48-
mkdir -p "$XDG_CONFIG_HOME/gtk-3.0"
49-
cp /usr/share/raspi-ui-overrides/settings.ini "$XDG_CONFIG_HOME/gtk-3.0/"
50-
fi
51-
5242
# Ensure Qt themes are consistent with GTK themes
5343
if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then
5444
cp /usr/share/raspi-ui-overrides/Trolltech.conf "$XDG_CONFIG_HOME/"

usr/share/raspi-ui-overrides/gtk.css

-6
This file was deleted.

usr/share/themes/PiX/gtk-3.0/gtk-contained.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -4607,22 +4607,22 @@ stackswitcher button.text-button.circular {
46074607
use responsibly! */
46084608
/*
46094609
widget text/foreground color */
4610-
@define-color theme_fg_color #2e3436;
4610+
@define-color theme_fg_color #000000;
46114611
/*
46124612
text color for entries, views and content in general */
4613-
@define-color theme_text_color black;
4613+
@define-color theme_text_color #1a1a1a;
46144614
/*
46154615
widget base background color */
4616-
@define-color theme_bg_color #ededed;
4616+
@define-color theme_bg_color #edeceb;
46174617
/*
46184618
text widgets and the like base background color */
46194619
@define-color theme_base_color #ffffff;
46204620
/*
46214621
base background color of selections */
4622-
@define-color theme_selected_bg_color @theme_selected_bg_color;
4622+
@define-color theme_selected_bg_color #4d98f5;
46234623
/*
46244624
text/foreground color of selections */
4625-
@define-color theme_selected_fg_color @theme_selected_fg_color;
4625+
@define-color theme_selected_fg_color #ffffff;
46264626
/*
46274627
base background color of insensitive widgets */
46284628
@define-color insensitive_bg_color #f1f1f1;

0 commit comments

Comments
 (0)