diff options
| author | Horst3180 | 2015-06-06 10:54:13 +0200 |
|---|---|---|
| committer | Horst3180 | 2015-06-06 10:54:13 +0200 |
| commit | 3b0d4c586ccac246aae773298ba3f3b13d213818 (patch) | |
| tree | 9b7eddb727d8b73518a6b7d30440abfd5270cf7b /common | |
| parent | eafa0fc568311f8fd08bbfd33e9e74f8c0d5cf26 (diff) | |
| parent | 945ab6c5da06cbe0e74901051df62d375d944c76 (diff) | |
| download | solarc-theme-3b0d4c586ccac246aae773298ba3f3b13d213818.tar.gz solarc-theme-3b0d4c586ccac246aae773298ba3f3b13d213818.tar.xz solarc-theme-3b0d4c586ccac246aae773298ba3f3b13d213818.zip | |
Merge branch 'master' into dark_variant
Diffstat (limited to 'common')
42 files changed, 699 insertions, 368 deletions
diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index 0f966a5..c20d97c 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -535,6 +535,28 @@ x="407" y="111" /> </clipPath> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath5131"> + <rect + style="opacity:1;fill:#272a30;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect5133" + width="13" + height="24" + x="10" + y="-279.63782" /> + </clipPath> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath5158"> + <rect + style="opacity:1;fill:#272a30;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect5160" + width="13" + height="24" + x="31" + y="-279.63782" /> + </clipPath> </defs> <sodipodi:namedview id="base" @@ -543,12 +565,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2" - inkscape:cx="111.23391" - inkscape:cy="224.58499" + inkscape:zoom="11.313708" + inkscape:cx="478.52624" + inkscape:cy="293.00874" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" showborder="false" inkscape:window-width="1366" inkscape:window-height="720" @@ -750,7 +772,7 @@ </g> <g style="display:inline" - transform="translate(203,-1319)" + transform="translate(214,-1319)" id="menu-checkbox-unchecked" inkscape:label="Ebene 1"> <g @@ -802,7 +824,7 @@ </g> <g style="display:inline;opacity:0.55" - transform="translate(218,-1319)" + transform="translate(229,-1319)" id="menu-checkbox-unchecked-insensitive" inkscape:label="Ebene 1"> <g @@ -812,8 +834,7 @@ transform="translate(-19,1036.9872)"> <g id="sdsd-3-0" - inkscape:label="#g21853" - style=""> + inkscape:label="#g21853"> <path sodipodi:nodetypes="ssssssssssssssssss" inkscape:connector-curvature="0" @@ -823,8 +844,7 @@ <g transform="translate(0,-30)" inkscape:label="#g14325" - id="scdsdcd-1-9" - style=""> + id="scdsdcd-1-9"> <g transform="matrix(0.92951982,0,0,0.92914368,-156.75069,-212.9618)" id="g15812-6-6-1-0-0" @@ -834,13 +854,11 @@ id="g5489-2-9-6-8-8-0-1" transform="matrix(0.5089163,0,0,0.51739823,161.7932,197.56426)"> <g - id="g5428-8-1-4-0-0-5-9" - style="" /> + id="g5428-8-1-4-0-0-5-9" /> </g> </g> <g - id="g5400-0-5" - style=""> + id="g5400-0-5"> <rect transform="translate(-2.0348579e-6,4.7858158e-6)" rx="1" @@ -857,7 +875,7 @@ </g> </g> <g - transform="translate(197.37869,-282.08594)" + transform="translate(208.37869,-282.08594)" style="display:inline;opacity:1" id="menu-checkbox-checked" inkscape:label="#g10758"> @@ -950,7 +968,7 @@ </g> </g> <g - transform="translate(104,-267.00013)" + transform="translate(115,-267.00013)" style="display:inline;opacity:1" id="menu-radio-unchecked" inkscape:label="#g10975"> @@ -991,7 +1009,7 @@ </g> </g> <g - transform="translate(117,-267.00012)" + transform="translate(128,-267.00012)" style="display:inline;opacity:1" id="menu-radio-checked" inkscape:label="#g11094"> @@ -1041,7 +1059,7 @@ ry="2.5" /> </g> <g - transform="translate(212.99999,-282.00013)" + transform="translate(223.99999,-282.00013)" style="display:inline;opacity:0.55" id="menu-checkbox-checked-insensitive" inkscape:label="#g10758"> @@ -1052,13 +1070,11 @@ transform="translate(19,0)"> <g id="sdsd-7-5-5" - inkscape:label="#g21853" - style=""> + inkscape:label="#g21853"> <g transform="translate(0,-30)" inkscape:label="#g14325" - id="scdsdcd-5-1-7" - style=""> + id="scdsdcd-5-1-7"> <g transform="matrix(0.92951982,0,0,0.92914368,-156.75069,-212.9618)" id="g15812-6-6-1-5-1-5" @@ -1068,13 +1084,11 @@ id="g5489-2-9-6-8-8-53-16-8" transform="matrix(0.5089163,0,0,0.51739823,161.7932,197.56426)"> <g - id="g5428-8-1-4-0-0-4-1-8" - style="" /> + id="g5428-8-1-4-0-0-4-1-8" /> </g> </g> <g - id="g5400-6-7-5" - style=""> + id="g5400-6-7-5"> <rect rx="1.9999943" y="32.362202" @@ -1099,12 +1113,10 @@ style="opacity:0.85;fill:#1a1a1a;fill-opacity:1" /> <g id="g4049-2-3-9" - transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)" - style=""> + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)"> <g id="g4056-7-07-7" - transform="translate(12.374375,11.531233)" - style=""> + transform="translate(12.374375,11.531233)"> <g id="g3981-0-3-4" transform="translate(-3,-4.9999826)" @@ -1128,7 +1140,7 @@ </g> </g> <g - transform="matrix(0.92826431,0,0,0.92857155,142.39707,-265.90282)" + transform="matrix(0.92826431,0,0,0.92857155,153.39707,-265.90282)" style="display:inline;opacity:0.55" id="menu-radio-checked-insensitive" inkscape:label="#g11094"> @@ -1138,23 +1150,20 @@ id="radio-unchecked-2-8-1" style="display:inline"> <g - id="g10964-6-4-9" - style=""> + id="g10964-6-4-9"> <g inkscape:label="#g15805" transform="matrix(0.93617253,0,0,0.93566004,-96.78315,-244.76084)" id="radio-unchecked2-0-6-2" style="display:inline"> <g - id="g7025-09-1-7" - style=""> + id="g7025-09-1-7"> <g transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)" id="g5489-2-9-3-2-71-0" style="display:inline"> <g - id="g5428-8-1-7-5-8-1" - style=""> + id="g5428-8-1-7-5-8-1"> <rect rx="14.692498" y="126.56255" @@ -1181,7 +1190,7 @@ ry="2.6923075" /> </g> <g - transform="translate(119,-267.00013)" + transform="translate(130,-267.00013)" style="display:inline;opacity:0.55" id="menu-radio-unchecked-insensitive" inkscape:label="#g10975"> @@ -1192,23 +1201,20 @@ style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" sodipodi:nodetypes="ssssssssss" /> <g - id="g10964-66-0" - style=""> + id="g10964-66-0"> <g style="display:inline" id="radio-unchecked2-8-4" transform="matrix(0.93617253,0,0,0.93566004,-96.78315,-244.76084)" inkscape:label="#g15805"> <g - id="g7025-1-8" - style=""> + id="g7025-1-8"> <g style="display:inline" id="g5489-2-9-3-9-2" transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)"> <g - id="g5428-8-1-7-6-8" - style=""> + id="g5428-8-1-7-6-8"> <rect ry="13.246163" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" @@ -1225,7 +1231,7 @@ </g> </g> <g - transform="translate(254,-282.00012)" + transform="translate(265,-282.00012)" style="display:inline;opacity:1" id="checkbox-unchecked" inkscape:label="#g22047"> @@ -1276,7 +1282,7 @@ </g> </g> <g - transform="translate(267,-282.00013)" + transform="translate(278,-282.00013)" style="display:inline;opacity:1" id="checkbox-checked" inkscape:label="#g10758"> @@ -1376,7 +1382,7 @@ </g> </g> <g - transform="translate(174.00426,-266.00013)" + transform="translate(185.00426,-266.00013)" style="display:inline;opacity:1" id="radio-unchecked" inkscape:label="#g10975"> @@ -1423,7 +1429,7 @@ </g> </g> <g - transform="translate(187,-266.00013)" + transform="translate(198,-266.00013)" style="display:inline;opacity:1" id="radio-checked" inkscape:label="#g11094"> @@ -1480,14 +1486,13 @@ ry="2" /> </g> <g - transform="translate(270,-282.00012)" + transform="translate(281,-282.00012)" style="display:inline;opacity:0.55" id="checkbox-unchecked-insensitive" inkscape:label="#g22047"> <g inkscape:label="#g21853" - id="sdsd-6-1" - style=""> + id="sdsd-6-1"> <path inkscape:connector-curvature="0" style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" @@ -1496,8 +1501,7 @@ <g id="scdsdcd-9-8" inkscape:label="#g14325" - transform="translate(0,-30)" - style=""> + transform="translate(0,-30)"> <g style="display:inline" id="g15812-6-6-1-1-4" @@ -1507,8 +1511,7 @@ id="g5489-2-9-6-8-8-7-8" style="display:inline"> <g - id="g5428-8-1-4-0-0-0-6" - style="" /> + id="g5428-8-1-4-0-0-0-6" /> </g> </g> <rect @@ -1519,8 +1522,7 @@ id="rect13523-9-4" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> <g - id="g5400-7-2" - style=""> + id="g5400-7-2"> <rect ry="1" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" @@ -1535,7 +1537,7 @@ </g> </g> <g - transform="translate(283,-282.00013)" + transform="translate(294,-282.00013)" style="display:inline;opacity:0.55" id="checkbox-checked-insensitive" inkscape:label="#g10758"> @@ -1546,13 +1548,11 @@ transform="translate(19,0)"> <g id="sdsd-7-5-4-3" - inkscape:label="#g21853" - style=""> + inkscape:label="#g21853"> <g transform="translate(0,-30)" inkscape:label="#g14325" - id="scdsdcd-5-1-0-5" - style=""> + id="scdsdcd-5-1-0-5"> <g transform="matrix(0.92951982,0,0,0.92914368,-156.75069,-212.9618)" id="g15812-6-6-1-5-1-7-1" @@ -1562,8 +1562,7 @@ id="g5489-2-9-6-8-8-53-16-3-9" transform="matrix(0.5089163,0,0,0.51739823,161.7932,197.56426)"> <g - id="g5428-8-1-4-0-0-4-1-2-7" - style="" /> + id="g5428-8-1-4-0-0-4-1-2-7" /> </g> </g> <rect @@ -1574,8 +1573,7 @@ x="17" y="30.362183" /> <g - id="g5400-6-7-8-7" - style=""> + id="g5400-6-7-8-7"> <rect rx="1.9999943" y="31.362196" @@ -1600,12 +1598,10 @@ style="opacity:0.85;fill:#1a1a1a;fill-opacity:1" /> <g id="g4049-2-3-6-5" - transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)" - style=""> + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,727.94436,295.31123)"> <g id="g4056-7-07-3-8" - transform="translate(12.374375,11.531233)" - style=""> + transform="translate(12.374375,11.531233)"> <g id="g3981-0-3-0-5" transform="translate(-3,-4.9999826)" @@ -1630,7 +1626,7 @@ </g> </g> <g - transform="translate(190.00426,-266.00013)" + transform="translate(201.00426,-266.00013)" style="display:inline;opacity:0.55" id="radio-unchecked-insensitive" inkscape:label="#g10975"> @@ -1640,8 +1636,7 @@ d="m 98,8.3621828 c 0,3.8659902 3.13401,7.0000002 7,7.0000002 3.86599,0 7,-3.13401 7,-7.0000002 0,-3.86599 -3.13401,-7 -7,-7 -3.86599,0 -7,3.13401 -7,7 z m 1,0 c 0,-3.324 2.676,-6 6,-6 3.324,0 6,2.676 6,6 0,3.3240002 -2.676,6.0000002 -6,6.0000002 -3.324,0 -6,-2.676 -6,-6.0000002 z" style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <g - id="g10964-62-9" - style=""> + id="g10964-62-9"> <g style="display:inline" id="radio-unchecked2-8-1-4" @@ -1655,15 +1650,13 @@ x="206.99057" y="261.97873" /> <g - id="g7025-6-0" - style=""> + id="g7025-6-0"> <g style="display:inline" id="g5489-2-9-3-77-9" transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)"> <g - id="g5428-8-1-7-58-8" - style=""> + id="g5428-8-1-7-58-8"> <rect ry="13.246163" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" @@ -1680,7 +1673,7 @@ </g> </g> <g - transform="translate(203,-266.00013)" + transform="translate(214,-266.00013)" style="display:inline;opacity:0.55" id="radio-checked-insensitive" inkscape:label="#g11094"> @@ -1690,8 +1683,7 @@ id="radio-unchecked-2-8-9-6" style="display:inline"> <g - id="g10964-6-4-7-3" - style=""> + id="g10964-6-4-7-3"> <g inkscape:label="#g15805" transform="matrix(0.93617253,0,0,0.93566004,-96.78315,-244.76084)" @@ -1705,15 +1697,13 @@ id="rect14348-4-8-9-5" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> <g - id="g7025-09-1-6-4" - style=""> + id="g7025-09-1-6-4"> <g transform="matrix(0.5089163,0,0,0.51739823,181.7932,197.56426)" id="g5489-2-9-3-2-71-7-7" style="display:inline"> <g - id="g5428-8-1-7-5-8-3-8" - style=""> + id="g5428-8-1-7-5-8-3-8"> <rect rx="14.692498" y="126.56255" @@ -1746,7 +1736,7 @@ id="sjhgfjsgf-2" /> <g style="display:inline" - id="entry" + id="entry-border-bg-solid" inkscape:label="#g9335" transform="translate(-1,61.999998)"> <rect @@ -1779,7 +1769,7 @@ </g> <g style="display:inline" - id="entry-focus" + id="entry-border-active-bg-solid" inkscape:label="#g9350" transform="translate(-1,61.999998)"> <rect @@ -1812,7 +1802,7 @@ </g> <g style="display:inline" - id="entry-insensitive" + id="entry-border-disabled-bg" inkscape:label="#g9365" transform="translate(-1,61.999998)"> <g @@ -1849,24 +1839,13 @@ <g transform="translate(-1,93.999999)" style="display:inline" - id="entry-notebook" + id="notebook-entry-border-bg" inkscape:label="#g9335"> - <rect - y="-279.63782" - x="-3" - height="23.999998" - width="26" - id="rect9321-6" - style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="11" - y="-278.63782" - x="-1" - height="21.999998" - width="22" - id="rect7903-652" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" - ry="10.999999" /> + <path + style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 3 98 L 3 122 L 29 122 L 29 98 L 3 98 z M 16 99 C 22.094 99 27 103.906 27 110 C 27 116.094 22.094 121 16 121 C 9.906 121 5 116.094 5 110 C 5 103.906 9.906 99 16 99 z " + transform="translate(-6,-377.63782)" + id="rect9321-6" /> <rect rx="11.5" inkscape:transform-center-y="0.42353254" @@ -1882,24 +1861,13 @@ <g transform="translate(-1,93.999999)" style="display:inline" - id="entry-focus-notebook" + id="notebook-entry-border-active-bg" inkscape:label="#g9350"> - <rect - y="-279.63782" - x="31" - height="23.999998" - width="26" - id="rect9321-0-0" - style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="10.999999" - rx="11" - y="-278.63782" - x="33" - height="21.999998" - width="22" - id="rect7903-2-5" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + <path + style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 37 98 L 37 122 L 63 122 L 63 98 L 37 98 z M 50 99 C 56.094 99 61 103.906 61 110 C 61 116.094 56.094 121 50 121 C 43.906 121 39 116.094 39 110 C 39 103.906 43.906 99 50 99 z " + transform="translate(-6,-377.63782)" + id="rect9321-0-0" /> <rect ry="11.5" rx="11.5" @@ -1915,7 +1883,7 @@ <g transform="translate(-1,93.999999)" style="display:inline" - id="entry-insensitive-notebook" + id="notebook-entry-border-disabled-bg" inkscape:label="#g9365"> <g id="g4303-7"> @@ -1953,8 +1921,8 @@ id="entry-border-fill" width="5" height="24.000002" - x="99.000031" - y="-217.63776" + x="100.50003" + y="-246.88776" inkscape:label="#rect4361" /> <g style="display:inline" @@ -1962,22 +1930,11 @@ inkscape:label="#g9335" transform="translate(-1,169)" clip-path="url(#clipPath4466)"> - <rect - y="-279.63782" - x="-3" - height="23.999998" - width="26" - id="rect9321-4" - style="opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="1" - y="-278.63782" - x="-1" - height="21.999998" - width="22" - id="rect7903-5" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" - ry="1" /> + <path + style="opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 3 173 L 3 197 L 29 197 L 29 173 L 3 173 z M 6 174 L 26 174 C 26.554 174 27 174.446 27 175 L 27 195 C 27 195.554 26.554 196 26 196 L 6 196 C 5.446 196 5 195.554 5 195 L 5 175 C 5 174.446 5.446 174 6 174 z " + transform="translate(-6,-452.63782)" + id="rect9321-4" /> <rect rx="2" inkscape:transform-center-y="0.42353254" @@ -1996,22 +1953,11 @@ inkscape:label="#g9350" transform="translate(-10,169)" clip-path="url(#clipPath4470)"> - <rect - y="-279.63782" - x="31" - height="23.999998" - width="26" - id="rect9321-0-5" - style="display:inline;opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="1" - rx="1" - y="-278.63782" - x="33" - height="21.999998" - width="22" - id="rect7903-2-4" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + <path + style="display:inline;opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 28 173 L 28 197 L 54 197 L 54 173 L 28 173 z M 31 174 L 51 174 C 51.554 174 52 174.446 52 175 L 52 195 C 52 195.554 51.554 196 51 196 L 31 196 C 30.446 196 30 195.554 30 195 L 30 175 C 30 174.446 30.446 174 31 174 z " + transform="translate(3,-452.63782)" + id="rect9321-0-5" /> <rect ry="2" rx="2" @@ -2067,22 +2013,11 @@ inkscape:label="#g9335" clip-path="url(#clipPath4466-9)" transform="translate(-1,199)"> - <rect - y="-279.63782" - x="-3" - height="24" - width="26" - id="rect9321-4-9" - style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="1" - y="-278.63782" - x="-1" - height="21.999998" - width="22" - id="rect7903-5-6" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" - ry="1" /> + <path + style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 3 203 L 3 227 L 29 227 L 29 203 L 3 203 z M 6 204 L 26 204 C 26.554 204 27 204.446 27 205 L 27 225 C 27 225.554 26.554 226 26 226 L 6 226 C 5.446 226 5 225.554 5 225 L 5 205 C 5 204.446 5.446 204 6 204 z " + transform="translate(-6,-482.63782)" + id="rect9321-4-9" /> <rect rx="2" inkscape:transform-center-y="0.42353254" @@ -2101,22 +2036,11 @@ inkscape:label="#g9350" clip-path="url(#clipPath4470-7)" transform="translate(-10,199)"> - <rect - y="-279.63782" - x="31" - height="23.999998" - width="26" - id="rect9321-0-5-3" - style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="1" - rx="1" - y="-278.63782" - x="33" - height="21.999998" - width="22" - id="rect7903-2-4-1" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + <path + style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 28 203 L 28 227 L 54 227 L 54 203 L 28 203 z M 31 204 L 51 204 C 51.554 204 52 204.446 52 205 L 52 225 C 52 225.554 51.554 226 51 226 L 31 226 C 30.446 226 30 225.554 30 225 L 30 205 C 30 204.446 30.446 204 31 204 z " + transform="translate(3,-482.63782)" + id="rect9321-0-5-3" /> <rect ry="2" rx="2" @@ -2314,22 +2238,11 @@ inkscape:label="#g9335" clip-path="url(#clipPath4466-1)" transform="matrix(-1,0,0,1,146,169)"> - <rect - y="-279.63782" - x="-3" - height="23.999998" - width="26" - id="rect9321-4-5" - style="opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="1" - y="-278.63782" - x="-1" - height="21.999998" - width="22" - id="rect7903-5-7" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" - ry="1" /> + <path + style="opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 130 173 L 130 197 L 156 197 L 156 173 L 130 173 z M 133 174 L 153 174 C 153.554 174 154 174.446 154 175 L 154 195 C 154 195.554 153.554 196 153 196 L 133 196 C 132.446 196 132 195.554 132 195 L 132 175 C 132 174.446 132.446 174 133 174 z " + transform="matrix(-1,0,0,1,153,-452.63782)" + id="rect9321-4-5" /> <rect rx="2" inkscape:transform-center-y="0.42353254" @@ -2348,22 +2261,11 @@ inkscape:label="#g9350" transform="matrix(-1,0,0,1,155,169)" clip-path="url(#clipPath4470-6)"> - <rect - y="-279.63782" - x="31" - height="23.999998" - width="26" - id="rect9321-0-5-4" - style="display:inline;opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="1" - rx="1" - y="-278.63782" - x="33" - height="21.999998" - width="22" - id="rect7903-2-4-5" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + <path + style="display:inline;opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 105 173 L 105 197 L 131 197 L 131 173 L 105 173 z M 108 174 L 128 174 C 128.554 174 129 174.446 129 175 L 129 195 C 129 195.554 128.554 196 128 196 L 108 196 C 107.446 196 107 195.554 107 195 L 107 175 C 107 174.446 107.446 174 108 174 z " + transform="matrix(-1,0,0,1,162,-452.63782)" + id="rect9321-0-5-4" /> <rect ry="2" rx="2" @@ -2419,22 +2321,11 @@ inkscape:label="#g9335" clip-path="url(#clipPath4466-9-0)" transform="matrix(-1,0,0,1,146,199)"> - <rect - y="-279.63782" - x="-3" - height="23.999998" - width="26" - id="rect9321-4-9-9" - style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="1" - y="-278.63782" - x="-1" - height="21.999998" - width="22" - id="rect7903-5-6-6" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" - ry="1" /> + <path + style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 130 203 L 130 227 L 156 227 L 156 203 L 130 203 z M 133 204 L 153 204 C 153.554 204 154 204.446 154 205 L 154 225 C 154 225.554 153.554 226 153 226 L 133 226 C 132.446 226 132 225.554 132 225 L 132 205 C 132 204.446 132.446 204 133 204 z " + transform="matrix(-1,0,0,1,153,-482.63782)" + id="rect9321-4-9-9" /> <rect rx="2" inkscape:transform-center-y="0.42353254" @@ -2453,22 +2344,11 @@ inkscape:label="#g9350" clip-path="url(#clipPath4470-7-0)" transform="matrix(-1,0,0,1,155,199)"> - <rect - y="-279.63782" - x="31" - height="23.999998" - width="26" - id="rect9321-0-5-3-7" - style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - ry="1" - rx="1" - y="-278.63782" - x="33" - height="21.999998" - width="22" - id="rect7903-2-4-1-2" - style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + <path + style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 105 203 L 105 227 L 131 227 L 131 203 L 105 203 z M 108 204 L 128 204 C 128.554 204 129 204.446 129 205 L 129 225 C 129 225.554 128.554 226 128 226 L 108 226 C 107.446 226 107 225.554 107 225 L 107 205 C 107 204.446 107.446 204 108 204 z " + transform="matrix(-1,0,0,1,162,-482.63782)" + id="rect9321-0-5-3-7" /> <rect ry="2" rx="2" @@ -4316,7 +4196,7 @@ </g> <g id="minus" - transform="translate(-216,-108)" + transform="translate(-205,-108)" inkscape:label="#g5704"> <rect style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" @@ -4348,7 +4228,7 @@ </g> <g id="plus" - transform="translate(-216,-108)" + transform="translate(-205,-108)" inkscape:label="#g5698"> <rect style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" @@ -4390,7 +4270,7 @@ </g> <image y="-179.63782" - x="276" + x="287.00043" id="line-h" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsRAAALEQF/ZF+RAAAAB3RJTUUH3wECFwIHDe6ntQAAABVJREFUCNdjYIACxvv37/9nYGBg AAAXYQOeFmwcNwAAAABJRU5ErkJggg== " style="image-rendering:optimizeSpeed" @@ -4400,7 +4280,7 @@ inkscape:label="#image5739" /> <image y="-179.63782" - x="271.99997" + x="283.0004" id="line-v" xlink:href="data:image/png;base64,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 " style="image-rendering:optimizeSpeed" @@ -4410,7 +4290,7 @@ inkscape:label="#image5750" /> <image y="-179.63782" - x="268" + x="279.00043" id="menu_line_h" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsRAAALEQF/ZF+RAAAAB3RJTUUH3AcEFBQdwu2NkwAAABpJREFUCNdjfP369X8GBgYGFgYG BkYGBgYGADpPA8ceLzbjAAAAAElFTkSuQmCC " style="image-rendering:optimizeSpeed" @@ -4420,7 +4300,7 @@ inkscape:label="#image5761" /> <g id="menuitem" - transform="translate(-18,1.9999974)" + transform="translate(-7,1.9999974)" inkscape:label="#g5794"> <rect rx="0" @@ -4448,7 +4328,8 @@ </g> <g id="handle-v" - inkscape:label="#g6182"> + inkscape:label="#g6182" + transform="translate(11,0)"> <rect y="-189.63782" x="210" @@ -4479,7 +4360,7 @@ style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g - transform="matrix(0,1,-1,0,49.362183,-388.63782)" + transform="matrix(0,1,-1,0,60.362183,-388.63782)" style="display:inline" id="handle-h" inkscape:label="#g6182-9"> @@ -4517,26 +4398,26 @@ id="progressbar_v" width="30" height="8" - x="212" - y="201" + x="216.00018" + y="-82.637817" ry="4" rx="4" - transform="translate(-7,-283.63782)" inkscape:label="#rect5799" /> <rect style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="progressbar" width="30" height="8" - x="214" - y="-231" + x="-69.637817" + y="-235.00018" ry="4" rx="4" - transform="matrix(0,1,-1,0,-7,-283.63782)" + transform="matrix(0,1,-1,0,0,0)" inkscape:label="#rect5799-3" /> <g id="trough-progressbar_v" - inkscape:label="#g5052"> + inkscape:label="#g5052" + transform="translate(11,0)"> <rect ry="0" rx="0" @@ -4561,22 +4442,20 @@ <circle style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#5294e2;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="slider" - cx="224.5" - cy="263.5" + cx="228.50018" + cy="-20.137819" r="7" - transform="translate(-7,-283.63782)" inkscape:label="#path5834" /> <circle style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#5294e2;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="slider-prelight" - cx="243.5" - cy="263.5" + cx="247.50018" + cy="-20.137819" r="7" - transform="translate(-7,-283.63782)" inkscape:label="#path5834-3" /> <g id="slider-insensitive" - transform="translate(-7,-283.63782)" + transform="translate(4,-283.63782)" inkscape:label="#g5881"> <circle r="7" @@ -4593,7 +4472,7 @@ </g> <g id="trough-horizontal" - transform="translate(-5,-283.63782)" + transform="translate(6,-283.63782)" inkscape:label="#g5902"> <rect ry="0" @@ -4615,7 +4494,7 @@ style="opacity:1;fill:#cfd6e6;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g - transform="matrix(0,1,-1,0,498,-200.63782)" + transform="matrix(0,1,-1,0,509,-200.63782)" id="trough-vertical" inkscape:label="#g5902-6"> <rect @@ -4639,7 +4518,7 @@ </g> <g id="slider-horiz" - transform="translate(-20,-223.63782)" + transform="translate(-9,-223.63782)" inkscape:label="#g5902-0"> <rect ry="0" @@ -4662,7 +4541,7 @@ </g> <g id="slider-horiz-active" - transform="translate(-20,-212.63782)" + transform="translate(-9,-212.63782)" inkscape:label="#g5902-0-6"> <rect ry="0" @@ -4685,7 +4564,7 @@ </g> <g id="slider-horiz-insens" - transform="translate(-20,-201.63782)" + transform="translate(-9,-201.63782)" inkscape:label="#g5902-0-0"> <rect ry="0" @@ -4708,7 +4587,7 @@ </g> <g id="slider-horiz-prelight" - transform="translate(-20,-190.63782)" + transform="translate(-9,-190.63782)" inkscape:label="#g5902-0-1"> <rect ry="0" @@ -4731,7 +4610,7 @@ </g> <g id="slider-vert" - transform="matrix(0,1,-1,0,511,-150.63782)" + transform="matrix(0,1,-1,0,522,-150.63782)" inkscape:label="#g5902-0-14"> <rect ry="0" @@ -4754,7 +4633,7 @@ </g> <g id="slider-vert-active" - transform="matrix(0,1,-1,0,522,-150.63782)" + transform="matrix(0,1,-1,0,533,-150.63782)" inkscape:label="#g5902-0-6-4"> <rect ry="0" @@ -4777,7 +4656,7 @@ </g> <g id="slider-vert-insens" - transform="matrix(0,1,-1,0,533,-150.63782)" + transform="matrix(0,1,-1,0,544,-150.63782)" inkscape:label="#g5902-0-0-7"> <rect ry="0" @@ -4800,7 +4679,7 @@ </g> <g id="slider-vert-prelight" - transform="matrix(0,1,-1,0,544,-150.63782)" + transform="matrix(0,1,-1,0,555,-150.63782)" inkscape:label="#g5902-0-1-1"> <rect ry="0" @@ -4826,23 +4705,21 @@ id="trough-scrollbar" width="15" height="15" - x="237" - y="376" + x="241.00018" + y="92.362183" rx="0" ry="0" - transform="translate(-7,-283.63782)" inkscape:label="#rect6037" /> <rect style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:#dde3e9;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="notebook" width="9" height="9" - x="394.5" - y="6.5" - transform="translate(-7,-283.63782)" + x="398.50043" + y="-277.13782" inkscape:label="#rect6042" /> <g - transform="translate(405,-1300)" + transform="translate(416,-1300)" id="tab-top-active" inkscape:label="Ebene 1" clip-path="url(#clipPath6057)"> @@ -4868,7 +4745,7 @@ rx="1" /> </g> <g - transform="matrix(0,1,-1,0,1492.3622,-277.63782)" + transform="matrix(0,1,-1,0,1503.3622,-277.63782)" id="tab-right-active" inkscape:label="Ebene 1" clip-path="url(#clipPath6057-7)"> @@ -4894,7 +4771,7 @@ rx="1" /> </g> <g - transform="matrix(1,0,0,-1,405,808.72438)" + transform="matrix(1,0,0,-1,416,808.72438)" id="tab-bottom-active" inkscape:label="Ebene 1" clip-path="url(#clipPath6057-4)"> @@ -4920,7 +4797,7 @@ rx="1" /> </g> <g - transform="matrix(0,-1,1,0,-582.3622,-213.63782)" + transform="matrix(0,-1,1,0,-571.3622,-213.63782)" id="tab-left-active" inkscape:label="Ebene 1" clip-path="url(#clipPath6057-9)"> @@ -4947,7 +4824,7 @@ </g> <g id="notebook-gap-horiz" - transform="translate(-7,-283.63782)" + transform="translate(4,-283.63782)" inkscape:label="#g6133"> <rect y="19" @@ -4965,7 +4842,7 @@ style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g - transform="matrix(0,1,-1,0,413,-659.63782)" + transform="matrix(0,1,-1,0,424,-659.63782)" id="notebook-gap-vert" inkscape:label="#g6133-5"> <rect @@ -4991,11 +4868,11 @@ x="407.5" y="109.5" clip-path="url(#clipPath6162)" - transform="translate(-7,-283.63782)" + transform="translate(4,-283.63782)" inkscape:label="#rect6158" /> <g id="toolbar" - transform="translate(-7,-283.63782)" + transform="translate(4,-283.63782)" inkscape:label="#g6170"> <rect y="111" @@ -5003,18 +4880,19 @@ height="32" width="24" id="rect6166" - style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <rect y="142" x="437" height="1" width="24" id="rect6168" - style="opacity:1;fill:#d7d8dd;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#dde3e9;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g id="tree_header" - inkscape:label="#g6293"> + inkscape:label="#g6293" + transform="translate(11,0)"> <rect y="-87.637817" x="410" @@ -5035,12 +4913,12 @@ id="null" width="15" height="14.999997" - x="430" + x="441.00043" y="-87.637817" inkscape:label="#rect6297" /> <image y="-39.637821" - x="410" + x="421.00043" id="frame" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wECFwQljtRB1wAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIEdJTVBkLmUHAAAAKklEQVQY02O8f//+fwYiAAsDAwODgoICXkUPHjxgYGIgEoxM hSywcCIEABzqCVThoNl8AAAAAElFTkSuQmCC " style="image-rendering:optimizeSpeed" @@ -5050,7 +4928,7 @@ inkscape:label="#image6307" /> <image y="-37.637821" - x="425" + x="436.00043" id="frame-gap-end" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAYAAAD0In+KAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wECFwUBq8yURwAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIEdJTVBkLmUHAAAAEklEQVQI12O8f//+/5+/fjoCACBdBssq+XOrAAAAAElFTkSu QmCC " style="image-rendering:optimizeSpeed" @@ -5060,7 +4938,7 @@ inkscape:label="#image6318" /> <image y="-34.637821" - x="425" + x="436.00043" id="frame-gap-start" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAYAAAD0In+KAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wECFwUNonrYbAAAAB1pVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIEdJTVBkLmUHAAAAEUlEQVQI12O8cfOGAzsb+34AFAwDnr/nIb8AAAAASUVORK5C YII= " style="image-rendering:optimizeSpeed" @@ -5070,7 +4948,8 @@ inkscape:label="#image6329" /> <g id="menubar_button" - inkscape:label="#g5032"> + inkscape:label="#g5032" + transform="translate(11,0)"> <rect inkscape:label="#rect5007" y="-152.63782" @@ -5103,7 +4982,7 @@ style="display:inline;opacity:1;fill:#d8dae0;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g - transform="matrix(0,1,-1,0,177.36218,-309.63782)" + transform="matrix(0,1,-1,0,188.36218,-309.63782)" style="display:inline" id="trough-progressbar" inkscape:label="#g5052"> @@ -5131,14 +5010,240 @@ <g transform="translate(-1,126)" style="display:inline" - id="entry-toolbar" + id="toolbar-entry-border-bg" + inkscape:label="#g9335"> + <path + style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 3 130 L 3 154 L 29 154 L 29 130 L 3 130 z M 16 131 C 22.094 131 27 135.906 27 142 C 27 148.094 22.094 153 16 153 C 9.906 153 5 148.094 5 142 C 5 135.906 9.906 131 16 131 z " + transform="translate(-6,-409.63782)" + id="rect9321-6-7" /> + <rect + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="-1.5" + height="23" + width="23" + id="rect7903-7-1-6" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + ry="11.5" /> + </g> + <g + transform="translate(-1,126)" + style="display:inline" + id="toolbar-entry-border-active-bg" + inkscape:label="#g9350"> + <path + style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 37 130 L 37 154 L 63 154 L 63 130 L 37 130 z M 50 131 C 56.094 131 61 135.906 61 142 C 61 148.094 56.094 153 50 153 C 43.906 153 39 148.094 39 142 C 39 135.906 43.906 131 50 131 z " + transform="translate(-6,-409.63782)" + id="rect9321-0-0-1" /> + <rect + ry="11.5" + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="32.5" + height="23" + width="23" + id="rect7903-7-3-4-9" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + transform="translate(-1,126)" + style="display:inline" + id="toolbar-entry-border-disabled-bg" + inkscape:label="#g9365"> + <g + id="g4303-7-3"> + <rect + style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect9321-2-2-1" + width="26" + height="23.999998" + x="65" + y="-279.63782" /> + <rect + style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" + id="rect7903-6-5-6" + width="22" + height="21.999998" + x="67" + y="-278.63782" + rx="11" + ry="10.999999" /> + <rect + style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect7903-7-2-3-4" + width="23" + height="23" + x="66.5" + y="-279.13782" + inkscape:transform-center-x="-4.6588025" + inkscape:transform-center-y="0.42353254" + rx="11.5" + ry="11.5" /> + </g> + </g> + <g + style="display:inline" + id="entry-border-bg" + inkscape:label="#g9335" + transform="translate(106,61.999997)"> + <path + style="opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 123 67 C 129.094 67 134 71.906001 134 78 C 134 84.093999 129.094 89 123 89 C 116.906 89 112 84.093999 112 78 C 112 71.906001 116.906 67 123 67 z " + id="rect9321-3-7" + transform="translate(-113,-345.63782)" /> + <rect + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="-1.5" + height="23" + width="23" + id="rect7903-7-31-1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + ry="11.5" /> + </g> + <g + style="display:inline" + id="entry-border-active-bg" + inkscape:label="#g9350" + transform="translate(106,61.999997)"> + <path + style="display:inline;opacity:1;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 157 67 C 163.094 67 168 71.906001 168 78 C 168 84.093999 163.094 89 157 89 C 150.906 89 146 84.093999 146 78 C 146 71.906001 150.906 67 157 67 z " + id="rect9321-0-2-2" + transform="translate(-113,-345.63782)" /> + <rect + ry="11.5" + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="32.5" + height="23" + width="23" + id="rect7903-7-3-7-7" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + transform="translate(-126,104)" + style="display:inline" + id="entry-notebook-4" inkscape:label="#g9335"> <rect y="-279.63782" x="-3" height="23.999998" width="26" - id="rect9321-6-7" + id="rect9321-6-2" + style="opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + rx="11" + y="-278.63782" + x="-1" + height="21.999998" + width="22" + id="rect7903-652-1" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" + ry="10.999999" /> + <rect + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="-1.5" + height="23" + width="23" + id="rect7903-7-1-2" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + ry="11.5" /> + </g> + <g + transform="translate(-126,104)" + style="display:inline" + id="entry-focus-notebook-3" + inkscape:label="#g9350"> + <rect + y="-279.63782" + x="31" + height="23.999998" + width="26" + id="rect9321-0-0-5" + style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + ry="10.999999" + rx="11" + y="-278.63782" + x="33" + height="21.999998" + width="22" + id="rect7903-2-5-0" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> + <rect + ry="11.5" + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="32.5" + height="23" + width="23" + id="rect7903-7-3-4-0" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + transform="translate(-126,104)" + style="display:inline" + id="entry-insensitive-notebook-9" + inkscape:label="#g9365"> + <g + id="g4303-7-9"> + <rect + style="display:inline;opacity:1;fill:#fefefe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect9321-2-2-0" + width="26" + height="23.999998" + x="65" + y="-279.63782" /> + <rect + style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" + id="rect7903-6-5-4" + width="22" + height="21.999998" + x="67" + y="-278.63782" + rx="11" + ry="10.999999" /> + <rect + style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect7903-7-2-3-2" + width="23" + height="23" + x="66.5" + y="-279.13782" + inkscape:transform-center-x="-4.6588025" + inkscape:transform-center-y="0.42353254" + rx="11.5" + ry="11.5" /> + </g> + </g> + <g + transform="translate(-123,136)" + style="display:inline" + id="entry-toolbar-0" + inkscape:label="#g9335"> + <rect + y="-279.63782" + x="-3" + height="23.999998" + width="26" + id="rect9321-6-7-5" style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <rect rx="11" @@ -5146,7 +5251,7 @@ x="-1" height="21.999998" width="22" - id="rect7903-652-0" + id="rect7903-652-0-2" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" ry="10.999999" /> <rect @@ -5157,21 +5262,21 @@ x="-1.5" height="23" width="23" - id="rect7903-7-1-6" + id="rect7903-7-1-6-1" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ry="11.5" /> </g> <g - transform="translate(-1,126)" + transform="translate(-123,136)" style="display:inline" - id="entry-focus-toolbar" + id="entry-focus-toolbar-9" inkscape:label="#g9350"> <rect y="-279.63782" x="31" height="23.999998" width="26" - id="rect9321-0-0-1" + id="rect9321-0-0-1-0" style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <rect ry="10.999999" @@ -5180,7 +5285,7 @@ x="33" height="21.999998" width="22" - id="rect7903-2-5-5" + id="rect7903-2-5-5-8" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> <rect ry="11.5" @@ -5191,26 +5296,26 @@ x="32.5" height="23" width="23" - id="rect7903-7-3-4-9" + id="rect7903-7-3-4-9-0" style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <g - transform="translate(-1,126)" + transform="translate(-123,136)" style="display:inline" - id="entry-insensitive-toolbar" + id="entry-insensitive-toolbar-3" inkscape:label="#g9365"> <g - id="g4303-7-3"> + id="g4303-7-3-7"> <rect style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect9321-2-2-1" + id="rect9321-2-2-1-5" width="26" height="23.999998" x="65" y="-279.63782" /> <rect style="opacity:1;fill:#fbfcfc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" - id="rect7903-6-5-6" + id="rect7903-6-5-6-4" width="22" height="21.999998" x="67" @@ -5219,7 +5324,7 @@ ry="10.999999" /> <rect style="display:inline;opacity:0.55;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect7903-7-2-3-4" + id="rect7903-7-2-3-4-6" width="23" height="23" x="66.5" @@ -5230,5 +5335,73 @@ ry="11.5" /> </g> </g> + <g + transform="matrix(-1,0,0,1,131,126)" + style="display:inline" + id="entry-border-bg-solid-spin" + inkscape:label="#g9335" + clip-path="url(#clipPath5131)"> + <path + inkscape:connector-curvature="0" + style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 3,130 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z" + transform="translate(-6,-409.63782)" + id="rect9321-6-7-4" /> + <rect + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="-1.5" + height="23" + width="23" + id="rect7903-7-1-6-9" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + ry="11.5" /> + </g> + <g + transform="translate(103,126)" + style="display:inline" + id="entry-border-active-bg-solid-spin" + inkscape:label="#g9350" + clip-path="url(#clipPath5158)"> + <path + inkscape:connector-curvature="0" + style="display:inline;opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 37,130 0,24 26,0 0,-24 -26,0 z m 13,1 c 6.094,0 11,4.906 11,11 0,6.094 -4.906,11 -11,11 -6.094,0 -11,-4.906 -11,-11 0,-6.094 4.906,-11 11,-11 z" + transform="translate(-6,-409.63782)" + id="rect9321-0-0-1-3" /> + <rect + ry="11.5" + rx="11.5" + inkscape:transform-center-y="0.42353254" + inkscape:transform-center-x="-4.6588025" + y="-279.13782" + x="32.5" + height="23" + width="23" + id="rect7903-7-3-4-9-5" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#5294e2;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + style="display:inline" + id="menubar" + transform="translate(33,-283.63782)" + inkscape:label="#g6170"> + <rect + y="111" + x="437" + height="32" + width="24" + id="rect6166-6" + style="opacity:1;fill:#e7e8eb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="142" + x="437" + height="1" + width="24" + id="rect6168-6" + style="opacity:1;fill:#d7d8dd;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index 0e64d1b..82bf432 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -38,15 +38,17 @@ menu-radio-checked menu-radio-checked-insensitive menu-radio-unchecked menu-radio-unchecked-insensitive -entry -entry-focus -entry-insensitive -entry-notebook -entry-focus-notebook -entry-insensitive-notebook -entry-toolbar -entry-focus-toolbar -entry-insensitive-toolbar +entry-border-bg-solid +entry-border-active-bg-solid +entry-border-disabled-bg +entry-border-bg +entry-border-active-bg +notebook-entry-border-bg +notebook-entry-border-active-bg +notebook-entry-border-disabled-bg +toolbar-entry-border-bg +toolbar-entry-border-active-bg +toolbar-entry-border-disabled-bg entry-border-fill combo-entry combo-entry-focus @@ -115,3 +117,4 @@ tab-left-active tab-right-active inline-toolbar toolbar +menubar diff --git a/common/gtk-2.0/assets/arrow-down-insens.png b/common/gtk-2.0/assets/arrow-down-insens.png Binary files differindex 0623ac3..9db1788 100644 --- a/common/gtk-2.0/assets/arrow-down-insens.png +++ b/common/gtk-2.0/assets/arrow-down-insens.png diff --git a/common/gtk-2.0/assets/arrow-down-prelight.png b/common/gtk-2.0/assets/arrow-down-prelight.png Binary files differindex d502938..ffcd1f9 100644 --- a/common/gtk-2.0/assets/arrow-down-prelight.png +++ b/common/gtk-2.0/assets/arrow-down-prelight.png diff --git a/common/gtk-2.0/assets/arrow-down-small-insens.png b/common/gtk-2.0/assets/arrow-down-small-insens.png Binary files differindex 0eef483..8a67e67 100644 --- a/common/gtk-2.0/assets/arrow-down-small-insens.png +++ b/common/gtk-2.0/assets/arrow-down-small-insens.png diff --git a/common/gtk-2.0/assets/arrow-down-small-prelight.png b/common/gtk-2.0/assets/arrow-down-small-prelight.png Binary files differindex 08199f2..11d6369 100644 --- a/common/gtk-2.0/assets/arrow-down-small-prelight.png +++ b/common/gtk-2.0/assets/arrow-down-small-prelight.png diff --git a/common/gtk-2.0/assets/arrow-left-prelight.png b/common/gtk-2.0/assets/arrow-left-prelight.png Binary files differindex b97e103..75701fe 100644 --- a/common/gtk-2.0/assets/arrow-left-prelight.png +++ b/common/gtk-2.0/assets/arrow-left-prelight.png diff --git a/common/gtk-2.0/assets/arrow-right-prelight.png b/common/gtk-2.0/assets/arrow-right-prelight.png Binary files differindex af6b55a..bfce546 100644 --- a/common/gtk-2.0/assets/arrow-right-prelight.png +++ b/common/gtk-2.0/assets/arrow-right-prelight.png diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png Binary files differindex 846b726..6f9f3b0 100644 --- a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png +++ b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook.png b/common/gtk-2.0/assets/combo-entry-focus-notebook.png Binary files differindex 865e74a..ecaa70d 100644 --- a/common/gtk-2.0/assets/combo-entry-focus-notebook.png +++ b/common/gtk-2.0/assets/combo-entry-focus-notebook.png diff --git a/common/gtk-2.0/assets/combo-entry-focus-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-rtl.png Binary files differindex 360026f..157d899 100644 --- a/common/gtk-2.0/assets/combo-entry-focus-rtl.png +++ b/common/gtk-2.0/assets/combo-entry-focus-rtl.png diff --git a/common/gtk-2.0/assets/combo-entry-focus.png b/common/gtk-2.0/assets/combo-entry-focus.png Binary files differindex 8525018..23dd71a 100644 --- a/common/gtk-2.0/assets/combo-entry-focus.png +++ b/common/gtk-2.0/assets/combo-entry-focus.png diff --git a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png Binary files differindex 1da5c8e..23c8eaa 100644 --- a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png +++ b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png diff --git a/common/gtk-2.0/assets/combo-entry-notebook.png b/common/gtk-2.0/assets/combo-entry-notebook.png Binary files differindex 4e00dc7..1042b0d 100644 --- a/common/gtk-2.0/assets/combo-entry-notebook.png +++ b/common/gtk-2.0/assets/combo-entry-notebook.png diff --git a/common/gtk-2.0/assets/combo-entry-rtl.png b/common/gtk-2.0/assets/combo-entry-rtl.png Binary files differindex 5629ac4..5a914c8 100644 --- a/common/gtk-2.0/assets/combo-entry-rtl.png +++ b/common/gtk-2.0/assets/combo-entry-rtl.png diff --git a/common/gtk-2.0/assets/combo-entry.png b/common/gtk-2.0/assets/combo-entry.png Binary files differindex 394d14e..8d2e972 100644 --- a/common/gtk-2.0/assets/combo-entry.png +++ b/common/gtk-2.0/assets/combo-entry.png diff --git a/common/gtk-2.0/assets/entry-focus.png b/common/gtk-2.0/assets/entry-border-active-bg-solid.png Binary files differindex d0cd36d..d0cd36d 100644 --- a/common/gtk-2.0/assets/entry-focus.png +++ b/common/gtk-2.0/assets/entry-border-active-bg-solid.png diff --git a/common/gtk-2.0/assets/entry-border-active-bg.png b/common/gtk-2.0/assets/entry-border-active-bg.png Binary files differnew file mode 100644 index 0000000..072d5c2 --- /dev/null +++ b/common/gtk-2.0/assets/entry-border-active-bg.png diff --git a/common/gtk-2.0/assets/entry.png b/common/gtk-2.0/assets/entry-border-bg-solid.png Binary files differindex de84155..de84155 100644 --- a/common/gtk-2.0/assets/entry.png +++ b/common/gtk-2.0/assets/entry-border-bg-solid.png diff --git a/common/gtk-2.0/assets/entry-border-bg.png b/common/gtk-2.0/assets/entry-border-bg.png Binary files differnew file mode 100644 index 0000000..0464243 --- /dev/null +++ b/common/gtk-2.0/assets/entry-border-bg.png diff --git a/common/gtk-2.0/assets/entry-insensitive.png b/common/gtk-2.0/assets/entry-border-disabled-bg.png Binary files differindex e9a5c64..e9a5c64 100644 --- a/common/gtk-2.0/assets/entry-insensitive.png +++ b/common/gtk-2.0/assets/entry-border-disabled-bg.png diff --git a/common/gtk-2.0/assets/entry-focus-notebook.png b/common/gtk-2.0/assets/entry-focus-notebook.png Binary files differdeleted file mode 100644 index 044edf6..0000000 --- a/common/gtk-2.0/assets/entry-focus-notebook.png +++ /dev/null diff --git a/common/gtk-2.0/assets/entry-focus-toolbar.png b/common/gtk-2.0/assets/entry-focus-toolbar.png Binary files differdeleted file mode 100644 index 5ce0711..0000000 --- a/common/gtk-2.0/assets/entry-focus-toolbar.png +++ /dev/null diff --git a/common/gtk-2.0/assets/entry-notebook.png b/common/gtk-2.0/assets/entry-notebook.png Binary files differdeleted file mode 100644 index 831004f..0000000 --- a/common/gtk-2.0/assets/entry-notebook.png +++ /dev/null diff --git a/common/gtk-2.0/assets/entry-toolbar.png b/common/gtk-2.0/assets/entry-toolbar.png Binary files differdeleted file mode 100644 index 02f411e..0000000 --- a/common/gtk-2.0/assets/entry-toolbar.png +++ /dev/null diff --git a/common/gtk-2.0/assets/menubar.png b/common/gtk-2.0/assets/menubar.png Binary files differnew file mode 100644 index 0000000..ff49952 --- /dev/null +++ b/common/gtk-2.0/assets/menubar.png diff --git a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png Binary files differnew file mode 100644 index 0000000..d390ded --- /dev/null +++ b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png diff --git a/common/gtk-2.0/assets/notebook-entry-border-bg.png b/common/gtk-2.0/assets/notebook-entry-border-bg.png Binary files differnew file mode 100644 index 0000000..8767bc6 --- /dev/null +++ b/common/gtk-2.0/assets/notebook-entry-border-bg.png diff --git a/common/gtk-2.0/assets/entry-insensitive-notebook.png b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png Binary files differindex 5733e91..5733e91 100644 --- a/common/gtk-2.0/assets/entry-insensitive-notebook.png +++ b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png diff --git a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png Binary files differnew file mode 100644 index 0000000..c978290 --- /dev/null +++ b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png diff --git a/common/gtk-2.0/assets/toolbar-entry-border-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-bg.png Binary files differnew file mode 100644 index 0000000..1bef4f5 --- /dev/null +++ b/common/gtk-2.0/assets/toolbar-entry-border-bg.png diff --git a/common/gtk-2.0/assets/entry-insensitive-toolbar.png b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png Binary files differindex d5dea4a..d5dea4a 100644 --- a/common/gtk-2.0/assets/entry-insensitive-toolbar.png +++ b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png diff --git a/common/gtk-2.0/assets/toolbar.png b/common/gtk-2.0/assets/toolbar.png Binary files differindex ff49952..6b55f41 100644 --- a/common/gtk-2.0/assets/toolbar.png +++ b/common/gtk-2.0/assets/toolbar.png diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc index a0ac495..2dfebc4 100644 --- a/common/gtk-2.0/gtkrc +++ b/common/gtk-2.0/gtkrc @@ -689,13 +689,46 @@ style "menubar" { bg[NORMAL] = "#e7e8eb" fg[NORMAL] = "#70788d" - fg[SELECTED] = @selected_fg_color + fg[SELECTED] = @fg_color fg[INSENSITIVE] = shade(1.3, "#70788d") xthickness = 0 ythickness = 0 + + engine "pixmap" { + + image { + function = BOX + file = "assets/menubar.png" + stretch = TRUE + border = { 1, 1, 1, 1 } + } + } } +style "menubar-borderless" { + + bg[NORMAL] = "#e7e8eb" + fg[NORMAL] = "#70788d" + fg[SELECTED] = @fg_color + fg[INSENSITIVE] = shade(1.3, "#70788d") + + xthickness = 0 + ythickness = 0 + + engine "pixmap" { + + image { + function = BOX + file = "assets/null.png" + stretch = TRUE + border = { 1, 1, 1, 1 } + } + } + +} + + style "menu" { xthickness = 0 @@ -737,10 +770,8 @@ style "menu_item" # highlight. The price to pay is black text on menus as well, # but at least it's readable. # See https://bugs.freedesktop.org/show_bug.cgi?id=38038 - bg[SELECTED] = @fg_color + bg[SELECTED] = @selected_fg_color - bg[PRELIGHT] = @fg_color - fg[PRELIGHT] = @fg_color text[PRELIGHT] = @fg_color engine "pixmap" { @@ -1046,7 +1077,7 @@ style "entry" { detail = "entry" state = NORMAL shadow = IN - file = "assets/entry.png" + file = "assets/entry-border-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1056,7 +1087,7 @@ style "entry" { detail = "entry" state = INSENSITIVE shadow = IN - file = "assets/entry-insensitive.png" + file = "assets/entry-border-disabled-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1065,7 +1096,7 @@ style "entry" { function = SHADOW detail = "entry" state = ACTIVE - file = "assets/entry-focus.png" + file = "assets/entry-border-active-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1100,7 +1131,7 @@ style "notebook_entry" { detail = "entry" state = NORMAL shadow = IN - file = "assets/entry-notebook.png" + file = "assets/notebook-entry-border-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1110,7 +1141,7 @@ style "notebook_entry" { detail = "entry" state = INSENSITIVE shadow = IN - file = "assets/entry-insensitive-notebook.png" + file = "assets/notebook-entry-border-disabled-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1119,10 +1150,28 @@ style "notebook_entry" { function = SHADOW detail = "entry" state = ACTIVE - file = "assets/entry-focus-notebook.png" + file = "assets/notebook-entry-border-active-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } + + image { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + overlay_file = "assets/null.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + + image { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + overlay_file = "assets/null.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } } } @@ -1136,7 +1185,7 @@ style "toolbar_entry" { detail = "entry" state = NORMAL shadow = IN - file = "assets/entry-toolbar.png" + file = "assets/toolbar-entry-border-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1146,7 +1195,7 @@ style "toolbar_entry" { detail = "entry" state = INSENSITIVE shadow = IN - file = "assets/entry-insensitive-toolbar.png" + file = "assets/toolbar-entry-border-disabled-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1155,10 +1204,28 @@ style "toolbar_entry" { function = SHADOW detail = "entry" state = ACTIVE - file = "assets/entry-focus-toolbar.png" + file = "assets/toolbar-entry-border-active-bg.png" border = { 12, 12, 12, 12 } stretch = TRUE } + + image { + function = FLAT_BOX + detail = "entry_bg" + state = NORMAL + overlay_file = "assets/null.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } + + image { + function = FLAT_BOX + detail = "entry_bg" + state = ACTIVE + overlay_file = "assets/null.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = TRUE + } } } @@ -1730,7 +1797,7 @@ style "libreoffice_entry" { detail = "entry" state = NORMAL shadow = IN - file = "assets/entry.png" + file = "assets/entry-border-bg-solid.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1739,7 +1806,7 @@ style "libreoffice_entry" { function = SHADOW detail = "entry" state = ACTIVE - file = "assets/entry-focus.png" + file = "assets/entry-border-active-bg-solid.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1773,7 +1840,7 @@ style "standalone_entry" { detail = "entry" state = NORMAL shadow = IN - file = "assets/entry.png" + file = "assets/entry-border-bg-solid.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1782,7 +1849,7 @@ style "standalone_entry" { function = SHADOW detail = "entry" state = ACTIVE - file = "assets/entry-focus.png" + file = "assets/entry-border-active-bg-solid.png" border = { 12, 12, 12, 12 } stretch = TRUE } @@ -1964,7 +2031,7 @@ style "combobox_button" { } style "range" { - + engine "pixmap" { image { @@ -2479,8 +2546,8 @@ widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>" styl widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>" style "combobox_entry" # The same thing for toolbars -widget_class "*<GtkToolbar>*<GtkEntry>" style "toolbar_entry" -widget_class "*<GtkToolbar>*<GtkEventBox>*<GtkEntry>" style "entry" +#widget_class "*<GtkToolbar>*<GtkEntry>" style "toolbar_entry" +#widget_class "*<GtkToolbar>*<GtkEventBox>*<GtkEntry>" style "entry" # We also need to avoid changing fg color for the inactive notebook tab labels widget_class "*<GtkNotebook>.<GtkLabel>" style "notebook_tab_label" @@ -2523,3 +2590,11 @@ widget "*libreoffice-toplevel*GtkSpinButton" style "libre widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" widget "xfwm4-tabwin*" style "xfwm-tabwin" widget "xfwm4-tabwin*GtkButton*" style "xfwm-tabwin-button" + +# Whitelist for dark toolbars +widget_class "*ThunarWindow*<GtkMenuBar>" style "menubar-borderless" +widget_class "*CajaNavigationWindow*<GtkMenuBar>" style "menubar-borderless" +widget_class "*ThunarWindow*<GtkToolbar>*<GtkEntry>" style "toolbar_entry" +widget_class "*CajaNavigationWindow*<GtkToolbar>*<GtkEntry>" style "toolbar_entry" +widget_class "*ThunarWindow*<GtkToolbar>" style "menubar" +widget_class "*CajaNavigationWindow*<GtkToolbar>" style "menubar" diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss index 5e2fdf6..6bd23fb 100644 --- a/common/gtk-3.0/3.14/_applications.scss +++ b/common/gtk-3.0/3.14/_applications.scss @@ -638,8 +638,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; - .titlebar { background-color: $header_bg; } - .notebook { &.header.top { diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss index f13e097..9a596e1 100644 --- a/common/gtk-3.0/3.14/_common.scss +++ b/common/gtk-3.0/3.14/_common.scss @@ -1125,11 +1125,29 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: $header_fg; + background-color: opacify($header_bg, 1); box-shadow: inset 0 1px lighten($header_bg, 3%); - &:backdrop { color: transparentize($header_fg, 0.3); } + .csd & { background-color: $header_bg; } + + &:backdrop { + color: transparentize($header_fg, 0.3); + background-color: opacify($header_bg, 1); + + .csd & { background-color: lighten($header_bg, 3%); } + } + + .maximized & { + background-color: opacify($header_bg, 1); + + &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); } + } } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { background-color: transparent; } + // Only extending .header-bar avoids some problems (Gnome Documents searchbar) .header-bar { .header-bar-separator, diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 2619242..1a77432 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -851,9 +851,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px #eff0f2; } + .csd .titlebar { + background-color: #e7e8eb; } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: #eff0f2; } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2815,8 +2829,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: #e7e8eb; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 756f765..a6d47ce 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -851,9 +851,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); } + .csd .titlebar { + background-color: rgba(231, 232, 235, 0.95); } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: rgba(239, 240, 242, 0.95); } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2815,8 +2829,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: rgba(231, 232, 235, 0.95); } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss index dd99e90..6c41b73 100644 --- a/common/gtk-3.0/3.16/_applications.scss +++ b/common/gtk-3.0/3.16/_applications.scss @@ -686,7 +686,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; - .titlebar { background-color: $header_bg; } .notebook { diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index a919e8c..40181b2 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -1135,11 +1135,28 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: $header_fg; + background-color: opacify($header_bg, 1); box-shadow: inset 0 1px lighten($header_bg, 3%); - &:backdrop { color: transparentize($header_fg, 0.3); } + .csd & { background-color: $header_bg; } + + &:backdrop { + color: transparentize($header_fg, 0.3); + background-color: opacify($header_bg, 1); + + .csd & { background-color: lighten($header_bg, 3%); } + } + + .maximized & { + background-color: opacify($header_bg, 1); + + &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); } + } } +.titlebar .titlebar, +.titlebar .titlebar:backdrop { background-color: transparent; } + // Only extending .header-bar avoids some problems (Gnome Documents searchbar) .header-bar { .header-bar-separator, diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index abe2177..e46b99d 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -858,9 +858,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px #eff0f2; } + .csd .titlebar { + background-color: #e7e8eb; } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: #eff0f2; } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2760,8 +2774,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: #e7e8eb; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 43e3cb3..3a503e9 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -858,9 +858,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); } + .csd .titlebar { + background-color: rgba(231, 232, 235, 0.95); } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: rgba(239, 240, 242, 0.95); } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2760,8 +2774,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: rgba(231, 232, 235, 0.95); } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } |
