Merge branch 'master' into cas

3 files changed, 39 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index aa9c29a..2a68078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,12 +70,11 @@ gnome-session/
 goa-1.0/
 godot/
 gomuks/
-gtk-2.0/
-gtk-3.0/
-gtkrc
-gtkrc-2.0
+gtk-2.0/*
+!gtk-2.0/gtkrc
+gtk-3.0/*
+!gtk-3.0/settings.ini
 guitarix/
-<<<<<<< HEAD
 Hellbeast v2/
 Hellbeast v2.settings
 htop/htoprc
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
new file mode 100644
index 0000000..6ae8019
--- /dev/null
+++ b/gtk-2.0/gtkrc
@@ -0,0 +1,18 @@
+# DO NOT EDIT! This file will be overwritten by nwg-look.
+# Any customization should be done in ~/.gtkrc-2.0.mine instead.
+
+gtk-theme-name="Flat-Remix-GTK-Green-Darkest-Solid"
+gtk-icon-theme-name="Mint-X"
+gtk-font-name="Cantarell 11"
+gtk-cursor-theme-name="BreezeX-Black"
+gtk-cursor-theme-size=24
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle="hintslight"
+gtk-xft-rgba="rgb"
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
new file mode 100644
index 0000000..33306a4
--- /dev/null
+++ b/gtk-3.0/settings.ini
@@ -0,0 +1,17 @@
+[Settings]
+gtk-theme-name=Flat-Remix-GTK-Green-Darkest-Solid
+gtk-icon-theme-name=Mint-X
+gtk-font-name=Cantarell 11
+gtk-cursor-theme-name=BreezeX-Black
+gtk-cursor-theme-size=24
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintslight
+gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=0