diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css
index ce169de..5d7eaf2 100644
--- a/gtk-3.0/apps/granite-widgets.css
+++ b/gtk-3.0/apps/granite-widgets.css
@@ -151,6 +151,8 @@
*************/
GraniteWidgetsStatusBar {
padding: 1px;
+ background-image: none;
+ background-color: @theme_bg_color;
background-color: @theme_bg_color;
background-image: none;
box-shadow: inset 0 1px shade(@theme_bg_color, 0.8);
@@ -174,8 +176,13 @@ GraniteWidgetsPopOver {
.popover_bg {
background-color: transparent;
+<<<<<<< HEAD
+ background-image: none;
+ background-color: @menu_bg_color;
+=======
background-color: @menu_bg_color;
background-image: none;
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
}
GraniteWidgetsPopOver .sidebar.view,
@@ -198,8 +205,13 @@ GraniteWidgetsPopOver .button:hover:active {
}
GraniteWidgetsPopOver .entry {
+<<<<<<< HEAD
+ background-image: none;
+ background-color: @theme_base_color;
+=======
background-color: @theme_base_color;
background-image: none;
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
color: @theme_text_color;
}
@@ -211,8 +223,13 @@ GraniteWidgetsPopOver .entry {
.app:hover,
.app:focus {
border-color: shade(@theme_selected_bg_color, 0.90);
+<<<<<<< HEAD
+ background-image: none;
+ background-color: @theme_selected_bg_color;
+=======
background-color: @theme_selected_bg_color;
background-image: none;
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
color: @theme_selected_fg_color;
}
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png
index 8ba7212..de1ae29 100644
Binary files a/gtk-3.0/assets/checkbox-checked-insensitive.png and b/gtk-3.0/assets/checkbox-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-checked.png b/gtk-3.0/assets/checkbox-checked.png
index d53dd45..183761f 100644
Binary files a/gtk-3.0/assets/checkbox-checked.png and b/gtk-3.0/assets/checkbox-checked.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png
index 7ae096b..aa01322 100644
Binary files a/gtk-3.0/assets/checkbox-mixed-insensitive.png and b/gtk-3.0/assets/checkbox-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed.png b/gtk-3.0/assets/checkbox-mixed.png
index ce4209c..5bbf93f 100644
Binary files a/gtk-3.0/assets/checkbox-mixed.png and b/gtk-3.0/assets/checkbox-mixed.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked.png b/gtk-3.0/assets/checkbox-unchecked.png
index f1b1cac..dda12f6 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked.png and b/gtk-3.0/assets/checkbox-unchecked.png differ
diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.png b/gtk-3.0/assets/menuitem-radio-checked-hover.png
index 2ad650b..f14cf22 100644
Binary files a/gtk-3.0/assets/menuitem-radio-checked-hover.png and b/gtk-3.0/assets/menuitem-radio-checked-hover.png differ
diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
index acb5f48..90b1571 100644
Binary files a/gtk-3.0/assets/menuitem-radio-checked-insensitive.png and b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/menuitem-radio-checked.png b/gtk-3.0/assets/menuitem-radio-checked.png
index 4092c82..7fbe089 100644
Binary files a/gtk-3.0/assets/menuitem-radio-checked.png and b/gtk-3.0/assets/menuitem-radio-checked.png differ
diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png
index 6177904..ccd8b34 100644
Binary files a/gtk-3.0/assets/radio-mixed.png and b/gtk-3.0/assets/radio-mixed.png differ
diff --git a/gtk-3.0/assets/radio-selected-insensitive.png b/gtk-3.0/assets/radio-selected-insensitive.png
index d143164..c8ac815 100644
Binary files a/gtk-3.0/assets/radio-selected-insensitive.png and b/gtk-3.0/assets/radio-selected-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-selected.png b/gtk-3.0/assets/radio-selected.png
index 64b3cba..e7a1ddf 100644
Binary files a/gtk-3.0/assets/radio-selected.png and b/gtk-3.0/assets/radio-selected.png differ
diff --git a/gtk-3.0/assets/radio-unselected.png b/gtk-3.0/assets/radio-unselected.png
index 9face32..538ee5b 100644
Binary files a/gtk-3.0/assets/radio-unselected.png and b/gtk-3.0/assets/radio-unselected.png differ
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 75b63bb..bf53d99 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -449,7 +449,11 @@ GtkDrawingArea {
}
GtkDrawingArea:insensitive {
+<<<<<<< HEAD
+ background-color: shade(@theme_bg_color, 0.90);
+=======
background-color: shade(@theme_bg_color, 0.9);
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
}
/************
@@ -955,6 +959,10 @@ GtkTreeMenu .menuitem * {
border-radius: 2px;
background-color: shade(@theme_bg_color, 0.9);
background-image: none;
+<<<<<<< HEAD
+ background-color: shade(@theme_bg_color, 0.90);
+=======
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
}
.notebook tab:active {
@@ -1178,6 +1186,10 @@ GtkScale.trough {
border-radius: 2px;
background-color: shade(@theme_bg_color, 0.85);
background-image: none;
+<<<<<<< HEAD
+ background-color: shade(@theme_bg_color, 0.85);
+=======
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
}
GtkScale.trough.vertical {
@@ -1186,6 +1198,10 @@ GtkScale.trough.vertical {
border-radius: 2px;
background-color: shade(@theme_bg_color, 0.85);
background-image: none;
+<<<<<<< HEAD
+ background-color: shade(@theme_bg_color, 0.85);
+=======
+>>>>>>> d2566a7a46b2a1fbf7f5e4ccbf384e0a7dace5f3
}
.menubar .menuitem .scale.highlight.left,
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 00cc5c5..7556e6c 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,4 +1,4 @@
[Settings]
-gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937"
+gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#555555\nfg_color:#555555;\ntooltip_fg_color:#f9f9f9\nselected_fg_color:#f9f9f9\nlink_color:#d64937"
gtk-auto-mnemonics = 1
gtk-visible-focus = automatic
diff --git a/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg b/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg
new file mode 100644
index 0000000..94fd39e
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/checkbox-checked.svg b/svg-sources/gtk-3.0/assets/checkbox-checked.svg
new file mode 100644
index 0000000..34c8b8e
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/checkbox-checked.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/svg-sources/gtk-3.0/assets/checkbox-mixed-insensitive.svg
new file mode 100644
index 0000000..ebebffe
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/checkbox-mixed-insensitive.svg
@@ -0,0 +1,139 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/checkbox-mixed.svg b/svg-sources/gtk-3.0/assets/checkbox-mixed.svg
new file mode 100644
index 0000000..facaf36
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/checkbox-mixed.svg
@@ -0,0 +1,138 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/checkbox-unchecked.svg b/svg-sources/gtk-3.0/assets/checkbox-unchecked.svg
new file mode 100644
index 0000000..da5b454
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/checkbox-unchecked.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/svg-sources/gtk-3.0/assets/menuitem-radio-checked-hover.svg
new file mode 100644
index 0000000..8f52faa
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/menuitem-radio-checked-hover.svg
@@ -0,0 +1,98 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/svg-sources/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
new file mode 100644
index 0000000..b4ac663
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/menuitem-radio-checked.svg b/svg-sources/gtk-3.0/assets/menuitem-radio-checked.svg
new file mode 100644
index 0000000..265a2a2
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/menuitem-radio-checked.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/radio-mixed.svg b/svg-sources/gtk-3.0/assets/radio-mixed.svg
new file mode 100644
index 0000000..84f5db8
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/radio-mixed.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/radio-selected-insensitive.svg b/svg-sources/gtk-3.0/assets/radio-selected-insensitive.svg
new file mode 100644
index 0000000..e499f3b
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/radio-selected-insensitive.svg
@@ -0,0 +1,103 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/radio-selected.svg b/svg-sources/gtk-3.0/assets/radio-selected.svg
new file mode 100644
index 0000000..965f8c8
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/radio-selected.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/svg-sources/gtk-3.0/assets/radio-unselected.svg b/svg-sources/gtk-3.0/assets/radio-unselected.svg
new file mode 100644
index 0000000..b0c1ba9
--- /dev/null
+++ b/svg-sources/gtk-3.0/assets/radio-unselected.svg
@@ -0,0 +1,95 @@
+
+
+
+