From 5ef83db45e44ae51dfbb16148bd2c53692b4940f Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Fri, 7 Aug 2015 01:37:34 +0530
Subject: [PATCH] Use gresource
---
.gitignore | 1 +
gtk-3.0/gtk-dark.css | 2 +-
gtk-3.0/gtk.css | 2 +-
gtk-3.0/gtk.gresource.xml | 46 +++++++++++++++++++++++++++++++++
gtk-3.0/scss/widgets/_misc.scss | 15 +++++++----
5 files changed, 59 insertions(+), 7 deletions(-)
create mode 100644 gtk-3.0/gtk.gresource.xml
diff --git a/.gitignore b/.gitignore
index c8a7d64..e1c2565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
# Ignore SASS files
.sass-cache
+gtk.gresource
dist
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 3c469d4..b00626d 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -1 +1 @@
-@import url("dist/gtk-dark.css");
+@import url("resource:///org/numixproject/gtk/dist/gtk-dark.css");
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 415ea7b..c6eab95 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1 +1 @@
-@import url("dist/gtk.css");
+@import url("resource:///org/numixproject/gtk/dist/gtk.css");
diff --git a/gtk-3.0/gtk.gresource.xml b/gtk-3.0/gtk.gresource.xml
new file mode 100644
index 0000000..47bc2ea
--- /dev/null
+++ b/gtk-3.0/gtk.gresource.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<gresources>
+ <gresource prefix='/org/numixproject/gtk'>
+ <file preprocess='to-pixdata'>assets/checkbox-checked-dark.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-checked-insensitive-dark.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-checked-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-checked.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-mixed-dark.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive-dark.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-mixed-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-mixed.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-unchecked-dark.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive-dark.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-unchecked-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/checkbox-unchecked.png</file>
+ <file preprocess='to-pixdata'>assets/grid-selection-checked-dark.png</file>
+ <file preprocess='to-pixdata'>assets/grid-selection-checked.png</file>
+ <file preprocess='to-pixdata'>assets/grid-selection-unchecked-dark.png</file>
+ <file preprocess='to-pixdata'>assets/grid-selection-unchecked.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-hover.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-checkbox-checked-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-checkbox-checked.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-hover.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-checkbox-mixed.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/menuitem-radio-checked.png</file>
+ <file preprocess='to-pixdata'>assets/radio-checked-dark.png</file>
+ <file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark.png</file>
+ <file preprocess='to-pixdata'>assets/radio-checked-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/radio-checked.png</file>
+ <file preprocess='to-pixdata'>assets/radio-mixed-dark.png</file>
+ <file preprocess='to-pixdata'>assets/radio-mixed-insensitive-dark.png</file>
+ <file preprocess='to-pixdata'>assets/radio-mixed-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/radio-mixed.png</file>
+ <file preprocess='to-pixdata'>assets/radio-unchecked-dark.png</file>
+ <file preprocess='to-pixdata'>assets/radio-unchecked-insensitive-dark.png</file>
+ <file preprocess='to-pixdata'>assets/radio-unchecked-insensitive.png</file>
+ <file preprocess='to-pixdata'>assets/radio-unchecked.png</file>
+ <file>dist/gtk.css</file>
+ <file>dist/gtk.css.map</file>
+ <file>dist/gtk-dark.css</file>
+ <file>dist/gtk-dark.css.map</file>
+ </gresource>
+</gresources>
diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss
index 177f8de..3436192 100644
--- a/gtk-3.0/scss/widgets/_misc.scss
+++ b/gtk-3.0/scss/widgets/_misc.scss
@@ -16,13 +16,18 @@
@include exports("tooltip") {
.tooltip {
- @include linear-gradient($tooltip_bg_color);
+ &.background {
+ @include linear-gradient($tooltip_bg_color);
- border: none;
- border-radius: $roundness;
- color: $tooltip_fg_color;
+ border: none;
+ border-radius: $roundness;
+ color: $tooltip_fg_color;
+ }
- * { background-color: transparent; }
+ * {
+ background-color: transparent;
+ color: inherit;
+ }
}
}