[gnome-shell/wip/sass: 96/98] theme: Use gnome-shell-sass as a submodule

[Florian Müllner <fmuellner src gnome org>]

commit 14370ad2c1fe94280bd798885a3171ef2bdabd84
Author: Carlos Soriano <csoriano gnome org>
Date:   Thu Feb 19 21:51:38 2015 +0100

    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 of gnome-shell
    and remove the sass sources from the theme directory.

 .gitmodules                               |    3 +
 autogen.sh                                |    2 +-
 data/theme/HACKING                        |    3 +
 data/theme/_colors.scss                   |   44 -
 data/theme/_common.scss                   | 1808 -----------------------------
 data/theme/_drawing.scss                  |  219 ----
 data/theme/_high-contrast-colors.scss     |   41 -
 data/theme/gnome-shell-high-contrast.scss |    6 +-
 data/theme/gnome-shell-sass               |    1 +
 data/theme/gnome-shell.scss               |    6 +-
 10 files changed, 14 insertions(+), 2119 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index c830da0..5bc5d34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/gvc"]
        path = src/gvc
        url = git://git.gnome.org/libgnome-volume-control
+[submodule "data/theme/gnome-shell-sass"]
+       path = data/theme/gnome-shell-sass
+       url = https://git.gnome.org/browse/gnome-shell-sass
diff --git a/autogen.sh b/autogen.sh
index 89ba6f5..63ae65f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ PKG_NAME="gnome-shell"
 }
 
 # Fetch submodules if needed
-if test ! -f src/gvc/Makefile.am;
+if test ! -f src/gvc/Makefile.am || test ! -d data/theme/gnome-shell-sass;
 then
   echo "+ Setting up submodules"
   git submodule init
diff --git a/data/theme/HACKING b/data/theme/HACKING
new file mode 100644
index 0000000..739dfee
--- /dev/null
+++ b/data/theme/HACKING
@@ -0,0 +1,3 @@
+To generate the css files, from the project directory:
+
+sass --sourcemap=none --update .
diff --git a/data/theme/gnome-shell-high-contrast.scss b/data/theme/gnome-shell-high-contrast.scss
index 91a3197..349dfb6 100644
--- a/data/theme/gnome-shell-high-contrast.scss
+++ b/data/theme/gnome-shell-high-contrast.scss
@@ -1,6 +1,6 @@
- import "_high-contrast-colors"; //use gtk colors
- import "_drawing";
- import "_common";
+ import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
+ import "gnome-shell-sass/_drawing";
+ import "gnome-shell-sass/_common";
 
 //force symbolic icons
 stage {
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
new file mode 160000
index 0000000..f9e45c1
--- /dev/null
+++ b/data/theme/gnome-shell-sass
@@ -0,0 +1 @@
+Subproject commit f9e45c152f56b086baac34f111c837287b7b1806
diff --git a/data/theme/gnome-shell.scss b/data/theme/gnome-shell.scss
index 6e75827..3def589 100644
--- a/data/theme/gnome-shell.scss
+++ b/data/theme/gnome-shell.scss
@@ -1,5 +1,5 @@
 $variant: 'dark';
 
- import "_colors"; //use gtk colors
- import "_drawing";
- import "_common";
+ import "gnome-shell-sass/_colors"; //use gtk colors
+ import "gnome-shell-sass/_drawing";
+ import "gnome-shell-sass/_common";