summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPhilip Chimento <philip@endlessm.com>2014-01-20 17:16:03 -0200
committerPhilip Chimento <philip@endlessm.com>2014-01-22 22:30:22 -0200
commit4d7b0cb396f5a1992aacf077bcd893758cbc9b1f (patch)
tree20230ea6dc295764ea5ae7af8e04209be460333f /data
parent685b5708a1cdf2f70f75a12bd8ca8cde47fe672e (diff)
Replace back button PNG asset with SVG
This requires some restructuring because the SVG image and the label need to have different CSS. I ported the CompositeButton class from the photo app, in order to have the button transfer its prelight/active state flags to its children. [endlessm/eos-sdk#504]
Diffstat (limited to 'data')
-rw-r--r--data/assets/introduction_back_button_hover.pngbin9252 -> 0 bytes
-rw-r--r--data/assets/introduction_back_button_normal.pngbin8932 -> 0 bytes
-rw-r--r--data/assets/introduction_back_button_pressed.pngbin8029 -> 0 bytes
-rw-r--r--data/assets/wikipedia-category-back-symbolic.svg9
-rw-r--r--data/css/eos-wikipedia-domain.css27
-rw-r--r--data/eos-wikipedia-domain.gresource.xml4
6 files changed, 35 insertions, 5 deletions
diff --git a/data/assets/introduction_back_button_hover.png b/data/assets/introduction_back_button_hover.png
deleted file mode 100644
index 418fee7..0000000
--- a/data/assets/introduction_back_button_hover.png
+++ /dev/null
Binary files differ
diff --git a/data/assets/introduction_back_button_normal.png b/data/assets/introduction_back_button_normal.png
deleted file mode 100644
index 54ea015..0000000
--- a/data/assets/introduction_back_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/data/assets/introduction_back_button_pressed.png b/data/assets/introduction_back_button_pressed.png
deleted file mode 100644
index a1d3bc0..0000000
--- a/data/assets/introduction_back_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/data/assets/wikipedia-category-back-symbolic.svg b/data/assets/wikipedia-category-back-symbolic.svg
new file mode 100644
index 0000000..f844163
--- /dev/null
+++ b/data/assets/wikipedia-category-back-symbolic.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+ width="68px" height="68px" viewBox="-0.5 0.5 68 68" enable-background="new -0.5 0.5 68 68" xml:space="preserve">
+<path style="fill:#bebebe" d="M33.5,68.5c18.776,0,34-15.224,34-34c0-18.775-15.224-34-34-34c-18.775,0-34,15.225-34,34
+ C-0.5,53.276,14.725,68.5,33.5,68.5z M37.456,16.652l5.151,5.15L29.73,34.682l12.876,12.88l-5.151,5.152L19.424,34.682
+ L37.456,16.652z"/>
+</svg>
diff --git a/data/css/eos-wikipedia-domain.css b/data/css/eos-wikipedia-domain.css
index ad1c9b3..ed1a92e 100644
--- a/data/css/eos-wikipedia-domain.css
+++ b/data/css/eos-wikipedia-domain.css
@@ -88,12 +88,35 @@ Gjs_CategoryButton.clickable:hover {
background-color: rgba(0, 0, 0, 0.2);
}
-.category-page Gjs_AssetButton {
+#category-back-button GtkImage {
+ color: black;
+ opacity: 0.6;
+ icon-shadow: inset 0 1px 1px alpha(black, 0.5), 0 1px alpha(white, 0.2);
+}
+
+#category-back-button GtkImage:hover {
+ color: white;
+}
+
+#category-back-button GtkImage:active {
+ color: #d7d7d7;
+}
+
+#category-back-button GtkImage:hover,
+#category-back-button GtkImage:active {
+ opacity: 0.95;
+ icon-shadow: inset 0 1px 1px alpha(black, 0.5),
+ 0 1px alpha(white, 0.2),
+ 0 0 15px alpha(black, 0.15);
+}
+
+#category-back-button GtkLabel {
font-weight: bold;
color: alpha(white, 0.0);
}
-.category-page Gjs_AssetButton:prelight {
+#category-back-button GtkLabel:hover,
+#category-back-button GtkLabel:active {
text-shadow: 0px 1px 0px alpha(#000000, 0.5), 0px 0px 12px alpha(#000000, 0.3);
color: alpha(white, 1.0);
}
diff --git a/data/eos-wikipedia-domain.gresource.xml b/data/eos-wikipedia-domain.gresource.xml
index e4672d1..8f0025d 100644
--- a/data/eos-wikipedia-domain.gresource.xml
+++ b/data/eos-wikipedia-domain.gresource.xml
@@ -12,9 +12,7 @@
<file>assets/submenu_background.jpg</file>
<file>assets/category_hover_arrow.png</file>
<file>assets/image_strip_back_button.png</file>
- <file>assets/introduction_back_button_normal.png</file>
- <file>assets/introduction_back_button_pressed.png</file>
- <file>assets/introduction_back_button_hover.png</file>
+ <file compressed="true">assets/wikipedia-category-back-symbolic.svg</file>
<file>assets/topbar_back_icon_normal.png</file>
</gresource>
</gresources>