From 5ef83db45e44ae51dfbb16148bd2c53692b4940f Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo 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 @@ + + + + assets/checkbox-checked-dark.png + assets/checkbox-checked-insensitive-dark.png + assets/checkbox-checked-insensitive.png + assets/checkbox-checked.png + assets/checkbox-mixed-dark.png + assets/checkbox-mixed-insensitive-dark.png + assets/checkbox-mixed-insensitive.png + assets/checkbox-mixed.png + assets/checkbox-unchecked-dark.png + assets/checkbox-unchecked-insensitive-dark.png + assets/checkbox-unchecked-insensitive.png + assets/checkbox-unchecked.png + assets/grid-selection-checked-dark.png + assets/grid-selection-checked.png + assets/grid-selection-unchecked-dark.png + assets/grid-selection-unchecked.png + assets/menuitem-checkbox-checked-hover.png + assets/menuitem-checkbox-checked-insensitive.png + assets/menuitem-checkbox-checked.png + assets/menuitem-checkbox-mixed-hover.png + assets/menuitem-checkbox-mixed-insensitive.png + assets/menuitem-checkbox-mixed.png + assets/menuitem-radio-checked-hover.png + assets/menuitem-radio-checked-insensitive.png + assets/menuitem-radio-checked.png + assets/radio-checked-dark.png + assets/radio-checked-insensitive-dark.png + assets/radio-checked-insensitive.png + assets/radio-checked.png + assets/radio-mixed-dark.png + assets/radio-mixed-insensitive-dark.png + assets/radio-mixed-insensitive.png + assets/radio-mixed.png + assets/radio-unchecked-dark.png + assets/radio-unchecked-insensitive-dark.png + assets/radio-unchecked-insensitive.png + assets/radio-unchecked.png + dist/gtk.css + dist/gtk.css.map + dist/gtk-dark.css + dist/gtk-dark.css.map + + 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; + } } }