Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel QuiƱones <manuq@laptop.org>2011-12-15 20:17:41 (GMT)
committer Manuel QuiƱones <manuq@laptop.org>2011-12-15 20:17:41 (GMT)
commit77102ce6bd870a613e962ebb850630371753bd3e (patch)
tree50c5859eab5694a35d754baec33b644906325c4f
parente0bcdc961a210623611b46b266b79dd790cb1108 (diff)
parent6f46ac7a1a8cbf71bb7fccc076cd9aecb0630056 (diff)
Merge branch 'gtk3' of git.sugarlabs.org:~erikos/sugar-artwork/gtk3 into gtk3
-rw-r--r--gtk3/theme/Makefile.am6
-rw-r--r--gtk3/theme/gtk-dark.css3
2 files changed, 1 insertions, 8 deletions
diff --git a/gtk3/theme/Makefile.am b/gtk3/theme/Makefile.am
index c350da1..7ffed4f 100644
--- a/gtk3/theme/Makefile.am
+++ b/gtk3/theme/Makefile.am
@@ -36,8 +36,6 @@ install-data-local: $(GEN_FILES)
$(DESTDIR)$(datadir)/themes/sugar-72/gtk-3.0/settings.ini
$(INSTALL_DATA) $(srcdir)/gtk.css \
$(DESTDIR)$(datadir)/themes/sugar-72/gtk-3.0/gtk.css
- $(INSTALL_DATA) $(srcdir)/gtk-dark.css \
- $(DESTDIR)$(datadir)/themes/sugar-72/gtk-3.0/gtk-dark.css
$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0
$(INSTALL_DATA) $(top_builddir)/gtk3/theme/gtk-widgets-72.css \
$(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0/gtk-widgets.css
@@ -45,12 +43,10 @@ install-data-local: $(GEN_FILES)
$(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0/settings.ini
$(INSTALL_DATA) $(srcdir)/gtk.css \
$(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0/gtk.css
- $(INSTALL_DATA) $(srcdir)/gtk-dark.css \
- $(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0/gtk-dark.css
uninstall-local:
rm -rf $(DESTDIR)$(datadir)/themes/sugar-72/gtk-3.0
rm -rf $(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0
-EXTRA_DIST = gtk-widgets.css.em settings.ini.em em.py gtk-dark.css gtk.css
+EXTRA_DIST = gtk-widgets.css.em settings.ini.em em.py gtk.css
CLEANFILES = $(GEN_FILES)
diff --git a/gtk3/theme/gtk-dark.css b/gtk3/theme/gtk-dark.css
deleted file mode 100644
index 1d2b796..0000000
--- a/gtk3/theme/gtk-dark.css
+++ /dev/null
@@ -1,3 +0,0 @@
-
-@import url("gtk.css");
-