From 96bdc9f350ebb9fe82e811bbe7e0bd18c0866814 Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Fri, 20 Feb 2015 14:11:44 +0100 Subject: [PATCH] theme: Use gnome-shell-sass as a submodule The sass sources now live in a project in GNOME, so they can be used in multiple projects like gnome-shell-extensions. Because of that, add gnome-shell-sass as a submodule and import the sass sources from it. --- .gitmodules | 3 +++ autogen.sh | 8 ++++++++ data/HACKING | 6 ++++++ data/gnome-classic.scss | 6 +++--- data/gnome-shell-sass | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 100644 data/HACKING create mode 160000 data/gnome-shell-sass diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..f063b42c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "data/gnome-shell-sass"] + path = data/gnome-shell-sass + url = https://git.gnome.org/browse/gnome-shell-sass/ diff --git a/autogen.sh b/autogen.sh index b48e9376..42288e41 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,6 +12,14 @@ test -f $srcdir/configure.ac || { exit 1 } +# Fetch submodules if needed +if test ! -f data/gnome-shell-sass/COPYING; +then + echo "+ Setting up submodules" + git submodule init +fi +git submodule update + which gnome-autogen.sh || { echo "You need to install gnome-common from GNOME Git (or from" echo "your OS vendor's package manager)." diff --git a/data/HACKING b/data/HACKING new file mode 100644 index 00000000..eae41cb9 --- /dev/null +++ b/data/HACKING @@ -0,0 +1,6 @@ +To generate the css files, from the project directory: + +sass --sourcemap=none --update . + +To update the gnome-shell-sass submodule to latest upstream commit: +git submodule update --rebase diff --git a/data/gnome-classic.scss b/data/gnome-classic.scss index 3f9812de..c3153d42 100644 --- a/data/gnome-classic.scss +++ b/data/gnome-classic.scss @@ -1,9 +1,9 @@ /* Use the gnome-shell theme, but with light colors */ $variant: 'light'; -@import "../../gnome-shell/data/theme/_colors"; //use gtk colors -@import "../../gnome-shell/data/theme/_drawing"; -@import "../../gnome-shell/data/theme/_common"; +@import "gnome-shell-sass/_colors"; //use gtk colors +@import "gnome-shell-sass/_drawing"; +@import "gnome-shell-sass/_common"; /* Overrides */ diff --git a/data/gnome-shell-sass b/data/gnome-shell-sass new file mode 160000 index 00000000..98909344 --- /dev/null +++ b/data/gnome-shell-sass @@ -0,0 +1 @@ +Subproject commit 98909344c9623147184f8f28d0a4d87f412b4762