[gnome-builder] theme: fix CSS locations to work with dazzle



commit bc8e784eaceede918f3f6645b1f313ecfeb22125
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jun 6 03:49:03 2017 -0700

    theme: fix CSS locations to work with dazzle
    
    We used the plural in dazzle, so this needs to be updated to reflect that
    location.

 data/theme/Arc-Dark.css                   |    1 -
 data/theme/Arc.css                        |    1 -
 data/{theme => themes}/Adwaita-dark.css   |    2 +-
 data/{theme => themes}/Adwaita-shared.css |    2 +-
 data/{theme => themes}/Adwaita.css        |    2 +-
 data/themes/Arc-Dark.css                  |    1 +
 data/{theme => themes}/Arc-Darker.css     |    2 +-
 data/{theme => themes}/Arc-shared.css     |    2 +-
 data/themes/Arc.css                       |    1 +
 data/{theme => themes}/shared.css         |    0
 libide/resources/libide.gresource.xml     |   24 ++++++++++++------------
 11 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/data/theme/Adwaita-dark.css b/data/themes/Adwaita-dark.css
similarity index 92%
rename from data/theme/Adwaita-dark.css
rename to data/themes/Adwaita-dark.css
index 375c9d1..2bbb00e 100644
--- a/data/theme/Adwaita-dark.css
+++ b/data/themes/Adwaita-dark.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/theme/Adwaita-shared.css");
+@import url("resource:///org/gnome/builder/themes/Adwaita-shared.css");
 
 
 perspectiveswitcher {
diff --git a/data/theme/Adwaita-shared.css b/data/themes/Adwaita-shared.css
similarity index 98%
rename from data/theme/Adwaita-shared.css
rename to data/themes/Adwaita-shared.css
index fbb62bc..1b17631 100644
--- a/data/theme/Adwaita-shared.css
+++ b/data/themes/Adwaita-shared.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/theme/shared.css");
+@import url("resource:///org/gnome/builder/themes/shared.css");
 
 
 /*
diff --git a/data/theme/Adwaita.css b/data/themes/Adwaita.css
similarity index 84%
rename from data/theme/Adwaita.css
rename to data/themes/Adwaita.css
index cbdb1c5..802c056 100644
--- a/data/theme/Adwaita.css
+++ b/data/themes/Adwaita.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/theme/Adwaita-shared.css");
+@import url("resource:///org/gnome/builder/themes/Adwaita-shared.css");
 
 
 layouttabbar {
diff --git a/data/themes/Arc-Dark.css b/data/themes/Arc-Dark.css
new file mode 100644
index 0000000..c2aa59c
--- /dev/null
+++ b/data/themes/Arc-Dark.css
@@ -0,0 +1 @@
+@import url("resource:///org/gnome/builder/themes/Arc-shared.css");
diff --git a/data/theme/Arc-Darker.css b/data/themes/Arc-Darker.css
similarity index 62%
rename from data/theme/Arc-Darker.css
rename to data/themes/Arc-Darker.css
index 1b89e7b..5657d23 100644
--- a/data/theme/Arc-Darker.css
+++ b/data/themes/Arc-Darker.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/theme/Arc-shared.css");
+@import url("resource:///org/gnome/builder/themes/Arc-shared.css");
 
 /* Darker border */
 perspectiveswitcher {
diff --git a/data/theme/Arc-shared.css b/data/themes/Arc-shared.css
similarity index 97%
rename from data/theme/Arc-shared.css
rename to data/themes/Arc-shared.css
index 3f42cbc..d39494c 100644
--- a/data/theme/Arc-shared.css
+++ b/data/themes/Arc-shared.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/theme/shared.css");
+@import url("resource:///org/gnome/builder/themes/shared.css");
 
 /* Darker grey accents used throughtout */
 @define-color theme_accent_color #858c98;
diff --git a/data/themes/Arc.css b/data/themes/Arc.css
new file mode 100644
index 0000000..c2aa59c
--- /dev/null
+++ b/data/themes/Arc.css
@@ -0,0 +1 @@
+@import url("resource:///org/gnome/builder/themes/Arc-shared.css");
diff --git a/data/theme/shared.css b/data/themes/shared.css
similarity index 100%
rename from data/theme/shared.css
rename to data/themes/shared.css
diff --git a/libide/resources/libide.gresource.xml b/libide/resources/libide.gresource.xml
index 9921870..ba3f08c 100644
--- a/libide/resources/libide.gresource.xml
+++ b/libide/resources/libide.gresource.xml
@@ -18,20 +18,20 @@
     <file compressed="true" alias="menus.ui">../../data/gtk/menus.ui</file>
   </gresource>
 
-  <gresource prefix="/org/gnome/builder/theme">
-    <file compressed="true" alias="Adwaita.css">../../data/theme/Adwaita.css</file>
-    <file compressed="true" alias="Adwaita-dark.css">../../data/theme/Adwaita-dark.css</file>
-    <file compressed="true" alias="Adwaita-shared.css">../../data/theme/Adwaita-shared.css</file>
+  <gresource prefix="/org/gnome/builder/themes">
+    <file compressed="true" alias="Adwaita.css">../../data/themes/Adwaita.css</file>
+    <file compressed="true" alias="Adwaita-dark.css">../../data/themes/Adwaita-dark.css</file>
+    <file compressed="true" alias="Adwaita-shared.css">../../data/themes/Adwaita-shared.css</file>
 
-    <file compressed="true" alias="Arc.css">../../data/theme/Arc.css</file>
-    <file compressed="true" alias="Arc-Dark.css">../../data/theme/Arc-Dark.css</file>
-    <file compressed="true" alias="Arc-Darker.css">../../data/theme/Arc-Darker.css</file>
-    <file compressed="true" alias="Arc-dark.css">../../data/theme/Arc-Dark.css</file>
-    <file compressed="true" alias="Arc-Dark-dark.css">../../data/theme/Arc-Dark.css</file>
-    <file compressed="true" alias="Arc-Darker-dark.css">../../data/theme/Arc-Dark.css</file>
-    <file compressed="true" alias="Arc-shared.css">../../data/theme/Arc-shared.css</file>
+    <file compressed="true" alias="Arc.css">../../data/themes/Arc.css</file>
+    <file compressed="true" alias="Arc-Dark.css">../../data/themes/Arc-Dark.css</file>
+    <file compressed="true" alias="Arc-Darker.css">../../data/themes/Arc-Darker.css</file>
+    <file compressed="true" alias="Arc-dark.css">../../data/themes/Arc-Dark.css</file>
+    <file compressed="true" alias="Arc-Dark-dark.css">../../data/themes/Arc-Dark.css</file>
+    <file compressed="true" alias="Arc-Darker-dark.css">../../data/themes/Arc-Dark.css</file>
+    <file compressed="true" alias="Arc-shared.css">../../data/themes/Arc-shared.css</file>
 
-    <file compressed="true" alias="shared.css">../../data/theme/shared.css</file>
+    <file compressed="true" alias="shared.css">../../data/themes/shared.css</file>
   </gresource>
 
   <gresource prefix="/org/gnome/builder/modelines">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]