From 531595de4100771dd100f603b226f27efa8dc9e1 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Sun, 15 Nov 2015 21:37:52 +0100
Subject: cinnamon tweaks

---
 common/cinnamon/cinnamon-dark.css                  |  36 +++----
 common/cinnamon/cinnamon.css                       |  36 +++----
 .../common-assets/misc/add-workspace-active.svg    | 117 +++++++++++++++++++++
 .../common-assets/misc/add-workspace-hover.svg     |   8 +-
 .../cinnamon/common-assets/misc/add-workspace.svg  |   6 +-
 common/cinnamon/sass/_common.scss                  |  21 ++--
 6 files changed, 162 insertions(+), 62 deletions(-)
 create mode 100644 common/cinnamon/common-assets/misc/add-workspace-active.svg

diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css
index d322198..536965e 100644
--- a/common/cinnamon/cinnamon-dark.css
+++ b/common/cinnamon/cinnamon-dark.css
@@ -11,25 +11,26 @@ stage {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
-  border-radius: 2px;
   text-shadow: 0 1px rgba(64, 69, 82, 0);
   color: #D3DAE3;
   background-color: #444a58;
   border: 1px solid #2b2e39;
   box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
+  .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
+    border-radius: 2px; }
   .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
     border: 1px solid #5294E2;
     box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
-  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .sound-button:hover {
+  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #505666;
     border: 1px solid #2b2e39;
     box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
-  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .sound-button:hover:focus {
+  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
@@ -432,10 +433,13 @@ StScrollBar {
   background-image: url("common-assets/misc/add-workspace.svg");
   height: 200px;
   width: 35px;
-  transition-duration: 200; }
+  transition-duration: 100; }
   .workspace-add-button:hover {
     background-image: url("common-assets/misc/add-workspace-hover.svg");
-    transition-duration: 200; }
+    transition-duration: 100; }
+  .workspace-add-button:active {
+    background-image: url("common-assets/misc/add-workspace-active.svg");
+    transition-duration: 100; }
 
 .workspace-overview-background-shade {
   background-color: rgba(0, 0, 0, 0.5); }
