From ca158129aafedf9a477935575cba378c15570168 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-assets/misc/add-workspace-active.svg    |  6 +--
 .../misc/calendar-arrow-left-hover.svg             |  4 +-
 .../misc/calendar-arrow-right-hover.svg            |  4 +-
 .../common-assets/panel/activities-active.svg      |  4 +-
 .../panel/window-list-active-bottom.svg            |  4 +-
 .../common-assets/panel/window-list-active-top.svg |  4 +-
 .../common-assets/switch/switch-off-selected.svg   | 14 +++---
 .../common-assets/switch/switch-on-selected.svg    | 14 +++---
 .../checkbox/checkbox-checked-focused.svg          |  4 +-
 .../dark-assets/checkbox/checkbox-checked.svg      |  4 +-
 .../checkbox/checkbox-unchecked-focused.svg        |  6 +--
 common/cinnamon/dark-assets/misc/message.svg       |  4 +-
 common/cinnamon/dark-assets/switch/switch-on.svg   | 18 +++----
 .../checkbox/checkbox-checked-focused.svg          |  6 +--
 .../light-assets/checkbox/checkbox-checked.svg     |  6 +--
 .../checkbox/checkbox-unchecked-focused.svg        |  6 +--
 common/cinnamon/light-assets/misc/message.svg      |  6 +--
 common/cinnamon/light-assets/switch/switch-on.svg  | 14 +++---
 common/cinnamon/sass/_colors.scss                  | 58 +++++++++++-----------
 20 files changed, 95 insertions(+), 95 deletions(-)

(limited to 'common/cinnamon')

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">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4138" />
     </linearGradient>
@@ -40,7 +40,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/common-assets/misc/add-workspace-active.svg b/common/cinnamon/common-assets/misc/add-workspace-active.svg
index d39784c..69c1a09 100644
--- a/common/cinnamon/common-assets/misc/add-workspace-active.svg
+++ b/common/cinnamon/common-assets/misc/add-workspace-active.svg
@@ -23,7 +23,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4147" />
     </linearGradient>
@@ -31,7 +31,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4144" />
     </linearGradient>
@@ -56,7 +56,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
index 9292ecc..047f3c9 100644
--- a/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-left-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">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4147" />
     </linearGradient>
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">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4147" />
     </linearGradient>
diff --git a/common/cinnamon/common-assets/panel/activities-active.svg b/common/cinnamon/common-assets/panel/activities-active.svg
index ae5c602..32c73a6 100644
--- a/common/cinnamon/common-assets/panel/activities-active.svg
+++ b/common/cinnamon/common-assets/panel/activities-active.svg
@@ -26,7 +26,7 @@
      stroke="#ef2929"
      fill="#f57900"
      id="base"
-     pagecolor="#bebebe"
+     pagecolor="#657b83"
      bordercolor="#525252"
      borderopacity="1"
      inkscape:pageopacity="1"
@@ -83,7 +83,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4140" />
     </linearGradient>
diff --git a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
index fbe4599..5be9bd0 100644
--- a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
+++ b/common/cinnamon/common-assets/panel/window-list-active-bottom.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">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4137" />
     </linearGradient>
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">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4137" />
     </linearGradient>
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">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4164" />
     </linearGradient>
@@ -73,11 +73,11 @@
       <stop
          id="stop3940"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         style="stop-color:#fdf6e3;stop-opacity:0;" />
       <stop
          id="stop3942"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.54901963;" />
+         style="stop-color:#fdf6e3;stop-opacity:0.54901963;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6523">
@@ -95,11 +95,11 @@
       <stop
          id="stop3940-4"
          offset="0"
-         style="stop-color:#bebebe;stop-opacity:1;" />
+         style="stop-color:#657b83;stop-opacity:1;" />
       <stop
          id="stop3942-8"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         style="stop-color:#fdf6e3;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -122,7 +122,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -223,7 +223,7 @@
          inkscape:connector-curvature="0"
          d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z"
          id="path10839-9-8-2-2-5-7"
-         style="color:#bebebe;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" />
+         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" />
     </g>
   </g>
 </svg>
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">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4171" />
     </linearGradient>
@@ -31,7 +31,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4166" />
     </linearGradient>
@@ -81,11 +81,11 @@
       <stop
          id="stop3940"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         style="stop-color:#fdf6e3;stop-opacity:0;" />
       <stop
          id="stop3942"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.54901963;" />
+         style="stop-color:#fdf6e3;stop-opacity:0.54901963;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6523">
@@ -103,11 +103,11 @@
       <stop
          id="stop3940-4"
          offset="0"
-         style="stop-color:#bebebe;stop-opacity:1;" />
+         style="stop-color:#657b83;stop-opacity:1;" />
       <stop
          id="stop3942-8"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         style="stop-color:#fdf6e3;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -148,7 +148,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg b/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg
index 0c2a8ee..4789a32 100644
--- a/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg
+++ b/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg
@@ -26,7 +26,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4159" />
     </linearGradient>
@@ -61,7 +61,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg b/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg
index b17ab7c..8f431e7 100644
--- a/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg
+++ b/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg
@@ -26,7 +26,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4159" />
     </linearGradient>
@@ -61,7 +61,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg
index 0c111f0..77c4256 100644
--- a/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg
+++ b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg
@@ -26,7 +26,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4150" />
     </linearGradient>
@@ -61,7 +61,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -145,7 +145,7 @@
              id="g5400-2-47">
             <rect
                ry="2"
-               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d323d;fill-opacity:1;stroke:url(#linearGradient4152);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#002b36;fill-opacity:1;stroke:url(#linearGradient4152);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-5-7-6-3-70"
                width="13"
                height="12.999997"
diff --git a/common/cinnamon/dark-assets/misc/message.svg b/common/cinnamon/dark-assets/misc/message.svg
index 7c8f1b6..c9615d6 100644
--- a/common/cinnamon/dark-assets/misc/message.svg
+++ b/common/cinnamon/dark-assets/misc/message.svg
@@ -24,7 +24,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4138" />
     </linearGradient>
@@ -40,7 +40,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/dark-assets/switch/switch-on.svg b/common/cinnamon/dark-assets/switch/switch-on.svg
index b6a9be9..0c5f216 100644
--- a/common/cinnamon/dark-assets/switch/switch-on.svg
+++ b/common/cinnamon/dark-assets/switch/switch-on.svg
@@ -23,7 +23,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4166" />
     </linearGradient>
@@ -73,11 +73,11 @@
       <stop
          id="stop3940"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         style="stop-color:#fdf6e3;stop-opacity:0;" />
       <stop
          id="stop3942"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.54901963;" />
+         style="stop-color:#fdf6e3;stop-opacity:0.54901963;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6523">
@@ -95,11 +95,11 @@
       <stop
          id="stop3940-4"
          offset="0"
-         style="stop-color:#bebebe;stop-opacity:1;" />
+         style="stop-color:#657b83;stop-opacity:1;" />
       <stop
          id="stop3942-8"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         style="stop-color:#fdf6e3;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -113,7 +113,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -203,7 +203,7 @@
                ry="11"
                rx="11" />
             <circle
-               style="fill:#353a47;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#002b36;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0-75"
                cx="41"
                cy="1041.3622"
@@ -223,7 +223,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2-13"
-           style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#002b36;fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -232,7 +232,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0-65"
-           style="display:inline;opacity:1;fill:#353a47;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#002b36;fill-opacity:1;stroke:none" />
       </g>
     </g>
   </g>
diff --git a/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg b/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg
index e214088..f63a213 100644
--- a/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg
+++ b/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg
@@ -26,7 +26,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4169" />
     </linearGradient>
@@ -34,7 +34,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4166" />
     </linearGradient>
@@ -109,7 +109,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/light-assets/checkbox/checkbox-checked.svg b/common/cinnamon/light-assets/checkbox/checkbox-checked.svg
index 6b5caeb..6504d09 100644
--- a/common/cinnamon/light-assets/checkbox/checkbox-checked.svg
+++ b/common/cinnamon/light-assets/checkbox/checkbox-checked.svg
@@ -26,7 +26,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4169" />
     </linearGradient>
@@ -34,7 +34,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4166" />
     </linearGradient>
@@ -109,7 +109,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg b/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg
index da48d45..89b2c49 100644
--- a/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg
+++ b/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg
@@ -26,7 +26,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4150" />
     </linearGradient>
@@ -61,7 +61,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -145,7 +145,7 @@
              id="g5400-2">
             <rect
                ry="2"
-               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4152);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fdf6e3;fill-opacity:1;stroke:url(#linearGradient4152);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-5-7-6-3"
                width="13"
                height="12.999997"
diff --git a/common/cinnamon/light-assets/misc/message.svg b/common/cinnamon/light-assets/misc/message.svg
index 039cb8f..d4096ee 100644
--- a/common/cinnamon/light-assets/misc/message.svg
+++ b/common/cinnamon/light-assets/misc/message.svg
@@ -24,7 +24,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4153" />
     </linearGradient>
@@ -41,7 +41,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -79,7 +79,7 @@
      id="layer1"
      transform="translate(0,-1020.3622)">
     <rect
-       style="display:inline;opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;fill:#fcfdfd;fill-opacity:1;stroke:#657b83;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4160"
        width="31"
        height="31.000017"
diff --git a/common/cinnamon/light-assets/switch/switch-on.svg b/common/cinnamon/light-assets/switch/switch-on.svg
index 9945e14..c7d9d3d 100644
--- a/common/cinnamon/light-assets/switch/switch-on.svg
+++ b/common/cinnamon/light-assets/switch/switch-on.svg
@@ -23,7 +23,7 @@
        id="selected_fg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#fdf6e3;stop-opacity:1;"
          offset="0"
          id="stop4181" />
     </linearGradient>
@@ -31,7 +31,7 @@
        id="selected_bg_color"
        osb:paint="solid">
       <stop
-         style="stop-color:#5294e2;stop-opacity:1;"
+         style="stop-color:#268bd2;stop-opacity:1;"
          offset="0"
          id="stop4166" />
     </linearGradient>
@@ -81,11 +81,11 @@
       <stop
          id="stop3940"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         style="stop-color:#fdf6e3;stop-opacity:0;" />
       <stop
          id="stop3942"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.54901963;" />
+         style="stop-color:#fdf6e3;stop-opacity:0.54901963;" />
     </linearGradient>
     <linearGradient
        id="linearGradient6523">
@@ -103,11 +103,11 @@
       <stop
          id="stop3940-4"
          offset="0"
-         style="stop-color:#bebebe;stop-opacity:1;" />
+         style="stop-color:#657b83;stop-opacity:1;" />
       <stop
          id="stop3942-8"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         style="stop-color:#fdf6e3;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -148,7 +148,7 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#fdf6e3"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/common/cinnamon/sass/_colors.scss b/common/cinnamon/sass/_colors.scss
index 8d3a5f2..3fb53bf 100644
--- a/common/cinnamon/sass/_colors.scss
+++ b/common/cinnamon/sass/_colors.scss
@@ -2,13 +2,13 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant =='light', #ffffff, #404552);
-$text_color: if($variant == 'light', #5c616c, #D3DAE3);
-$bg_color: if($variant =='light', #F5F6F7, #383C4A);
-$fg_color: if($variant =='light', #5c616c, #D3DAE3);
+$base_color: if($variant =='light', #fdf6e3, #073642);
+$text_color: if($variant == 'light', #5c616c, #657b83);
+$bg_color: if($variant =='light', #F5F6F7, #002b36);
+$fg_color: if($variant =='light', #5c616c, #657b83);
 
-$selected_fg_color: #ffffff;
-$selected_bg_color: #5294e2;
+$selected_fg_color: #fdf6e3;
+$selected_bg_color: #268bd2;
 $selected_borders_color: darken($selected_bg_color, 20%);
 $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%));
 
@@ -19,37 +19,37 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
 
 $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color);
 $selection_mode_fg: $selected_fg_color;
-$warning_color: #F27835;
-$error_color: #FC4138;
+$warning_color: #cb4b16;
+$error_color: #dc322f;
 $warning_fg_color: white;
 $error_fg_color: white;
-$success_color: #73d216;
-$destructive_color: #F04A50;
-$suggested_color: #4DADD4;
+$success_color: #859900;
+$destructive_color: #dc322f;
+$suggested_color: #2aa198;
 $destructive_fg_color: white;
 $suggested_fg_color: white;
 
-$drop_target_color: #F08437;
+$drop_target_color: #b58900;
 
 //insensitive state derived colors
 $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
 $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
 $header_bg: red;
-@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); }
-@if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; }
-@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); }
-@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; }
+@if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#eee8d5, 0.05); }
+@if $transparency=='false' and $variant=='light' { $header_bg: #eee8d5; }
+@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#002b36, 0.03); }
+@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #002b36; }
 
 $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%));
 
 $header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%));
 
 $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%));
