From 24faa813177543859597ab5b24ed736618c31675 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 27 Aug 2016 14:56:42 -0400 Subject: [PATCH] Combined css files in one. The nature of CSS selectors makes it possible to combine the sheets by using multiple selectors for the ruleset. This changeset has been tested on: - Ubuntu xenial, which uses GTK 3.18 - archlinux (current), which uses GTK 3.20 --- src/Makefile.am | 4 ---- src/lightdm-webkit2-greeter-application-3.20.css | 3 --- src/lightdm-webkit2-greeter-application.css | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 src/lightdm-webkit2-greeter-application-3.20.css diff --git a/src/Makefile.am b/src/Makefile.am index bb5a605..e49a101 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,7 @@ webextension_LTLIBRARIES = liblightdm-webkit2-greeter-ext.la webextensiondir = $(libdir)/lightdm-webkit2-greeter -if HAVE_GTK320 -ldmcssfile = lightdm-webkit2-greeter-application-3.20.css -else ldmcssfile = lightdm-webkit2-greeter-application.css -endif lightdm-webkit2-greeter-css-application.h: $(srcdir)/$(ldmcssfile) Makefile $(AM_V_GEN) exo-csource --static --name=lightdm_webkit2_greeter_css_application $< >$@ diff --git a/src/lightdm-webkit2-greeter-application-3.20.css b/src/lightdm-webkit2-greeter-application-3.20.css deleted file mode 100644 index a6aba4b..0000000 --- a/src/lightdm-webkit2-greeter-application-3.20.css +++ /dev/null @@ -1,3 +0,0 @@ -window { - background: #000000; -} \ No newline at end of file diff --git a/src/lightdm-webkit2-greeter-application.css b/src/lightdm-webkit2-greeter-application.css index 979bb85..8cd1492 100644 --- a/src/lightdm-webkit2-greeter-application.css +++ b/src/lightdm-webkit2-greeter-application.css @@ -1,3 +1,4 @@ +window, GtkWindow { background: #000000; }