diff options
author | Horst3180 | 2015-09-09 21:19:57 +0200 |
---|---|---|
committer | Horst3180 | 2015-09-09 23:50:14 +0200 |
commit | 4097e62e012ed929335ddde7fc9719ee763d731f (patch) | |
tree | 8c7633484a9f55fec0cf59124be4e3002da86729 /common/cinnamon | |
parent | e0da453e5255a7efeaa23b080dcc592517c09f86 (diff) | |
download | solarc-theme-4097e62e012ed929335ddde7fc9719ee763d731f.tar.gz solarc-theme-4097e62e012ed929335ddde7fc9719ee763d731f.tar.xz solarc-theme-4097e62e012ed929335ddde7fc9719ee763d731f.zip |
tweak color scheme and window buttons
Diffstat (limited to 'common/cinnamon')
-rw-r--r-- | common/cinnamon/cinnamon.css | 148 | ||||
-rw-r--r-- | common/cinnamon/common-assets/misc/bg.svg | 14 | ||||
-rw-r--r-- | common/cinnamon/common-assets/misc/button-box.svg | 15 | ||||
-rw-r--r-- | common/cinnamon/common-assets/misc/desklet-header.svg | 10 | ||||
-rw-r--r-- | common/cinnamon/common-assets/misc/osd.svg | 16 | ||||
-rw-r--r-- | common/cinnamon/common-assets/panel/panel-bottom.svg | 40 | ||||
-rw-r--r-- | common/cinnamon/common-assets/panel/panel-top.svg | 14 | ||||
-rw-r--r-- | common/cinnamon/sass/_colors.scss | 72 | ||||
-rw-r--r-- | common/cinnamon/sass/_drawing.scss | 46 |
9 files changed, 189 insertions, 186 deletions
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 74bda1e..ad41f97 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -13,40 +13,40 @@ stage { transition-duration: 0; border-radius: 2px; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + 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 { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + 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 { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #5294E2; + color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .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 { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button { min-height: 20px; @@ -54,30 +54,26 @@ stage { transition-duration: 0; border-radius: 2px; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button-box .modal-dialog-button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus { color: #5294E2; } .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .popup-menu #notification StEntry, #menu-search-entry { padding: 7px; @@ -86,20 +82,20 @@ stage { selected-color: #ffffff; transition-duration: 300ms; border-radius: 3px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); background-color: #fbfbfb; - border-color: 1px solid #e0e4ee; } + border-color: 1px solid #e0e4ee; + box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.05); } .popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -113,20 +109,20 @@ stage { selected-color: #ffffff; transition-duration: 300ms; border-radius: 3px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid #5294E2; } + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:insensitive { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #555a62; - background-color: rgba(0, 0, 0, 0.1); - border-color: 1px solid rgba(0, 0, 0, 0.4); } + color: rgba(186, 195, 207, 0.55); + background-color: rgba(102, 109, 132, 0.2); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StScrollView.vfade { -st-vfade-offset: 0px; } @@ -231,7 +227,7 @@ StScrollBar { #Tooltip { border-radius: 3px; padding: 5px 12px; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); color: #BAC3CF; font-size: 1em; font-weight: normal; @@ -380,8 +376,8 @@ StScrollBar { spacing: 12px; } .window-caption { - background-color: rgba(42, 44, 51, 0.95); - border: 1px solid rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); + border: 1px solid rgba(53, 57, 69, 0.95); color: #BAC3CF; spacing: 25px; border-radius: 2px; @@ -401,10 +397,10 @@ StScrollBar { font-size: 9pt; padding: 5px 8px; -cinnamon-caption-spacing: 4px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .expo-workspaces-name-entry:focus, .expo-workspaces-name-entry#selected:focus { border: 1px solid #5294E2; @@ -425,7 +421,7 @@ StScrollBar { border-radius: 2px; } .expo-background { - background-color: #2a2c33; } + background-color: #353945; } .workspace-thumbnails { spacing: 14px; } @@ -744,15 +740,15 @@ StScrollBar { caret-color: #BAC3CF; selected-color: #ffffff; selection-background-color: #5294E2; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .run-dialog-entry:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid #5294E2; } + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .run-dialog .modal-dialog-button-box { border: none; box-shadow: none; @@ -815,7 +811,7 @@ StScrollBar { border-width: 0px; } #keyboard { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); border-width: 0; border-top-width: 1px; border-color: rgba(0, 0, 0, 0.4); } @@ -835,34 +831,30 @@ StScrollBar { border-radius: 3px; box-shadow: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -881,10 +873,10 @@ StScrollBar { border: 1px solid transparent; } .menu-favorites-button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-places-box { margin: auto; @@ -909,10 +901,10 @@ StScrollBar { .menu-application-button-selected { padding: 7px; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-application-button-selected:highlighted { font-weight: bold; } .menu-application-button-label:ltr { @@ -926,10 +918,10 @@ StScrollBar { .menu-category-button-selected { padding: 7px; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-category-button-hover { background-color: red; border-radius: 2px; } diff --git a/common/cinnamon/common-assets/misc/bg.svg b/common/cinnamon/common-assets/misc/bg.svg index cf27958..feeddea 100644 --- a/common/cinnamon/common-assets/misc/bg.svg +++ b/common/cinnamon/common-assets/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="bg.svg"> <defs id="defs5388" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="14.604606" - inkscape:cy="20.53994" + inkscape:zoom="11.313708" + inkscape:cx="18.271674" + inkscape:cy="5.838404" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> <rect - style="display:inline;opacity:0.72;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164-4-3" width="23" height="21.999889" @@ -67,7 +67,7 @@ rx="2.0000005" ry="1.9999999" /> <rect - style="display:inline;opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164" width="22" height="20.999971" @@ -78,7 +78,7 @@ <g transform="translate(-425.99995,658.36226)" id="g4271" - style="display:inline;opacity:0.75"> + style="display:inline;opacity:0.65"> <rect ry="8" rx="8" diff --git a/common/cinnamon/common-assets/misc/button-box.svg b/common/cinnamon/common-assets/misc/button-box.svg index 7435084..036f0d1 100644 --- a/common/cinnamon/common-assets/misc/button-box.svg +++ b/common/cinnamon/common-assets/misc/button-box.svg @@ -40,8 +40,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="-0.14173931" - inkscape:cy="13.244492" + inkscape:cx="9.376447" + inkscape:cy="10.14915" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -83,15 +83,8 @@ id="layer1" transform="translate(-5,-1027.3622)"> <path - style="opacity:0.67;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 0,3.6512857e-5 0,17 c 0,1.108 0.892,2 2,2 l 18,0 c 1.108,0 2,-0.892 2,-2 L 22,3.6512857e-5 Z M 21,1.0000365 21,17 c 0,0.554 -0.446,1 -1,1 L 2,18 C 1.446,18 1,17.554 1,17 L 1,1.0000365 Z" - transform="translate(5,1027.3622)" - id="rect4147" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csssscccsssscc" /> - <path - style="opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 26,1027.3622 0,17 c 0,0.554 -0.446,1 -1,1 l -18,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-17 z" + style="opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 27,1027.3622 0,17.9445 c 0,0.5848 -0.4906,1.0555 -1.1,1.0555 l -19.8,0 c -0.6094,0 -1.1,-0.4707 -1.1,-1.0555 l 0,-17.9445 z" id="rect4145-1" inkscape:connector-curvature="0" sodipodi:nodetypes="csssscc" /> diff --git a/common/cinnamon/common-assets/misc/desklet-header.svg b/common/cinnamon/common-assets/misc/desklet-header.svg index fd6b6df..a6e1054 100644 --- a/common/cinnamon/common-assets/misc/desklet-header.svg +++ b/common/cinnamon/common-assets/misc/desklet-header.svg @@ -38,9 +38,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.627416" - inkscape:cx="16.568127" - inkscape:cy="2.2143252" + inkscape:zoom="15.999999" + inkscape:cx="13.051047" + inkscape:cy="8.8454562" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -88,7 +88,7 @@ height="21.999889" width="23" id="rect4164-4-3" - style="display:inline;opacity:0.72000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:0.84;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <rect ry="1.4" rx="1.4" @@ -97,7 +97,7 @@ height="20.999971" width="22" id="rect4164" - style="display:inline;opacity:0.95;fill:#33373f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="display:inline;opacity:0.95;fill:#2b2f3b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <g style="display:inline;opacity:0.75" id="g4271" diff --git a/common/cinnamon/common-assets/misc/osd.svg b/common/cinnamon/common-assets/misc/osd.svg index e7a4202..df41a00 100644 --- a/common/cinnamon/common-assets/misc/osd.svg +++ b/common/cinnamon/common-assets/misc/osd.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="osd.svg"> <defs id="defs5388" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="8.7900421" - inkscape:cy="21.131226" + inkscape:zoom="16" + inkscape:cx="23.210075" + inkscape:cy="11.575503" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,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> @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> <rect - style="display:inline;opacity:0.8;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;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:none;fill-opacity:1;stroke:#0f1116;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164-4-3" width="23" height="21.999889" @@ -67,7 +67,7 @@ rx="2.0000005" ry="1.9999999" /> <rect - style="display:inline;opacity:0.95;fill:#252a2f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164" width="22" height="20.999971" @@ -78,7 +78,7 @@ <g transform="translate(-425.99995,658.36226)" id="g4271" - style="display:inline;opacity:0.75"> + style="display:inline;opacity:0.65"> <rect ry="8" rx="8" diff --git a/common/cinnamon/common-assets/panel/panel-bottom.svg b/common/cinnamon/common-assets/panel/panel-bottom.svg index 2e83f1d..b5635bc 100644 --- a/common/cinnamon/common-assets/panel/panel-bottom.svg +++ b/common/cinnamon/common-assets/panel/panel-bottom.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="14.729596" - inkscape:cy="13.682625" + inkscape:zoom="22.627416" + inkscape:cx="3.5273194" + inkscape:cy="2.920327" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -48,7 +48,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> @@ -57,19 +57,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1025.3622)"> - <rect - style="display:inline;opacity:0.95;fill:#24282c;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" - id="rect4713" - width="27" - height="26" - x="0" - y="1026.3622" /> - <rect - style="display:inline;opacity:0.8;fill:#000000;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" - id="rect4713-4" - width="27" - height="1" - x="0" - y="1025.3622" /> + <g + id="g4136" + transform="matrix(1,0,0,-1,0,2077.7244)"> + <rect + y="1025.3622" + x="0" + height="26" + width="27" + id="rect4713" + style="display:inline;opacity:0.95;fill:#252a35;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" /> + <rect + y="1051.3622" + x="0" + height="1" + width="27" + id="rect4713-4" + style="display:inline;opacity:0.85;fill:#0f1116;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" /> + </g> </g> </svg> diff --git a/common/cinnamon/common-assets/panel/panel-top.svg b/common/cinnamon/common-assets/panel/panel-top.svg index 106ffac..c0a64da 100644 --- a/common/cinnamon/common-assets/panel/panel-top.svg +++ b/common/cinnamon/common-assets/panel/panel-top.svg @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="17.27365" - inkscape:cy="5.4834765" + inkscape:zoom="22.627416" + inkscape:cx="11.460174" + inkscape:cy="2.920327" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -48,7 +48,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> @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> <rect - style="display:inline;opacity:0.95;fill:#24282c;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.95;fill:#252a35;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" id="rect4713" width="27" height="26" x="0" y="1025.3622" /> <rect - style="display:inline;opacity:0.8;fill:#000000;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:#0f1116;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" id="rect4713-4" width="27" height="1" diff --git a/common/cinnamon/sass/_colors.scss b/common/cinnamon/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/cinnamon/sass/_colors.scss +++ b/common/cinnamon/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $fg_color: if($variant =='light', #5c616c, #D3DAE3); $selected_fg_color: #ffffff; $selected_bg_color: #5294E2; $selected_borders_color: darken($selected_bg_color, 20%); -$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $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%)); - -$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); - -$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); -$button_border: $entry_border; - $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(#2f343b, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } +@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; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); -$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); +$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); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $osd_insensitive_bg_color: darken($osd_bg_color, 3%); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); $osd_borders_color: transparentize(black, 0.3); -$panel_bg: darken($osd_bg_color, 4.7%); -$panel_fg: $osd_fg_color; +$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%)); + +$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)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); +$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_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // Minimize, Maximize -$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); -$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $wm_button_active_bg: $selected_bg_color; -$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); -$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); -$wm_button_hover_border: $selected_bg_color; -$wm_button_active_border: $selected_bg_color; +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$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_active_bg: $selected_fg_color; diff --git a/common/cinnamon/sass/_drawing.scss b/common/cinnamon/sass/_drawing.scss index 03b9f15..738a69d 100644 --- a/common/cinnamon/sass/_drawing.scss +++ b/common/cinnamon/sass/_drawing.scss @@ -15,42 +15,47 @@ // Entries drawing function // //@extend %reset_style; - box-shadow: inset 0 0 transparentize($base_color, 1); @if $t==normal { color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==insensitive { color: $insensitive_fg_color; background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95); } @if $t==osd { color: $osd_fg_color; - background-color: transparentize(black, 0.8); - border: 1px solid transparentize(black, 0.6); + background-color: $osd_entry_bg; + border: 1px solid $osd_entry_border; + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { - color: $osd_fg_color; - background-color: transparentize(black, 0.8); + color: $selected_fg_color; + background-color: $selected_bg_color; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { - color: $osd_insensitive_fg_color; - background-color: transparentize(black, 0.9); - border-color: 1px solid transparentize(black, 0.6); + color: transparentize($osd_fg_color, 0.45); + background-color: transparentize($osd_entry_bg, 0.15); + border: 1px solid $osd_entry_border; + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -63,7 +68,6 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 transparentize($base_color, 1); @if $t==normal { // @@ -72,6 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -81,15 +86,17 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus-hover { // // focused button // - color: $selected_bg_color; + color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -97,8 +104,9 @@ // hovered button // color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + background-color: lighten($button_bg, 5%); + border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -108,6 +116,7 @@ color: $selected_fg_color; background-color: $selected_bg_color; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px $selected_bg_color; } @else if $t==insensitive { @@ -117,6 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -124,8 +134,8 @@ // normal osd button // color: $osd_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -133,8 +143,8 @@ // active osd button // color: $osd_fg_color; - border: 1px solid $selected_bg_color; - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -151,7 +161,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border: 1px solid $osd_button_border; + background-color: transparentize($osd_button_bg, 0.15); } } |