From f15728540a8a8fd29cc1a4843862d6b1bd9a7044 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 6 Jul 2015 18:20:03 +0200 Subject: some tweaks --- common/gtk-3.0/3.16/_common.scss | 12 ++++---- common/gtk-3.0/3.16/assets.svg | 32 ++++++++++----------- .../assets/titlebutton-close-backdrop-darker.png | Bin 678 -> 682 bytes .../assets/titlebutton-close-backdrop-darker@2.png | Bin 1425 -> 1457 bytes .../3.16/assets/titlebutton-close-backdrop.png | Bin 722 -> 735 bytes .../3.16/assets/titlebutton-close-backdrop@2.png | Bin 1477 -> 1487 bytes .../assets/titlebutton-max-backdrop-darker.png | Bin 632 -> 647 bytes .../assets/titlebutton-max-backdrop-darker@2.png | Bin 1218 -> 1250 bytes .../3.16/assets/titlebutton-max-backdrop.png | Bin 686 -> 690 bytes .../3.16/assets/titlebutton-max-backdrop@2.png | Bin 1327 -> 1324 bytes .../gtk-3.0/3.16/assets/titlebutton-max-darker.png | Bin 639 -> 648 bytes .../3.16/assets/titlebutton-max-darker@2.png | Bin 1228 -> 1242 bytes .../3.16/assets/titlebutton-max-hover-darker.png | Bin 668 -> 688 bytes .../3.16/assets/titlebutton-max-hover-darker@2.png | Bin 1337 -> 1347 bytes .../gtk-3.0/3.16/assets/titlebutton-max-hover.png | Bin 684 -> 691 bytes .../3.16/assets/titlebutton-max-hover@2.png | Bin 1316 -> 1319 bytes common/gtk-3.0/3.16/assets/titlebutton-max.png | Bin 689 -> 682 bytes common/gtk-3.0/3.16/assets/titlebutton-max@2.png | Bin 1320 -> 1326 bytes .../assets/titlebutton-min-backdrop-darker.png | Bin 547 -> 547 bytes .../assets/titlebutton-min-backdrop-darker@2.png | Bin 1086 -> 1088 bytes .../3.16/assets/titlebutton-min-backdrop.png | Bin 599 -> 598 bytes .../3.16/assets/titlebutton-min-backdrop@2.png | Bin 1178 -> 1180 bytes .../gtk-3.0/3.16/assets/titlebutton-min-darker.png | Bin 554 -> 554 bytes .../3.16/assets/titlebutton-min-darker@2.png | Bin 1080 -> 1077 bytes .../3.16/assets/titlebutton-min-hover-darker.png | Bin 568 -> 569 bytes .../3.16/assets/titlebutton-min-hover-darker@2.png | Bin 1198 -> 1195 bytes .../gtk-3.0/3.16/assets/titlebutton-min-hover.png | Bin 580 -> 580 bytes .../3.16/assets/titlebutton-min-hover@2.png | Bin 1174 -> 1175 bytes common/gtk-3.0/3.16/assets/titlebutton-min.png | Bin 579 -> 577 bytes common/gtk-3.0/3.16/assets/titlebutton-min@2.png | Bin 1188 -> 1184 bytes common/gtk-3.0/3.16/gtk-contained-dark.css | 2 +- common/gtk-3.0/3.16/gtk-contained-darker.css | 24 ++++++++-------- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 2 +- common/gtk-3.0/3.16/gtk-contained-solid.css | 18 ++++++------ common/gtk-3.0/3.16/gtk-contained.css | 18 ++++++------ 35 files changed, 54 insertions(+), 54 deletions(-) diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index c0a3fc3..8ed25e1 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -1630,7 +1630,7 @@ column-header.button.dnd { // for treeview-like derive widgets &.header { // FIXME: double borders in some case, can't fix it w/o a class tho // FIXME: doesn't work on dark var - background-color: $base_color; + background-color: mix($base_color, $bg_color, 50%); // this is the shading of the header behind the tabs &.frame { @@ -1701,8 +1701,8 @@ column-header.button.dnd { // for treeview-like derive widgets border-width: 1px; border-#{$_tab}-width: 0; border-color: $borders_color; - background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9)); - &:hover { background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9)); } + background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.9)); + &:hover { background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.9)); } } } } @@ -2683,13 +2683,13 @@ GtkVolumeButton.button { padding: 8px; } // see bug #722563 $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.35)); - box-shadow: 0 0 0 1px if($darker=='true', transparentize(black, 0.4), $_wm_border), 0 4px 8px 1px $_wm_border; + box-shadow: 0 0 0 1px if($darker=='true', darken($header_bg, 7%), $_wm_border), 0 4px 8px 1px $_wm_border; /* this is used for the resize cursor area */ margin: 10px; &:backdrop { - box-shadow: 0 0 0 1px if($darker=='true', transparentize(black, 0.4), $_wm_border), 0 4px 5px 2px $_wm_border; + box-shadow: 0 0 0 1px if($darker=='true', darken($header_bg, 7%), $_wm_border), 0 4px 5px 2px $_wm_border; } &.tiled { border-radius: 0; @@ -2697,7 +2697,7 @@ GtkVolumeButton.button { padding: 8px; } // server-side decorations as used by mutter &.ssd { border-radius: 4px 4px 0 0; - box-shadow: 0 0 0 1px if($darker=='true', transparentize(black, 0.4), $_wm_border); + box-shadow: 0 0 0 1px if($darker=='true', darken($header_bg, 7%), $_wm_border); &.maximized { border-radius: 0; } } diff --git a/common/gtk-3.0/3.16/assets.svg b/common/gtk-3.0/3.16/assets.svg index 7eb6e73..260da43 100644 --- a/common/gtk-3.0/3.16/assets.svg +++ b/common/gtk-3.0/3.16/assets.svg @@ -25,8 +25,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8284271" - inkscape:cx="210.11124" - inkscape:cy="175.74821" + inkscape:cx="95.047904" + inkscape:cy="225.08118" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -2266,7 +2266,7 @@ inkscape:connector-curvature="0" d="m 1373,254 0,2 6,0 0,-2 z" id="rect9057-4-3" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" sodipodi:nodetypes="ccccc" /> @@ -2863,7 +2863,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:0.8;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:0.99999999;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6" /> @@ -2947,7 +2947,7 @@ id="layer12-45-6"> @@ -3277,7 +3277,7 @@ inkscape:connector-curvature="0" d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z" id="path10839-9-2" - 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.5;fill:#525d76;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + 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.65;fill:#70788d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> @@ -3335,7 +3335,7 @@ @@ -3382,7 +3382,7 @@ inkscape:connector-curvature="0" d="m 1373,254 0,2 6,0 0,-2 z" id="rect9057-4" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.65;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" sodipodi:nodetypes="ccccc" /> @@ -6199,7 +6199,7 @@ sodipodi:nodetypes="csscccsscc" inkscape:connector-curvature="0" d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384" - style="opacity:0.8;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none" + style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none" id="path4293-6-7-1" /> @@ -6284,7 +6284,7 @@ id="layer12-45-6-2-7"> @@ -6617,7 +6617,7 @@ inkscape:connector-curvature="0" d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z" id="path10839-9-2-8-6" - 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:#afb8c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + 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.7;fill:#afb8c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> @@ -6675,7 +6675,7 @@ @@ -6722,7 +6722,7 @@ inkscape:connector-curvature="0" d="m 1373,254 0,2 6,0 0,-2 z" id="rect9057-4-09-2" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" sodipodi:nodetypes="ccccc" />