@@ -655,7 +659,7 @@ StScrollBar {
     .switcher-list .item-box:selected {
       color: #ffffff;
       background-color: #5294E2;
-      border: 1px solid #5294E2; }
+      border: 0px solid #5294E2; }
   .switcher-list .thumbnail {
     width: 256px; }
   .switcher-list .thumbnail-box {
@@ -876,12 +880,6 @@ StScrollBar {
 .menu-favorites-button {
   padding: 10px;
   border: 1px solid transparent; }
-  .menu-favorites-button:hover {
-    text-shadow: 0 1px rgba(64, 69, 82, 0);
-    color: #D3DAE3;
-    background-color: #505666;
-    border: 1px solid #2b2e39;
-    box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
 
 .menu-places-box {
   margin: auto;
@@ -904,12 +902,7 @@ StScrollBar {
   .menu-application-button:highlighted {
     font-weight: bold; }
   .menu-application-button-selected {
-    padding: 7px;
-    text-shadow: 0 1px rgba(64, 69, 82, 0);
-    color: #D3DAE3;
-    background-color: #505666;
-    border: 1px solid #2b2e39;
-    box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
+    padding: 7px; }
     .menu-application-button-selected:highlighted {
       font-weight: bold; }
   .menu-application-button-label:ltr {
@@ -921,12 +914,7 @@ StScrollBar {
   padding: 7px;
   border: 1px solid transparent; }
   .menu-category-button-selected {
-    padding: 7px;
-    text-shadow: 0 1px rgba(64, 69, 82, 0);
-    color: #D3DAE3;
-    background-color: #505666;
-    border: 1px solid #2b2e39;
-    box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); }
+    padding: 7px; }
   .menu-category-button-hover {
     background-color: red;
     border-radius: 2px; }
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css
index 348d220..a8576ca 100644
--- a/common/cinnamon/cinnamon.css
+++ b/common/cinnamon/cinnamon.css
@@ -11,25 +11,26 @@ stage {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
-  border-radius: 2px;
   text-shadow: 0 1px rgba(255, 255, 255, 0);
   color: #5c616c;
   background-color: #fbfbfc;
   border: 1px solid #cfd6e6;
   box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
+  .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
+    border-radius: 2px; }
   .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
     border: 1px solid #5294E2;
     box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
-  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .sound-button:hover {
+  .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: white;
     border: 1px solid #cfd6e6;
     box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
-  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .sound-button:hover:focus {
+  .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
@@ -432,10 +433,13 @@ StScrollBar {
   background-image: url("common-assets/misc/add-workspace.svg");
   height: 200px;
   width: 35px;
-  transition-duration: 200; }
+  transition-duration: 100; }
   .workspace-add-button:hover {
     background-image: url("common-assets/misc/add-workspace-hover.svg");
-    transition-duration: 200; }
+    transition-duration: 100; }
+  .workspace-add-button:active {
+    background-image: url("common-assets/misc/add-workspace-active.svg");
+    transition-duration: 100; }
 
 .workspace-overview-background-shade {
   background-color: rgba(0, 0, 0, 0.5); }
@@ -655,7 +659,7 @@ StScrollBar {
     .switcher-list .item-box:selected {
       color: #ffffff;
       background-color: #5294E2;
-      border: 1px solid #5294E2; }
+      border: 0px solid #5294E2; }
   .switcher-list .thumbnail {
     width: 256px; }
   .switcher-list .thumbnail-box {
@@ -876,12 +880,6 @@ StScrollBar {
 .menu-favorites-button {
   padding: 10px;
   border: 1px solid transparent; }
-  .menu-favorites-button:hover {
-    text-shadow: 0 1px rgba(255, 255, 255, 0);
-    color: #5c616c;
-    background-color: white;
-    border: 1px solid #cfd6e6;
-    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
 
 .menu-places-box {
   margin: auto;
@@ -904,12 +902,7 @@ StScrollBar {
   .menu-application-button:highlighted {
     font-weight: bold; }
   .menu-application-button-selected {
-    padding: 7px;
-    text-shadow: 0 1px rgba(255, 255, 255, 0);
-    color: #5c616c;
-    background-color: white;
-    border: 1px solid #cfd6e6;
-    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
+    padding: 7px; }
     .menu-application-button-selected:highlighted {
       font-weight: bold; }
   .menu-application-button-label:ltr {
@@ -921,12 +914,7 @@ StScrollBar {
   padding: 7px;
   border: 1px solid transparent; }
   .menu-category-button-selected {
-    padding: 7px;
-    text-shadow: 0 1px rgba(255, 255, 255, 0);
-    color: #5c616c;
-    background-color: white;
-    border: 1px solid #cfd6e6;
-    box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
+    padding: 7px; }
   .menu-category-button-hover {
     background-color: red;
     border-radius: 2px; }
diff --git a/common/cinnamon/common-assets/misc/add-workspace-active.svg b/common/cinnamon/common-assets/misc/add-workspace-active.svg
new file mode 100644
index 0000000..f60de34
--- /dev/null
+++ b/common/cinnamon/common-assets/misc/add-workspace-active.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="35"
+   height="200"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="add-workspace-active.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-12.039549"
+     inkscape:cy="88.924726"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3040"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,100"
+       id="guide3893" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="18,190"
+       id="guide3895" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-852.36218)">
+    <path
+       style="opacity:1;fill:#5294e2;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"
+       d="M 3 0 C 1.3380015 0 0 1.3380015 0 3 L 0 197 C 0 198.662 1.3380015 200 3 200 L 36 200 C 37.661999 200 39 198.662 39 197 L 39 3 C 39 1.3380015 37.661999 0 36 0 L 3 0 z M 3 1 L 36 1 C 37.108 1 38 1.892 38 3 L 38 197 C 38 198.108 37.108 199 36 199 L 3 199 C 1.892 199 1 198.108 1 197 L 1 3 C 1 1.892 1.892 1 3 1 z "
+       transform="translate(0,852.36218)"
+       id="rect3810" />
+    <g
+       transform="translate(0,-0.9999969)"
+       id="g3917-7"
+       style="fill:#000000;fill-opacity:1;opacity:0.5" />
+    <rect
+       rx="2"
+       style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3812"
+       width="37"
+       height="198"
+       x="1.000005"
+       y="853.36218"
+       ry="2" />
+    <g
+       id="g3917"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         ry="1.1428567"
+         y="944.36218"
+         x="17"
+         height="15.999994"
+         width="2.0000002"
+         id="rect3897"
+         style="opacity:1;fill:#ffffff;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" />
+      <rect
+         transform="matrix(0,1,-1,0,0,0)"
+         ry="1.1428567"
+         y="-26"
+         x="951.36218"
+         height="15.999994"
+         width="2.0000002"
+         id="rect3897-6"
+         style="opacity:1;fill:#ffffff;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" />
+    </g>
+  </g>
+</svg>
diff --git a/common/cinnamon/common-assets/misc/add-workspace-hover.svg b/common/cinnamon/common-assets/misc/add-workspace-hover.svg
index 0cb3f8a..e771e33 100644
--- a/common/cinnamon/common-assets/misc/add-workspace-hover.svg
+++ b/common/cinnamon/common-assets/misc/add-workspace-hover.svg
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="9.897951"
-     inkscape:cy="99.174726"
+     inkscape:cx="-12.039549"
+     inkscape:cy="128.92473"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -75,7 +75,7 @@
      id="layer1"
      transform="translate(0,-852.36218)">
     <path
-       style="opacity:1;fill:#5294e2;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:0.45;fill:#000000;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"
        d="M 3 0 C 1.3380015 0 0 1.3380015 0 3 L 0 197 C 0 198.662 1.3380015 200 3 200 L 36 200 C 37.661999 200 39 198.662 39 197 L 39 3 C 39 1.3380015 37.661999 0 36 0 L 3 0 z M 3 1 L 36 1 C 37.108 1 38 1.892 38 3 L 38 197 C 38 198.108 37.108 199 36 199 L 3 199 C 1.892 199 1 198.108 1 197 L 1 3 C 1 1.892 1.892 1 3 1 z "
        transform="translate(0,852.36218)"
        id="rect3810" />
@@ -85,7 +85,7 @@
        style="fill:#000000;fill-opacity:1;opacity:0.5" />
     <rect
        rx="2"
-       style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.45;fill:#202229;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect3812"
        width="37"
        height="198"
diff --git a/common/cinnamon/common-assets/misc/add-workspace.svg b/common/cinnamon/common-assets/misc/add-workspace.svg
index d7ce9d5..65f5361 100644
--- a/common/cinnamon/common-assets/misc/add-workspace.svg
+++ b/common/cinnamon/common-assets/misc/add-workspace.svg
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="9.897951"
-     inkscape:cy="99.174726"
+     inkscape:cx="-12.039549"
+     inkscape:cy="128.92473"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -65,7 +65,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index 37942f5..1a16835 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -33,7 +33,10 @@ stage {
   min-height: 20px;
   padding: 5px 32px;
   transition-duration: 0;
-  border-radius: 2px;
+
+  &, &:focus, &:hover, &:hover:focus, &:active, &:active:focus, &:insensitive {
+    border-radius: 2px;
+  }
 
   @include button(normal);
 
@@ -488,11 +491,15 @@ StScrollBar {
     background-image: url("common-assets/misc/add-workspace.svg");
     height: 200px;
     width: 35px;
-    transition-duration: 200;
+    transition-duration: 100;
 
     &:hover {
       background-image: url("common-assets/misc/add-workspace-hover.svg");
-      transition-duration: 200;
+      transition-duration: 100;
+    }
+    &:active {
+      background-image: url("common-assets/misc/add-workspace-active.svg");
+      transition-duration: 100;
     }
   }
   &-overview-background-shade { background-color: rgba(0,0,0,0.5); }
@@ -785,7 +792,7 @@ StScrollBar {
     &:selected {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
-      border: 1px solid $selected_bg_color;
+      border: 0px solid $selected_bg_color;
     }
   }
 
@@ -1055,7 +1062,7 @@ StScrollBar {
     padding: 10px;
     border: 1px solid rgba(0,0,0,0);
 
-    &:hover { @include button(hover); }
+    &:hover { @extend %button:hover; }
   }
 
   &-places {
@@ -1083,7 +1090,7 @@ StScrollBar {
 
     &-selected {
       padding: 7px;
-      @include button(hover);
+      @extend %button:hover;
 
       &:highlighted { font-weight: bold; }
     }
@@ -1098,7 +1105,7 @@ StScrollBar {
 
     &-selected {
       padding: 7px;
-      @include button(hover);
+      @extend %button:hover;
     }
     &-hover {
       background-color: red;
-- 
cgit v1.2.3