From ffa965649f55d5725be5a0f24b3a4182ff7e5478 Mon Sep 17 00:00:00 2001 From: Martin Schenck Date: Fri, 7 Oct 2016 11:50:35 +0200 Subject: Merged upstream, supporting 3.22 --- common/cinnamon/common-assets/menu/menu-hover.svg | 4 ++-- common/cinnamon/common-assets/menu/menu-separator.svg | 2 +- .../cinnamon/common-assets/misc/add-workspace-active.svg | 6 +++--- common/cinnamon/common-assets/misc/add-workspace-hover.svg | 8 ++++---- common/cinnamon/common-assets/misc/add-workspace.svg | 8 ++++---- common/cinnamon/common-assets/misc/bg.svg | 4 ++-- .../common-assets/misc/calendar-arrow-left-hover.svg | 4 ++-- common/cinnamon/common-assets/misc/calendar-arrow-left.svg | 2 +- .../common-assets/misc/calendar-arrow-right-hover.svg | 4 ++-- .../cinnamon/common-assets/misc/calendar-arrow-right.svg | 2 +- common/cinnamon/common-assets/misc/close-active.svg | 6 +++--- common/cinnamon/common-assets/misc/close-hover.svg | 6 +++--- common/cinnamon/common-assets/misc/close.svg | 6 +++--- common/cinnamon/common-assets/misc/corner-ripple.svg | 2 +- common/cinnamon/common-assets/misc/desklet-header.svg | 2 +- common/cinnamon/common-assets/misc/desklet.svg | 2 +- common/cinnamon/common-assets/misc/osd.svg | 6 +++--- common/cinnamon/common-assets/misc/trash-icon.svg | 2 +- common/cinnamon/common-assets/panel/activities-active.svg | 4 ++-- common/cinnamon/common-assets/panel/activities.svg | 8 ++++---- common/cinnamon/common-assets/panel/panel-bottom.svg | 6 +++--- common/cinnamon/common-assets/panel/panel-top.svg | 6 +++--- .../common-assets/panel/window-list-active-bottom.svg | 4 ++-- .../common-assets/panel/window-list-active-top.svg | 4 ++-- .../cinnamon/common-assets/switch/switch-off-selected.svg | 14 +++++++------- .../cinnamon/common-assets/switch/switch-on-selected.svg | 14 +++++++------- 26 files changed, 68 insertions(+), 68 deletions(-) (limited to 'common/cinnamon/common-assets') diff --git a/common/cinnamon/common-assets/menu/menu-hover.svg b/common/cinnamon/common-assets/menu/menu-hover.svg index 4d3f262..6cdbdbe 100644 --- a/common/cinnamon/common-assets/menu/menu-hover.svg +++ b/common/cinnamon/common-assets/menu/menu-hover.svg @@ -24,7 +24,7 @@ id="selected_bg_color" osb:paint="solid"> @@ -40,7 +40,7 @@ @@ -31,7 +31,7 @@ id="selected_bg_color" osb:paint="solid"> @@ -56,7 +56,7 @@ + style="fill:#657b83;fill-opacity:1"> + style="opacity:1;fill:#657b83;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="opacity:1;fill:#657b83;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> diff --git a/common/cinnamon/common-assets/misc/add-workspace.svg b/common/cinnamon/common-assets/misc/add-workspace.svg index 65f5361..1cb3aa0 100644 --- a/common/cinnamon/common-assets/misc/add-workspace.svg +++ b/common/cinnamon/common-assets/misc/add-workspace.svg @@ -19,7 +19,7 @@ id="defs4" /> + style="fill:#657b83;fill-opacity:1"> + style="opacity:1;fill:#657b83;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="opacity:1;fill:#657b83;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> diff --git a/common/cinnamon/common-assets/misc/bg.svg b/common/cinnamon/common-assets/misc/bg.svg index feeddea..1e6d24d 100644 --- a/common/cinnamon/common-assets/misc/bg.svg +++ b/common/cinnamon/common-assets/misc/bg.svg @@ -20,7 +20,7 @@ id="defs5388" /> diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-left.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left.svg index 2774254..5d81d60 100644 --- a/common/cinnamon/common-assets/misc/calendar-arrow-left.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-left.svg @@ -42,7 +42,7 @@ inkscape:object-nodes="false" inkscape:object-paths="false" objecttolerance="10" - pagecolor="#ffffff" + pagecolor="#fdf6e3" inkscape:pageopacity="0" inkscape:pageshadow="2" showborder="true" diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg index e29be39..002646a 100644 --- a/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg @@ -44,7 +44,7 @@ inkscape:object-nodes="false" inkscape:object-paths="false" objecttolerance="10" - pagecolor="#ffffff" + pagecolor="#fdf6e3" inkscape:pageopacity="0" inkscape:pageshadow="2" showborder="true" @@ -99,7 +99,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-right.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right.svg index 366e69b..74a728e 100644 --- a/common/cinnamon/common-assets/misc/calendar-arrow-right.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-right.svg @@ -42,7 +42,7 @@ inkscape:object-nodes="false" inkscape:object-paths="false" objecttolerance="10" - pagecolor="#ffffff" + pagecolor="#fdf6e3" inkscape:pageopacity="0" inkscape:pageshadow="2" showborder="true" diff --git a/common/cinnamon/common-assets/misc/close-active.svg b/common/cinnamon/common-assets/misc/close-active.svg index 95822bf..8c060c8 100644 --- a/common/cinnamon/common-assets/misc/close-active.svg +++ b/common/cinnamon/common-assets/misc/close-active.svg @@ -88,13 +88,13 @@ style="display:inline;fill:#000000;fill-opacity:1" /> \ No newline at end of file diff --git a/common/cinnamon/common-assets/misc/close-hover.svg b/common/cinnamon/common-assets/misc/close-hover.svg index 7b52140..0f6121d 100644 --- a/common/cinnamon/common-assets/misc/close-hover.svg +++ b/common/cinnamon/common-assets/misc/close-hover.svg @@ -88,13 +88,13 @@ style="display:inline;fill:#000000;fill-opacity:1" /> \ No newline at end of file diff --git a/common/cinnamon/common-assets/misc/close.svg b/common/cinnamon/common-assets/misc/close.svg index e221a33..e44adc7 100644 --- a/common/cinnamon/common-assets/misc/close.svg +++ b/common/cinnamon/common-assets/misc/close.svg @@ -88,13 +88,13 @@ style="display:inline;fill:#000000;fill-opacity:1" /> \ No newline at end of file diff --git a/common/cinnamon/common-assets/misc/corner-ripple.svg b/common/cinnamon/common-assets/misc/corner-ripple.svg index 3f52f68..66fe3d6 100644 --- a/common/cinnamon/common-assets/misc/corner-ripple.svg +++ b/common/cinnamon/common-assets/misc/corner-ripple.svg @@ -17,7 +17,7 @@ inkscape:version="0.91 r13725" sodipodi:docname="corner-ripple.svg"> diff --git a/common/cinnamon/common-assets/panel/activities.svg b/common/cinnamon/common-assets/panel/activities.svg index b4a4b0d..b3bcad9 100644 --- a/common/cinnamon/common-assets/panel/activities.svg +++ b/common/cinnamon/common-assets/panel/activities.svg @@ -24,7 +24,7 @@ stroke="#ef2929" fill="#f57900" id="base" - pagecolor="#bebebe" + pagecolor="#657b83" bordercolor="#525252" borderopacity="1" inkscape:pageopacity="1" @@ -134,21 +134,21 @@ id="layer1" transform="translate(0,-276)"> + style="display:inline;opacity:0.95;fill:#002b36;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:0.85;fill:#002b36;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/common/cinnamon/common-assets/panel/panel-top.svg b/common/cinnamon/common-assets/panel/panel-top.svg index c0a64da..1bd946e 100644 --- a/common/cinnamon/common-assets/panel/panel-top.svg +++ b/common/cinnamon/common-assets/panel/panel-top.svg @@ -20,7 +20,7 @@ id="defs4198" /> diff --git a/common/cinnamon/common-assets/panel/window-list-active-top.svg b/common/cinnamon/common-assets/panel/window-list-active-top.svg index 54a9036..30187f9 100644 --- a/common/cinnamon/common-assets/panel/window-list-active-top.svg +++ b/common/cinnamon/common-assets/panel/window-list-active-top.svg @@ -26,7 +26,7 @@ stroke="#ef2929" fill="#f57900" id="base" - pagecolor="#ffffff" + pagecolor="#fdf6e3" bordercolor="#808080" borderopacity="1" inkscape:pageopacity="0" @@ -81,7 +81,7 @@ id="selected_bg_color" osb:paint="solid"> diff --git a/common/cinnamon/common-assets/switch/switch-off-selected.svg b/common/cinnamon/common-assets/switch/switch-off-selected.svg index c374f22..a6bca3a 100644 --- a/common/cinnamon/common-assets/switch/switch-off-selected.svg +++ b/common/cinnamon/common-assets/switch/switch-off-selected.svg @@ -23,7 +23,7 @@ id="selected_fg_color" osb:paint="solid"> @@ -73,11 +73,11 @@ + style="stop-color:#fdf6e3;stop-opacity:0;" /> + style="stop-color:#fdf6e3;stop-opacity:0.54901963;" /> @@ -95,11 +95,11 @@ + style="stop-color:#657b83;stop-opacity:1;" /> + style="stop-color:#fdf6e3;stop-opacity:1;" /> + style="color:#657b83;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:url(#linearGradient4168);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> diff --git a/common/cinnamon/common-assets/switch/switch-on-selected.svg b/common/cinnamon/common-assets/switch/switch-on-selected.svg index a86b37a..ccf2299 100644 --- a/common/cinnamon/common-assets/switch/switch-on-selected.svg +++ b/common/cinnamon/common-assets/switch/switch-on-selected.svg @@ -23,7 +23,7 @@ id="selected_fg_color" osb:paint="solid"> @@ -31,7 +31,7 @@ id="selected_bg_color" osb:paint="solid"> @@ -81,11 +81,11 @@ + style="stop-color:#fdf6e3;stop-opacity:0;" /> + style="stop-color:#fdf6e3;stop-opacity:0.54901963;" /> @@ -103,11 +103,11 @@ + style="stop-color:#657b83;stop-opacity:1;" /> + style="stop-color:#fdf6e3;stop-opacity:1;" />