-$header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg);
+$header_fg: if($darker == 'true', saturate(transparentize(#657b83, 0.2), 10%), $header_fg);
 
-$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945);
-$dark_sidebar_fg: #BAC3CF;
+$dark_sidebar_bg: if($transparency == 'true', transparentize(#073642, 0.05), #073642);
+$dark_sidebar_fg: #657b83;
 $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%));
 
 $osd_fg_color: $dark_sidebar_fg;
@@ -69,7 +69,7 @@ $panel_bg: darken($dark_sidebar_bg, 4.7%);
 $panel_fg: $dark_sidebar_fg;
 
 $entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%));
-$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
+$entry_border: if($variant == 'light', #657b83, darken($borders_color, 0%));
 
 $header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1));
 $header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7));
@@ -83,19 +83,19 @@ $header_button_border: if($darker == 'true' or $variant == 'dark', transparentiz
 //WM Buttons
 
 // Close
-$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d);
-$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d);
-$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841);
+$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #dc322f);
+$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #cb4b16);
+$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #dc322f);
 
-$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f);
+$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #002b36);
 
 // Minimize, Maximize
-$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C);
+$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #657b83);
 $wm_button_active_bg: $selected_bg_color;
 
-$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932);
+$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #002b36);
 
-$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B);
-$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74);
-$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC);
+$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #93a1a1);
+$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #657b83);
+$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #93a1a1);
 $wm_icon_active_bg: $selected_fg_color;
-- 
cgit v1.2.3