diff options
author | Santiago Collazo <scollazo@activitycentral.com> | 2013-01-23 12:11:35 (GMT) |
---|---|---|
committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-01-23 12:11:35 (GMT) |
commit | a40da76002a1c8626ddc02ac682132cc9e359c0b (patch) | |
tree | 9b875e8a10e4c12d9541f839f29867fd8b842846 | |
parent | ef20f620c2e41a59a43be0b1ee230219f1cf72aa (diff) | |
parent | 036271f2b48f10740e605304cb509fbbcb7bcd9b (diff) |
Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | gtk3/theme/gtk-widgets.css.em | 17 | ||||
-rwxr-xr-x | icons/scalable/actions/Makefile.am | 6 | ||||
-rw-r--r-- | icons/scalable/actions/entry-refresh.svg | 14 | ||||
-rw-r--r-- | icons/scalable/actions/entry-search.svg | 14 | ||||
-rw-r--r-- | icons/scalable/actions/entry-stop.svg | 17 | ||||
-rw-r--r-- | icons/scalable/actions/system-search.svg | 28 |
7 files changed, 15 insertions, 83 deletions
diff --git a/configure.ac b/configure.ac index 3d569f8..466758c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.53) -AC_INIT([sugar-artwork],[0.98.2],[],[sugar-artwork]) +AC_INIT([sugar-artwork],[0.98.3],[],[sugar-artwork]) AM_CONFIG_HEADER(config.h) diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em index 2ae1592..94dceda 100644 --- a/gtk3/theme/gtk-widgets.css.em +++ b/gtk3/theme/gtk-widgets.css.em @@ -817,23 +817,6 @@ SugarKeepIcon.button.toggle-press { background-color: @zoom_views_active; } -/* CellRendererProgress */ - -.cell.progressbar, .cell.trough { - border-style: solid; - border-width: $(thickness)px; - border-color: @selection_grey; - border-radius: $(2*subcell_size)px; -} - -.cell.progressbar { - background-color: @white; -} - -.cell.trough { - background-color: @text_field_grey; -} - /* Text cursor handles */ .cursor-handle.top, diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am index f6e02a5..f484fda 100755 --- a/icons/scalable/actions/Makefile.am +++ b/icons/scalable/actions/Makefile.am @@ -119,11 +119,7 @@ icon_DATA = \ zoom-original.svg \ zoom-out.svg \ zoom-to-width.svg \ - entry-cancel.svg \ - entry-search.svg \ - entry-stop.svg \ - entry-refresh.svg - + entry-cancel.svg EXTRA_DIST = $(icon_DATA) diff --git a/icons/scalable/actions/entry-refresh.svg b/icons/scalable/actions/entry-refresh.svg deleted file mode 100644 index 0682978..0000000 --- a/icons/scalable/actions/entry-refresh.svg +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ - <!ENTITY fill_color "#FFFFFF"> - <!ENTITY stroke_color "#010101"> -]> -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-view-refresh" xml:space="preserve"> - <path - d="m 9.769744,17.559712 c -3.044496,-0.6084 -5.33832,-3.295344 -5.33832,-6.51768 0,-3.67224 2.97648,-6.649344 6.646848,-6.649344 3.672864,0 6.649344,2.977104 6.649344,6.649344 0,3.166176 -2.215824,5.816928 -5.18232,6.48648" id="path3220" style="fill:none;stroke:&stroke_color;;stroke-width:2.18400002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <polyline - points=" 22.936,31.578 25.5,37.994 18.746,39.439 " - id="polyline3222" - style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - transform="matrix(0.624,0,0,0.624,-6.142256,-6.148544)" /> -</svg> diff --git a/icons/scalable/actions/entry-search.svg b/icons/scalable/actions/entry-search.svg deleted file mode 100644 index eda02d1..0000000 --- a/icons/scalable/actions/entry-search.svg +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> -<!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 version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - width="22.156px" height="22.156px" viewBox="0 0 22.156 22.156" enable-background="new 0 0 22.156 22.156" xml:space="preserve"> -<g> - <path fill="none" stroke="&fill_color;" stroke-width="3.5" d="M1.75,9.216c0,4.125,3.342,7.47,7.468,7.47 - c4.121,0,7.466-3.345,7.466-7.47c0-4.123-3.345-7.466-7.466-7.466C5.092,1.75,1.75,5.093,1.75,9.216z"/> - <line fill="none" stroke="&fill_color;" stroke-width="3.5" x1="14.498" y1="14.497" x2="20.918" y2="20.919"/> -</g> -</svg> diff --git a/icons/scalable/actions/entry-stop.svg b/icons/scalable/actions/entry-stop.svg deleted file mode 100644 index 76e2703..0000000 --- a/icons/scalable/actions/entry-stop.svg +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ - <!ENTITY fill_color "#FFFFFF"> - <!ENTITY stroke_color "#010101"> -]> -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-dialog-cancel" xml:space="preserve"> - <g transform="matrix(1.3,0,0,1.3,-3.2682282,-3.3351543)" id="browse-dialog-cancel" style="stroke-width:2.69230771;stroke-miterlimit:4;stroke-dasharray:none"> - <path - d="M 14.798121,7.2131543 6.9900671,15.021208" - id="path2986" - style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <path - d="M 6.9900671,7.2131543 14.798121,15.021208" - id="path3756" - style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - </g> -</svg> diff --git a/icons/scalable/actions/system-search.svg b/icons/scalable/actions/system-search.svg index 0753c7d..eda02d1 100644 --- a/icons/scalable/actions/system-search.svg +++ b/icons/scalable/actions/system-search.svg @@ -1,16 +1,14 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ - <!ENTITY fill_color "#FFFFFF"> - <!ENTITY stroke_color "#010101"> +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> +<!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 - xmlns="http://www.w3.org/2000/svg" - version="1.1" - width="55.125" - height="55" - viewBox="0 0 55.125 55" - id="svg2998" - xml:space="preserve"><path - d="m 24.041111,6.6111917 c -9.547345,0 -17.367419,7.8249603 -17.367419,17.3674193 0,9.545361 7.81901,17.367419 17.367419,17.367419 3.592743,0 6.946526,-1.113321 9.724565,-3.003612 l 9.992214,9.992214 4.639242,-4.639242 -9.962475,-10.021953 c 1.876778,-2.771091 2.973873,-6.114717 2.973873,-9.694826 0,-9.544057 -7.827328,-17.3674193 -17.367419,-17.3674193 z m 0,6.6019983 c 5.97663,0 10.765421,4.785226 10.765421,10.765421 0,5.984823 -4.789857,10.76542 -10.765421,10.76542 -5.987137,0 -10.765421,-4.778999 -10.765421,-10.76542 0,-5.981792 4.777219,-10.765421 10.765421,-10.765421 z" - id="path2988" - style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.5;stroke-linejoin:round;stroke-miterlimit:4;" /></svg> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="22.156px" height="22.156px" viewBox="0 0 22.156 22.156" enable-background="new 0 0 22.156 22.156" xml:space="preserve"> +<g> + <path fill="none" stroke="&fill_color;" stroke-width="3.5" d="M1.75,9.216c0,4.125,3.342,7.47,7.468,7.47 + c4.121,0,7.466-3.345,7.466-7.47c0-4.123-3.345-7.466-7.466-7.466C5.092,1.75,1.75,5.093,1.75,9.216z"/> + <line fill="none" stroke="&fill_color;" stroke-width="3.5" x1="14.498" y1="14.497" x2="20.918" y2="20.919"/> +</g> +</svg> |