[gnome-builder] theme: fix location of theme CSS



commit 723c27de0573e794c837c664696acbdab8753d01
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jun 6 03:53:23 2017 -0700

    theme: fix location of theme CSS
    
    We switched to "themes" to be more like /usr/share/themes. This updates
    all the plugins to follow suit.

 plugins/color-picker/gb-color-picker.gresource.xml |    6 +++---
 .../{theme => themes}/Adwaita-dark.css             |    2 +-
 plugins/color-picker/{theme => themes}/Adwaita.css |    2 +-
 plugins/color-picker/{theme => themes}/shared.css  |    0
 plugins/command-bar/gb-command-bar.gresource.xml   |    2 +-
 plugins/command-bar/{theme => themes}/shared.css   |    0
 .../devhelp/gbp-devhelp-resources.gresource.xml    |    2 +-
 plugins/devhelp/{theme => themes}/shared.css       |    0
 plugins/git/ide-git-resources.gresource.xml        |    2 +-
 plugins/git/{theme => themes}/shared.css           |    0
 plugins/symbol-tree/symbol-tree.gresource.xml      |    2 +-
 plugins/symbol-tree/{theme => themes}/shared.css   |    0
 plugins/sysmon/gb-sysmon.gresource.xml             |    2 --
 plugins/sysmon/theme/Adwaita-dark.css              |    6 ------
 plugins/sysmon/theme/Adwaita.css                   |    6 ------
 plugins/sysprof/sysprof.gresource.xml              |    2 +-
 plugins/sysprof/{theme => themes}/shared.css       |    0
 plugins/terminal/gb-terminal.gresource.xml         |    2 +-
 plugins/terminal/{theme => themes}/shared.css      |    0
 19 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/plugins/color-picker/gb-color-picker.gresource.xml 
b/plugins/color-picker/gb-color-picker.gresource.xml
index 7035154..69e8b98 100644
--- a/plugins/color-picker/gb-color-picker.gresource.xml
+++ b/plugins/color-picker/gb-color-picker.gresource.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/color-picker-plugin">
-    <file>theme/Adwaita.css</file>
-    <file>theme/Adwaita-dark.css</file>
-    <file>theme/shared.css</file>
+    <file>themes/Adwaita.css</file>
+    <file>themes/Adwaita-dark.css</file>
+    <file>themes/shared.css</file>
 
     <file>gtk/color-picker.ui</file>
     <file>gtk/color-picker-prefs.ui</file>
