diff options
Diffstat (limited to 'common/gnome-shell')
21 files changed, 1461 insertions, 445 deletions
diff --git a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.14/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> <g - transform="matrix(0.0689655,0,0,0.93939391,71.275885,281.90766)" - id="g6908"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> <rect y="108" x="1011" height="33" width="348" id="rect5271" - style="opacity:0.05;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" /> + 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:0" /> </g> - <rect - style="opacity:0.07;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:1" - id="rect4141" - width="23.99999" - height="1" - x="141" - y="382.36221" /> - <rect - style="opacity:0.07;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:1" - id="rect4141-5" - width="23.99999" - height="1" - x="141" - y="414.36221" /> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="20" + id="svg7539" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="switch-off-selected.svg"> + <defs + id="defs7541"> + <linearGradient + id="linearGradient4695-1-4-3-5-0-6"> + <stop + id="stop4697-9-9-7-0-1-5" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop4699-5-8-9-0-4-0" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3768-6"> + <stop + style="stop-color:#0f0f0f;stop-opacity:1;" + offset="0" + id="stop3770-0" /> + <stop + id="stop3778-6" + offset="0.078125" + style="stop-color:#171717;stop-opacity:1;" /> + <stop + style="stop-color:#171717;stop-opacity:1;" + offset="0.97355771" + id="stop3774-2" /> + <stop + style="stop-color:#1b1b1b;stop-opacity:1;" + offset="1" + id="stop3776-2" /> + </linearGradient> + <linearGradient + id="linearGradient3969-0-4"> + <stop + style="stop-color:#353537;stop-opacity:1;" + offset="0" + id="stop3971-2-6" /> + <stop + style="stop-color:#4d4f52;stop-opacity:1;" + offset="1" + id="stop3973-0-1" /> + </linearGradient> + <linearGradient + id="linearGradient3938"> + <stop + id="stop3940" + offset="0" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + id="stop3942" + offset="1" + style="stop-color:#ffffff;stop-opacity:0.54901963;" /> + </linearGradient> + <linearGradient + id="linearGradient6523"> + <stop + id="stop6525" + offset="0" + style="stop-color:#1a1a1a;stop-opacity:1;" /> + <stop + id="stop6527" + offset="1" + style="stop-color:#1a1a1a;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3938-6"> + <stop + id="stop3940-4" + offset="0" + style="stop-color:#bebebe;stop-opacity:1;" /> + <stop + id="stop3942-8" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.2495794" + inkscape:cx="-2.2858532" + inkscape:cy="2.3994423" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox-midpoints="false" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true"> + <inkscape:grid + type="xygrid" + id="grid3019" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-4" + originy="2.6171874e-06" /> + </sodipodi:namedview> + <metadata + id="metadata7544"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(-120,87.999997)"> + <g + transform="translate(-886,-418)" + style="display:inline;opacity:1" + id="switch-selected" + inkscape:label="#g4820"> + <g + id="layer1-9-3" + inkscape:label="Layer 1" + transform="matrix(-1,0,0,1,1177,420)"> + <g + style="display:inline" + transform="translate(120,-116.99998)" + inkscape:label="Layer 1" + id="switch-active-2-8"> + <g + id="g3900-12-2" + transform="translate(0,-1004.3622)"> + <rect + style="display:inline;opacity:0;fill:#434343;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="rect5465-3-32-9" + width="52" + height="24" + x="0" + y="1029.3622" /> + <rect + style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect2987-07-3" + width="50" + height="20" + x="1" + y="1031.3622" + ry="11" + rx="11" /> + <circle + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3759-7-1" + cx="41" + cy="1041.3622" + r="9" /> + </g> + </g> + </g> + <path + inkscape:connector-curvature="0" + d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z" + id="path10839-9-8-2-2-5-7" + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + </g> + </g> +</svg> diff --git a/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="20" + id="svg7539" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="switch-on-selected.svg"> + <defs + id="defs7541"> + <linearGradient + id="linearGradient4695-1-4-3-5-0-6"> + <stop + id="stop4697-9-9-7-0-1-5" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop4699-5-8-9-0-4-0" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3768-6"> + <stop + style="stop-color:#0f0f0f;stop-opacity:1;" + offset="0" + id="stop3770-0" /> + <stop + id="stop3778-6" + offset="0.078125" + style="stop-color:#171717;stop-opacity:1;" /> + <stop + style="stop-color:#171717;stop-opacity:1;" + offset="0.97355771" + id="stop3774-2" /> + <stop + style="stop-color:#1b1b1b;stop-opacity:1;" + offset="1" + id="stop3776-2" /> + </linearGradient> + <linearGradient + id="linearGradient3969-0-4"> + <stop + style="stop-color:#353537;stop-opacity:1;" + offset="0" + id="stop3971-2-6" /> + <stop + style="stop-color:#4d4f52;stop-opacity:1;" + offset="1" + id="stop3973-0-1" /> + </linearGradient> + <linearGradient + id="linearGradient3938"> + <stop + id="stop3940" + offset="0" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + id="stop3942" + offset="1" + style="stop-color:#ffffff;stop-opacity:0.54901963;" /> + </linearGradient> + <linearGradient + id="linearGradient6523"> + <stop + id="stop6525" + offset="0" + style="stop-color:#1a1a1a;stop-opacity:1;" /> + <stop + id="stop6527" + offset="1" + style="stop-color:#1a1a1a;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3938-6"> + <stop + id="stop3940-4" + offset="0" + style="stop-color:#bebebe;stop-opacity:1;" /> + <stop + id="stop3942-8" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.666667" + inkscape:cx="20.556458" + inkscape:cy="-1.6685358" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox-midpoints="false" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true"> + <inkscape:grid + type="xygrid" + id="grid3019" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-4" + originy="2.6171874e-06" /> + </sodipodi:namedview> + <metadata + id="metadata7544"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(-120,87.999997)"> + <g + transform="translate(-886,-448)" + style="display:inline;opacity:1" + id="switch-active-selected" + inkscape:label="#g4829"> + <g + id="layer1-9-0-0" + inkscape:label="Layer 1" + transform="translate(885,450)" + style="display:inline;opacity:1"> + <g + style="display:inline" + transform="translate(120,-116.99998)" + inkscape:label="Layer 1" + id="switch-active-8-4"> + <g + id="g3900-1-87-6" + transform="translate(0,-1004.3622)"> + <rect + style="display:inline;opacity:0;fill:#434343;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="rect5465-3-3-6" + width="52" + height="24" + x="0" + y="1029.3622" /> + <rect + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect2987-0-8-4" + width="50" + height="20" + x="1" + y="1031.3622" + ry="11" + rx="11" /> + <circle + style="fill:#5294e2;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3759-0-7" + cx="41" + cy="1041.3622" + r="9" /> + </g> + </g> + </g> + <g + transform="translate(-1.0003162,0)" + id="g4816-0"> + <rect + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + ry="0.66666085" + rx="0.66666085" + y="-456.09485" + x="977.54999" + height="1.9999826" + width="5" + id="rect3977-39-2-1" + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> + <rect + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + ry="0" + y="-462.09485" + x="980.54999" + height="7.9999828" + width="2" + id="rect3979-7-0-8" + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> + </g> + </g> + </g> +</svg> diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index 0f4fba2..dc8fddf 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -184,19 +184,22 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #2b2e39 !important; - -slider-border-color: transparent !important; - -slider-active-background-color: #5294E2 !important; - -slider-active-border-color: transparent !important; + -slider-background-color: #2b2e39; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -218,11 +221,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -453,7 +459,7 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - color: #D3DAE3 !important; + color: #D3DAE3; background: none !important; box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } @@ -466,18 +472,22 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3 !important; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(211, 218, 227, 0.5) !important; + color: rgba(211, 218, 227, 0.5); background: none; } .popup-menu .popup-inactive-menu-item { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } - .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { - color: #D3DAE3 !important; } + .popup-menu .popup-status-menu-item, + .popup-menu .popup-subtitle-menu-item { + color: #D3DAE3; } + .popup-menu .popup-menu-item:active .popup-status-menu-item, + .popup-menu .popup-menu-item:active .popup-subtitle-menu-item { + color: #ffffff; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -741,7 +751,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid rgba(211, 218, 227, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.2); } #appMenu { spinner-image: url("common-assets/misc/process-working.svg"); @@ -754,7 +764,9 @@ StScrollBar { width: 360px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; - color: #D3DAE3 !important; } + color: #D3DAE3; } + .aggregate-menu .popup-menu-item:active .popup-menu-icon { + color: #ffffff; } .system-menu-action { padding: 13px; diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 7308f41..65dfd22 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -184,19 +184,22 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #cfd6e6 !important; - -slider-border-color: transparent !important; - -slider-active-background-color: #5294E2 !important; - -slider-active-border-color: transparent !important; + -slider-background-color: #cfd6e6; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -218,11 +221,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -453,7 +459,7 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - color: #5c616c !important; + color: #5c616c; background: none !important; box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } @@ -466,18 +472,22 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c !important; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(92, 97, 108, 0.5) !important; + color: rgba(92, 97, 108, 0.5); background: none; } .popup-menu .popup-inactive-menu-item { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } - .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { - color: #5c616c !important; } + .popup-menu .popup-status-menu-item, + .popup-menu .popup-subtitle-menu-item { + color: #5c616c; } + .popup-menu .popup-menu-item:active .popup-status-menu-item, + .popup-menu .popup-menu-item:active .popup-subtitle-menu-item { + color: #ffffff; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -741,7 +751,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid rgba(92, 97, 108, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.2); } #appMenu { spinner-image: url("common-assets/misc/process-working.svg"); @@ -754,7 +764,9 @@ StScrollBar { width: 360px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; - color: #5c616c !important; } + color: #5c616c; } + .aggregate-menu .popup-menu-item:active .popup-menu-icon { + color: #ffffff; } .system-menu-action { padding: 13px; diff --git a/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="9.0311108mm" - height="9.3133335mm" - viewBox="0 0 31.999999 33" - id="svg6927" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="menu-hover.svg"> - <defs - id="defs6929" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="4.0327991" - inkscape:cy="13.945988" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="1032" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="false" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4140" - originx="0" - originy="1.2503989e-05" /> - </sodipodi:namedview> - <metadata - id="metadata6932"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-137,-382.36221)"> - <g - transform="matrix(0.0689655,0,0,0.93939391,71.275885,281.90766)" - id="g6908"> - <rect - y="108" - x="1011" - height="33" - width="348" - id="rect5271" - style="opacity:0.03999999;fill:#000000;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" /> - </g> - <rect - style="opacity:0.08999999;fill:#000000;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="rect4141" - width="23.99999" - height="1" - x="141" - y="382.36221" /> - <rect - style="opacity:0.08999999;fill:#000000;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="rect4141-5" - width="23.99999" - height="1" - x="141" - y="414.36221" /> - </g> -</svg> diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 863159e..b5bdcf2 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -164,19 +164,24 @@ StScrollBar { // .slider { -slider-height: 4px; - -slider-background-color: $button_border !important; //background of the trough - -slider-border-color: transparentize(black, 1) !important; //trough border color - -slider-active-background-color: $selected_bg_color !important; //active trough fill - -slider-active-border-color: transparentize(black, 1) !important; //active trough border + -slider-background-color: $button_border; //background of the trough + -slider-border-color: transparentize(black, 1); //trough border color + -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-border-color: transparentize(black, 1); //active trough border -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item:active & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -206,11 +211,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item:active & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -553,7 +561,7 @@ StScrollBar { } .popup-submenu-menu-item:open { - color: $fg_color !important; + color: $fg_color; background: none !important; box-shadow: none; border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; @@ -567,13 +575,13 @@ StScrollBar { &:rtl { padding: .4em 0em .4em 3em; } &:active, &.selected { - color: $fg_color !important; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { - color: transparentize($fg_color, 0.5) !important; + color: transparentize($fg_color, 0.5); background: none; } } @@ -583,7 +591,15 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } - .popup-status-menu-item, .popup-subtitle-menu-item { color: $fg_color !important; } + + .popup-status-menu-item, + .popup-subtitle-menu-item { color: $fg_color; } + + .popup-menu-item:active { + .popup-status-menu-item, + .popup-subtitle-menu-item { color: $selected_fg_color; } + } + &.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; @@ -623,7 +639,7 @@ StScrollBar { background-color: transparent; background-gradient-direction: none !important; border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu @@ -939,7 +955,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid transparentize($fg_color,0.6); + border: 1px solid transparentize(black, 0.8); } #appMenu { @@ -954,7 +970,10 @@ StScrollBar { width: 360px; .popup-menu-icon { padding: 0 4px; - color: $fg_color !important; + color: $fg_color; + } + .popup-menu-item:active .popup-menu-icon { + color: $selected_fg_color; } } diff --git a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.16/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> <g - transform="matrix(0.0689655,0,0,0.93939391,71.275885,281.90766)" - id="g6908"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> <rect y="108" x="1011" height="33" width="348" id="rect5271" - style="opacity:0.05;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" /> + 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:0" /> </g> - <rect - style="opacity:0.07;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:1" - id="rect4141" - width="23.99999" - height="1" - x="141" - y="382.36221" /> - <rect - style="opacity:0.07;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:1" - id="rect4141-5" - width="23.99999" - height="1" - x="141" - y="414.36221" /> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="20" + id="svg7539" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="switch-off-selected.svg"> + <defs + id="defs7541"> + <linearGradient + id="linearGradient4695-1-4-3-5-0-6"> + <stop + id="stop4697-9-9-7-0-1-5" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop4699-5-8-9-0-4-0" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3768-6"> + <stop + style="stop-color:#0f0f0f;stop-opacity:1;" + offset="0" + id="stop3770-0" /> + <stop + id="stop3778-6" + offset="0.078125" + style="stop-color:#171717;stop-opacity:1;" /> + <stop + style="stop-color:#171717;stop-opacity:1;" + offset="0.97355771" + id="stop3774-2" /> + <stop + style="stop-color:#1b1b1b;stop-opacity:1;" + offset="1" + id="stop3776-2" /> + </linearGradient> + <linearGradient + id="linearGradient3969-0-4"> + <stop + style="stop-color:#353537;stop-opacity:1;" + offset="0" + id="stop3971-2-6" /> + <stop + style="stop-color:#4d4f52;stop-opacity:1;" + offset="1" + id="stop3973-0-1" /> + </linearGradient> + <linearGradient + id="linearGradient3938"> + <stop + id="stop3940" + offset="0" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + id="stop3942" + offset="1" + style="stop-color:#ffffff;stop-opacity:0.54901963;" /> + </linearGradient> + <linearGradient + id="linearGradient6523"> + <stop + id="stop6525" + offset="0" + style="stop-color:#1a1a1a;stop-opacity:1;" /> + <stop + id="stop6527" + offset="1" + style="stop-color:#1a1a1a;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3938-6"> + <stop + id="stop3940-4" + offset="0" + style="stop-color:#bebebe;stop-opacity:1;" /> + <stop + id="stop3942-8" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.2495794" + inkscape:cx="-2.2858532" + inkscape:cy="2.3994423" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox-midpoints="false" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true"> + <inkscape:grid + type="xygrid" + id="grid3019" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-4" + originy="2.6171874e-06" /> + </sodipodi:namedview> + <metadata + id="metadata7544"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(-120,87.999997)"> + <g + transform="translate(-886,-418)" + style="display:inline;opacity:1" + id="switch-selected" + inkscape:label="#g4820"> + <g + id="layer1-9-3" + inkscape:label="Layer 1" + transform="matrix(-1,0,0,1,1177,420)"> + <g + style="display:inline" + transform="translate(120,-116.99998)" + inkscape:label="Layer 1" + id="switch-active-2-8"> + <g + id="g3900-12-2" + transform="translate(0,-1004.3622)"> + <rect + style="display:inline;opacity:0;fill:#434343;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="rect5465-3-32-9" + width="52" + height="24" + x="0" + y="1029.3622" /> + <rect + style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect2987-07-3" + width="50" + height="20" + x="1" + y="1031.3622" + ry="11" + rx="11" /> + <circle + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3759-7-1" + cx="41" + cy="1041.3622" + r="9" /> + </g> + </g> + </g> + <path + inkscape:connector-curvature="0" + d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z" + id="path10839-9-8-2-2-5-7" + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + </g> + </g> +</svg> diff --git a/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="20" + id="svg7539" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="switch-on-selected.svg"> + <defs + id="defs7541"> + <linearGradient + id="linearGradient4695-1-4-3-5-0-6"> + <stop + id="stop4697-9-9-7-0-1-5" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop4699-5-8-9-0-4-0" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3768-6"> + <stop + style="stop-color:#0f0f0f;stop-opacity:1;" + offset="0" + id="stop3770-0" /> + <stop + id="stop3778-6" + offset="0.078125" + style="stop-color:#171717;stop-opacity:1;" /> + <stop + style="stop-color:#171717;stop-opacity:1;" + offset="0.97355771" + id="stop3774-2" /> + <stop + style="stop-color:#1b1b1b;stop-opacity:1;" + offset="1" + id="stop3776-2" /> + </linearGradient> + <linearGradient + id="linearGradient3969-0-4"> + <stop + style="stop-color:#353537;stop-opacity:1;" + offset="0" + id="stop3971-2-6" /> + <stop + style="stop-color:#4d4f52;stop-opacity:1;" + offset="1" + id="stop3973-0-1" /> + </linearGradient> + <linearGradient + id="linearGradient3938"> + <stop + id="stop3940" + offset="0" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + id="stop3942" + offset="1" + style="stop-color:#ffffff;stop-opacity:0.54901963;" /> + </linearGradient> + <linearGradient + id="linearGradient6523"> + <stop + id="stop6525" + offset="0" + style="stop-color:#1a1a1a;stop-opacity:1;" /> + <stop + id="stop6527" + offset="1" + style="stop-color:#1a1a1a;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3938-6"> + <stop + id="stop3940-4" + offset="0" + style="stop-color:#bebebe;stop-opacity:1;" /> + <stop + id="stop3942-8" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.666667" + inkscape:cx="20.556458" + inkscape:cy="-1.6685358" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox-midpoints="false" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true"> + <inkscape:grid + type="xygrid" + id="grid3019" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-4" + originy="2.6171874e-06" /> + </sodipodi:namedview> + <metadata + id="metadata7544"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(-120,87.999997)"> + <g + transform="translate(-886,-448)" + style="display:inline;opacity:1" + id="switch-active-selected" + inkscape:label="#g4829"> + <g + id="layer1-9-0-0" + inkscape:label="Layer 1" + transform="translate(885,450)" + style="display:inline;opacity:1"> + <g + style="display:inline" + transform="translate(120,-116.99998)" + inkscape:label="Layer 1" + id="switch-active-8-4"> + <g + id="g3900-1-87-6" + transform="translate(0,-1004.3622)"> + <rect + style="display:inline;opacity:0;fill:#434343;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="rect5465-3-3-6" + width="52" + height="24" + x="0" + y="1029.3622" /> + <rect + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect2987-0-8-4" + width="50" + height="20" + x="1" + y="1031.3622" + ry="11" + rx="11" /> + <circle + style="fill:#5294e2;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3759-0-7" + cx="41" + cy="1041.3622" + r="9" /> + </g> + </g> + </g> + <g + transform="translate(-1.0003162,0)" + id="g4816-0"> + <rect + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + ry="0.66666085" + rx="0.66666085" + y="-456.09485" + x="977.54999" + height="1.9999826" + width="5" + id="rect3977-39-2-1" + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> + <rect + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + ry="0" + y="-462.09485" + x="980.54999" + height="7.9999828" + width="2" + id="rect3979-7-0-8" + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> + </g> + </g> + </g> +</svg> diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index 5571339..335ba6b 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -156,6 +156,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -177,11 +180,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -423,9 +429,9 @@ StScrollBar { box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index ad41fcc..5c48616 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -156,6 +156,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -177,11 +180,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -423,9 +429,9 @@ StScrollBar { box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } diff --git a/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="9.0311108mm" - height="9.3133335mm" - viewBox="0 0 31.999999 33" - id="svg6927" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="menu-hover.svg"> - <defs - id="defs6929" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="4.0327991" - inkscape:cy="13.945988" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="1032" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="false" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4140" - originx="0" - originy="1.2503989e-05" /> - </sodipodi:namedview> - <metadata - id="metadata6932"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-137,-382.36221)"> - <g - transform="matrix(0.0689655,0,0,0.93939391,71.275885,281.90766)" - id="g6908"> - <rect - y="108" - x="1011" - height="33" - width="348" - id="rect5271" - style="opacity:0.03999999;fill:#000000;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" /> - </g> - <rect - style="opacity:0.08999999;fill:#000000;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="rect4141" - width="23.99999" - height="1" - x="141" - y="382.36221" /> - <rect - style="opacity:0.08999999;fill:#000000;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="rect4141-5" - width="23.99999" - height="1" - x="141" - y="414.36221" /> - </g> -</svg> diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 9515e43..6d8af82 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -148,6 +148,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item.selected & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -177,11 +182,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item.selected & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -534,9 +542,9 @@ StScrollBar { } &:active, &.selected { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { diff --git a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> <g - transform="matrix(0.0689655,0,0,0.93939391,71.275885,281.90766)" - id="g6908"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> <rect y="108" x="1011" height="33" width="348" id="rect5271" - style="opacity:0.05;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" /> + 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:0" /> </g> - <rect - style="opacity:0.07;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:1" - id="rect4141" - width="23.99999" - height="1" - x="141" - y="382.36221" /> - <rect - style="opacity:0.07;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:1" - id="rect4141-5" - width="23.99999" - height="1" - x="141" - y="414.36221" /> </g> </svg> diff --git a/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="20" + id="svg7539" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="switch-off-selected.svg"> + <defs + id="defs7541"> + <linearGradient + id="linearGradient4695-1-4-3-5-0-6"> + <stop + id="stop4697-9-9-7-0-1-5" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop4699-5-8-9-0-4-0" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3768-6"> + <stop + style="stop-color:#0f0f0f;stop-opacity:1;" + offset="0" + id="stop3770-0" /> + <stop + id="stop3778-6" + offset="0.078125" + style="stop-color:#171717;stop-opacity:1;" /> + <stop + style="stop-color:#171717;stop-opacity:1;" + offset="0.97355771" + id="stop3774-2" /> + <stop + style="stop-color:#1b1b1b;stop-opacity:1;" + offset="1" + id="stop3776-2" /> + </linearGradient> + <linearGradient + id="linearGradient3969-0-4"> + <stop + style="stop-color:#353537;stop-opacity:1;" + offset="0" + id="stop3971-2-6" /> + <stop + style="stop-color:#4d4f52;stop-opacity:1;" + offset="1" + id="stop3973-0-1" /> + </linearGradient> + <linearGradient + id="linearGradient3938"> + <stop + id="stop3940" + offset="0" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + id="stop3942" + offset="1" + style="stop-color:#ffffff;stop-opacity:0.54901963;" /> + </linearGradient> + <linearGradient + id="linearGradient6523"> + <stop + id="stop6525" + offset="0" + style="stop-color:#1a1a1a;stop-opacity:1;" /> + <stop + id="stop6527" + offset="1" + style="stop-color:#1a1a1a;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3938-6"> + <stop + id="stop3940-4" + offset="0" + style="stop-color:#bebebe;stop-opacity:1;" /> + <stop + id="stop3942-8" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.2495794" + inkscape:cx="-2.2858532" + inkscape:cy="2.3994423" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox-midpoints="false" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true"> + <inkscape:grid + type="xygrid" + id="grid3019" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-4" + originy="2.6171874e-06" /> + </sodipodi:namedview> + <metadata + id="metadata7544"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(-120,87.999997)"> + <g + transform="translate(-886,-418)" + style="display:inline;opacity:1" + id="switch-selected" + inkscape:label="#g4820"> + <g + id="layer1-9-3" + inkscape:label="Layer 1" + transform="matrix(-1,0,0,1,1177,420)"> + <g + style="display:inline" + transform="translate(120,-116.99998)" + inkscape:label="Layer 1" + id="switch-active-2-8"> + <g + id="g3900-12-2" + transform="translate(0,-1004.3622)"> + <rect + style="display:inline;opacity:0;fill:#434343;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="rect5465-3-32-9" + width="52" + height="24" + x="0" + y="1029.3622" /> + <rect + style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect2987-07-3" + width="50" + height="20" + x="1" + y="1031.3622" + ry="11" + rx="11" /> + <circle + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3759-7-1" + cx="41" + cy="1041.3622" + r="9" /> + </g> + </g> + </g> + <path + inkscape:connector-curvature="0" + d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z" + id="path10839-9-8-2-2-5-7" + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> + </g> + </g> +</svg> diff --git a/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="20" + id="svg7539" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="switch-on-selected.svg"> + <defs + id="defs7541"> + <linearGradient + id="linearGradient4695-1-4-3-5-0-6"> + <stop + id="stop4697-9-9-7-0-1-5" + style="stop-color:#000000;stop-opacity:1;" + offset="0" /> + <stop + id="stop4699-5-8-9-0-4-0" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3768-6"> + <stop + style="stop-color:#0f0f0f;stop-opacity:1;" + offset="0" + id="stop3770-0" /> + <stop + id="stop3778-6" + offset="0.078125" + style="stop-color:#171717;stop-opacity:1;" /> + <stop + style="stop-color:#171717;stop-opacity:1;" + offset="0.97355771" + id="stop3774-2" /> + <stop + style="stop-color:#1b1b1b;stop-opacity:1;" + offset="1" + id="stop3776-2" /> + </linearGradient> + <linearGradient + id="linearGradient3969-0-4"> + <stop + style="stop-color:#353537;stop-opacity:1;" + offset="0" + id="stop3971-2-6" /> + <stop + style="stop-color:#4d4f52;stop-opacity:1;" + offset="1" + id="stop3973-0-1" /> + </linearGradient> + <linearGradient + id="linearGradient3938"> + <stop + id="stop3940" + offset="0" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + id="stop3942" + offset="1" + style="stop-color:#ffffff;stop-opacity:0.54901963;" /> + </linearGradient> + <linearGradient + id="linearGradient6523"> + <stop + id="stop6525" + offset="0" + style="stop-color:#1a1a1a;stop-opacity:1;" /> + <stop + id="stop6527" + offset="1" + style="stop-color:#1a1a1a;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3938-6"> + <stop + id="stop3940-4" + offset="0" + style="stop-color:#bebebe;stop-opacity:1;" /> + <stop + id="stop3942-8" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.666667" + inkscape:cx="20.556458" + inkscape:cy="-1.6685358" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="1" + inkscape:snap-bbox="true" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox-midpoints="false" + inkscape:bbox-paths="true" + inkscape:bbox-nodes="true" + inkscape:snap-bbox-edge-midpoints="true"> + <inkscape:grid + type="xygrid" + id="grid3019" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-4" + originy="2.6171874e-06" /> + </sodipodi:namedview> + <metadata + id="metadata7544"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(-120,87.999997)"> + <g + transform="translate(-886,-448)" + style="display:inline;opacity:1" + id="switch-active-selected" + inkscape:label="#g4829"> + <g + id="layer1-9-0-0" + inkscape:label="Layer 1" + transform="translate(885,450)" + style="display:inline;opacity:1"> + <g + style="display:inline" + transform="translate(120,-116.99998)" + inkscape:label="Layer 1" + id="switch-active-8-4"> + <g + id="g3900-1-87-6" + transform="translate(0,-1004.3622)"> + <rect + style="display:inline;opacity:0;fill:#434343;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="rect5465-3-3-6" + width="52" + height="24" + x="0" + y="1029.3622" /> + <rect + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="rect2987-0-8-4" + width="50" + height="20" + x="1" + y="1031.3622" + ry="11" + rx="11" /> + <circle + style="fill:#5294e2;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3759-0-7" + cx="41" + cy="1041.3622" + r="9" /> + </g> + </g> + </g> + <g + transform="translate(-1.0003162,0)" + id="g4816-0"> + <rect + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + ry="0.66666085" + rx="0.66666085" + y="-456.09485" + x="977.54999" + height="1.9999826" + width="5" + id="rect3977-39-2-1" + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> + <rect + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" + ry="0" + y="-462.09485" + x="980.54999" + height="7.9999828" + width="2" + id="rect3979-7-0-8" + style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> + </g> + </g> + </g> +</svg> diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index b89c1a4..62c88f5 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -130,6 +130,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -151,11 +154,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -452,9 +458,9 @@ StScrollBar { box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } @@ -489,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 912c6f6..bf1cfb4 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -130,6 +130,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -151,11 +154,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -452,9 +458,9 @@ StScrollBar { box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } @@ -489,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="9.0311108mm" - height="9.3133335mm" - viewBox="0 0 31.999999 33" - id="svg6927" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="menu-hover.svg"> - <defs - id="defs6929" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="4.0327991" - inkscape:cy="13.945988" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1920" - inkscape:window-height="1032" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="false" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4140" - originx="0" - originy="1.2503989e-05" /> - </sodipodi:namedview> - <metadata - id="metadata6932"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-137,-382.36221)"> - <g - transform="matrix(0.0689655,0,0,0.93939391,71.275885,281.90766)" - id="g6908"> - <rect - y="108" - x="1011" - height="33" - width="348" - id="rect5271" - style="opacity:0.03999999;fill:#000000;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" /> - </g> - <rect - style="opacity:0.08999999;fill:#000000;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="rect4141" - width="23.99999" - height="1" - x="141" - y="382.36221" /> - <rect - style="opacity:0.08999999;fill:#000000;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="rect4141-5" - width="23.99999" - height="1" - x="141" - y="414.36221" /> - </g> -</svg> diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 9c5afa4..1fdf697 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -149,6 +149,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item.selected & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -178,11 +183,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item.selected & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -601,9 +609,9 @@ StScrollBar { } &:active, &.selected { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { @@ -651,10 +659,10 @@ StScrollBar { .popup-separator-menu-item { //-margin-horizontal: 24px; height: 2px; //not really the whole box - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu |
