summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRory MacQueen <rorymacqueen@gmail.com>2014-01-17 13:02:45 -0800
committerRory MacQueen <rorymacqueen@gmail.com>2014-01-17 13:02:45 -0800
commit724cd57ef275d33339486b91d51bb565ac9b3fff (patch)
treeae0f34517f7d8764c17d1d0be9d42dd8e67c2040
parente6c04f5fc88512c89ade9add47ee85466b87730e (diff)
parent668d38e8232d76d10667b5682650a7a573ca4e92 (diff)
Merge pull request #503 from endlessm/issues/502
Change the shadow separator
-rw-r--r--data/assets/category_splash_separator_shadow.pngbin1601 -> 0 bytes
-rw-r--r--data/eos-wikipedia-domain.gresource.xml1
-rw-r--r--wikipedia/PrebuiltCategoryPage.js7
3 files changed, 3 insertions, 5 deletions
diff --git a/data/assets/category_splash_separator_shadow.png b/data/assets/category_splash_separator_shadow.png
deleted file mode 100644
index 6ef03e0..0000000
--- a/data/assets/category_splash_separator_shadow.png
+++ /dev/null
Binary files differ
diff --git a/data/eos-wikipedia-domain.gresource.xml b/data/eos-wikipedia-domain.gresource.xml
index 8442d5e..e4672d1 100644
--- a/data/eos-wikipedia-domain.gresource.xml
+++ b/data/eos-wikipedia-domain.gresource.xml
@@ -10,7 +10,6 @@
<file>assets/submenu_separator_shadow_b.png</file>
<file>assets/submenu_hover_arrow.png</file>
<file>assets/submenu_background.jpg</file>
- <file>assets/category_splash_separator_shadow.png</file>
<file>assets/category_hover_arrow.png</file>
<file>assets/image_strip_back_button.png</file>
<file>assets/introduction_back_button_normal.png</file>
diff --git a/wikipedia/PrebuiltCategoryPage.js b/wikipedia/PrebuiltCategoryPage.js
index ca2c783..6ad4be7 100644
--- a/wikipedia/PrebuiltCategoryPage.js
+++ b/wikipedia/PrebuiltCategoryPage.js
@@ -10,8 +10,7 @@ const Config = imports.wikipedia.config;
const FixedSizeTextView = imports.wikipedia.widgets.FixedSizeTextView;
const ScaledImage = imports.wikipedia.widgets.scaled_image;
-const SUBMENU_SEPARATOR_A_URI = "/com/endlessm/wikipedia-domain/assets/submenu_separator_shadow_a.png";
-const SPLASH_SEPARATOR_URI = "/com/endlessm/wikipedia-domain/assets/category_splash_separator_shadow.png";
+const SHADOW_SEPARATOR_RESOURCE_PATH = "/com/endlessm/wikipedia-domain/assets/submenu_separator_shadow_a.png";
const INTRO_TITLE_SEPARATOR_URI = "/com/endlessm/wikipedia-domain/assets/introduction_title_separator.png";
const LEFT_MARGIN_FOR_TEXT = 45;
@@ -80,13 +79,13 @@ const PrebuiltCategoryPage = new Lang.Class({
});
this._submenu_separator = new ScaledImage.ScaledImage({
- resource: SUBMENU_SEPARATOR_A_URI,
+ resource: SHADOW_SEPARATOR_RESOURCE_PATH,
constraint: Gtk.Orientation.VERTICAL,
halign: Gtk.Align.END
});
this._splash_separator = new ScaledImage.ScaledImage({
- resource: SPLASH_SEPARATOR_URI,
+ resource: SHADOW_SEPARATOR_RESOURCE_PATH,
constraint: Gtk.Orientation.VERTICAL,
halign: Gtk.Align.END
});