Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Berg <benjamin@sipsolutions.net>2009-01-09 22:11:54 (GMT)
committer Benjamin Berg <benjamin@sipsolutions.net>2009-01-09 22:11:54 (GMT)
commit8bb33214751eab42b82f8af89e7bacf7bbb6b106 (patch)
tree9c3f34905fb3ee9ec411fad91d1fbf174eb649b4
parent90ec50f81facdf68f4bc9597d96659d5ec4c2b13 (diff)
Revert "Import old colorbutton patch."
This code was not ment to go in just now. This reverts commit 90ec50f81facdf68f4bc9597d96659d5ec4c2b13.
-rw-r--r--gtk/theme/gtkrc.em1
-rw-r--r--icons/scalable/control/Makefile.am3
-rw-r--r--icons/scalable/control/color-preview.svg17
3 files changed, 1 insertions, 20 deletions
diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em
index f22a3e8..5a4078f 100644
--- a/gtk/theme/gtkrc.em
+++ b/gtk/theme/gtkrc.em
@@ -822,7 +822,6 @@ widget_class "*<GtkScrolledWindow>.<GtkHScrollbar>" style "hscrollbar-scrolled-w
# Toolbar
widget_class "*<GtkToolButton>*" style "toolbutton"
-widget_class "*<SugarColorToolButton>*" style "toolbutton"
widget_class "*<GtkSeparatorToolItem>*" style "separatortoolbutton"
widget_class "*<GtkToolbar>" style "toolbar"
diff --git a/icons/scalable/control/Makefile.am b/icons/scalable/control/Makefile.am
index 965423f..e194cdb 100644
--- a/icons/scalable/control/Makefile.am
+++ b/icons/scalable/control/Makefile.am
@@ -3,8 +3,7 @@ category=control
icondir = $(datadir)/icons/sugar/$(iconsize)/$(category)
icon_DATA = \
- control-popup-arrow.svg \
- color-preview.svg
+ control-popup-arrow.svg
EXTRA_DIST = $(icon_DATA)
diff --git a/icons/scalable/control/color-preview.svg b/icons/scalable/control/color-preview.svg
deleted file mode 100644
index c33f554..0000000
--- a/icons/scalable/control/color-preview.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
- <!ENTITY stroke_color "#010101">
- <!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="device-network-wireless-100">
- <g>
- <g>
- <defs>
- <rect height="45" id="SVGID_1_" width="45" x="4.875" y="5"/>
- </defs>
- <clipPath id="SVGID_2_">
- <use overflow="visible" xlink:href="#SVGID_1_"/>
- </clipPath>
- <path clip-path="url(#SVGID_2_)" d="M46.375,27.498c0,10.494-8.507,19.002-19,19.002s-19-8.508-19-19.002 c0-10.49,8.507-18.998,19-18.998S46.375,17.003,46.375,27.498z" fill="&fill_color;"/>
- </g>
- <path d="M46.375,27.498 c0,10.494-8.507,19.002-19,19.002s-19-8.508-19-19.002c0-10.49,8.507-18.998,19-18.998S46.375,17.003,46.375,27.498z" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
- </g>
-</g></svg> \ No newline at end of file