diff --git a/plugins/color-picker/theme/Adwaita-dark.css b/plugins/color-picker/themes/Adwaita-dark.css
similarity index 87%
rename from plugins/color-picker/theme/Adwaita-dark.css
rename to plugins/color-picker/themes/Adwaita-dark.css
index 5154e4c..efd6d6e 100644
--- a/plugins/color-picker/theme/Adwaita-dark.css
+++ b/plugins/color-picker/themes/Adwaita-dark.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/plugins/color-picker-plugin/theme/shared.css");
+@import url("resource:///org/gnome/builder/plugins/color-picker-plugin/themes/shared.css");
 
 /* palettew widget dnd indicator */
 gstylecolorpanel gstylepalettewidget.dnd {
diff --git a/plugins/color-picker/theme/Adwaita.css b/plugins/color-picker/themes/Adwaita.css
similarity index 87%
rename from plugins/color-picker/theme/Adwaita.css
rename to plugins/color-picker/themes/Adwaita.css
index 5bade4f..aa154d0 100644
--- a/plugins/color-picker/theme/Adwaita.css
+++ b/plugins/color-picker/themes/Adwaita.css
@@ -1,4 +1,4 @@
-@import url("resource:///org/gnome/builder/plugins/color-picker-plugin/theme/shared.css");
+@import url("resource:///org/gnome/builder/plugins/color-picker-plugin/themes/shared.css");
 
 /*
  * FileChooserDialog preview
diff --git a/plugins/color-picker/theme/shared.css b/plugins/color-picker/themes/shared.css
similarity index 100%
rename from plugins/color-picker/theme/shared.css
rename to plugins/color-picker/themes/shared.css
diff --git a/plugins/command-bar/gb-command-bar.gresource.xml 
b/plugins/command-bar/gb-command-bar.gresource.xml
index 5eb3e3f..d03d414 100644
--- a/plugins/command-bar/gb-command-bar.gresource.xml
+++ b/plugins/command-bar/gb-command-bar.gresource.xml
@@ -2,6 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/command-bar">
     <file>gb-command-bar.ui</file>
-    <file>theme/shared.css</file>
+    <file>themes/shared.css</file>
   </gresource>
 </gresources>
diff --git a/plugins/command-bar/theme/shared.css b/plugins/command-bar/themes/shared.css
similarity index 100%
rename from plugins/command-bar/theme/shared.css
rename to plugins/command-bar/themes/shared.css
diff --git a/plugins/devhelp/gbp-devhelp-resources.gresource.xml 
b/plugins/devhelp/gbp-devhelp-resources.gresource.xml
index f1aa202..ba8120d 100644
--- a/plugins/devhelp/gbp-devhelp-resources.gresource.xml
+++ b/plugins/devhelp/gbp-devhelp-resources.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/devhelp-plugin">
-    <file>theme/shared.css</file>
+    <file>themes/shared.css</file>
     <file>gbp-devhelp-view.ui</file>
     <file>gbp-devhelp-search.ui</file>
   </gresource>
diff --git a/plugins/devhelp/theme/shared.css b/plugins/devhelp/themes/shared.css
similarity index 100%
rename from plugins/devhelp/theme/shared.css
rename to plugins/devhelp/themes/shared.css
diff --git a/plugins/git/ide-git-resources.gresource.xml b/plugins/git/ide-git-resources.gresource.xml
index f516394..adf94aa 100644
--- a/plugins/git/ide-git-resources.gresource.xml
+++ b/plugins/git/ide-git-resources.gresource.xml
@@ -2,6 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/git-plugin">
     <file>ide-git-clone-widget.ui</file>
-    <file>theme/shared.css</file>
+    <file>themes/shared.css</file>
   </gresource>
 </gresources>
diff --git a/plugins/git/theme/shared.css b/plugins/git/themes/shared.css
similarity index 100%
rename from plugins/git/theme/shared.css
rename to plugins/git/themes/shared.css
diff --git a/plugins/symbol-tree/symbol-tree.gresource.xml b/plugins/symbol-tree/symbol-tree.gresource.xml
index 81eb7f1..359d189 100644
--- a/plugins/symbol-tree/symbol-tree.gresource.xml
+++ b/plugins/symbol-tree/symbol-tree.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/symbol-tree">
-    <file>theme/shared.css</file>
+    <file>themes/shared.css</file>
     <file>symbol-tree-panel.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/symbol-tree/theme/shared.css b/plugins/symbol-tree/themes/shared.css
similarity index 100%
rename from plugins/symbol-tree/theme/shared.css
rename to plugins/symbol-tree/themes/shared.css
diff --git a/plugins/sysmon/gb-sysmon.gresource.xml b/plugins/sysmon/gb-sysmon.gresource.xml
index 2bba962..704c724 100644
--- a/plugins/sysmon/gb-sysmon.gresource.xml
+++ b/plugins/sysmon/gb-sysmon.gresource.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/sysmon">
-    <file>theme/Adwaita.css</file>
-    <file>theme/Adwaita-dark.css</file>
     <file>gb-sysmon-panel.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/sysprof/sysprof.gresource.xml b/plugins/sysprof/sysprof.gresource.xml
index d6175b9..b87cb50 100644
--- a/plugins/sysprof/sysprof.gresource.xml
+++ b/plugins/sysprof/sysprof.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/builder/plugins/sysprof-plugin">
     <file>gtk/menus.ui</file>
-    <file>theme/shared.css</file>
+    <file>themes/shared.css</file>
     <file>gbp-sysprof-perspective.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/sysprof/theme/shared.css b/plugins/sysprof/themes/shared.css
similarity index 100%
rename from plugins/sysprof/theme/shared.css
rename to plugins/sysprof/themes/shared.css
diff --git a/plugins/terminal/gb-terminal.gresource.xml b/plugins/terminal/gb-terminal.gresource.xml
index 215c200..d5c6aa1 100644
--- a/plugins/terminal/gb-terminal.gresource.xml
+++ b/plugins/terminal/gb-terminal.gresource.xml
@@ -4,6 +4,6 @@
     <file>gb-terminal-view.ui</file>
     <file>gb-terminal-search.ui</file>
     <file>gtk/menus.ui</file>
-    <file>theme/shared.css</file>
+    <file>themes/shared.css</file>
   </gresource>
 </gresources>
diff --git a/plugins/terminal/theme/shared.css b/plugins/terminal/themes/shared.css
similarity index 100%
rename from plugins/terminal/theme/shared.css
rename to plugins/terminal/themes/shared.css


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