diff options
Diffstat (limited to 'common/gnome-shell')
35 files changed, 768 insertions, 712 deletions
diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg index b9e8761..ad2de78 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-bottom.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="33.341558" - inkscape:cy="21.66656" + inkscape:zoom="5.6568542" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> <g - id="g4208" - transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> + id="g4136" + transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> <path - inkscape:connector-curvature="0" id="rect4749-1" - d="m 48,1004.3622 0,1 -45,0 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,1 -46,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-44 c 0,-1.108 0.892,-2 2,-2 l 46,0 z" - style="display:inline;opacity:0.6800001;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="csscccc" inkscape:connector-curvature="0" id="rect4749-48" - d="m 3,1005.3622 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,-46 z" - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg index 2d7ca3b..6d0c2d2 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-bottom.svg @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> <inkscape:grid type="xygrid" id="grid5349" /> @@ -48,7 +49,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749" - width="47" - height="48.000019" - x="-1052.3622" - y="-48.000019" - transform="matrix(0,-1,-1,0,0,0)" /> - <rect - style="display:inline;opacity:0.68000034;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749-4" - width="1" - height="48.000019" - x="-1005.3622" - y="-48.000019" - transform="matrix(0,-1,-1,0,0,0)" /> + <g + id="g4136" + transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> + <rect + y="1004.3622" + x="0" + height="48.000019" + width="47" + id="rect4749" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1004.3622" + x="47" + height="48.000019" + width="1" + id="rect4749-4" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg index e80ed3f..c666279 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-left.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="32.981286" - inkscape:cy="14.79234" + inkscape:zoom="7.9999996" + inkscape:cx="15.785874" + inkscape:cy="23.97024" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -59,14 +59,14 @@ id="layer1" transform="translate(0,-1004.3622)"> <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4749" width="47" height="48.000019" x="0" y="1004.3622" /> <rect - style="display:inline;opacity:0.68;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4749-4" width="1" height="48.000019" diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg index 5c68f7f..72a0403 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-right.svg @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="7.9999996" + inkscape:cx="15.758223" + inkscape:cy="23.965229" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> <inkscape:grid type="xygrid" id="grid5349" /> @@ -48,7 +49,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749" - width="47" - height="48.000019" - x="-48" - y="1004.3622" - transform="scale(-1,1)" /> - <rect - style="display:inline;opacity:0.68000034;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749-4" - width="1" - height="48.000019" - x="-1" - y="1004.3622" - transform="scale(-1,1)" /> + <g + id="g4136" + transform="matrix(-1,0,0,1,48,0)"> + <rect + y="1004.3622" + x="0" + height="48.000019" + width="47" + id="rect4749" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1004.3622" + x="47" + height="48.000019" + width="1" + id="rect4749-4" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg b/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg index b56904e..a501da7 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-extended-top.svg @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> <inkscape:grid type="xygrid" id="grid5349" /> @@ -48,7 +49,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749" - width="47" - height="48.000019" - x="1004.3622" - y="-48.000019" - transform="matrix(0,1,-1,0,0,0)" /> - <rect - style="display:inline;opacity:0.68000034;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749-4" - width="1" - height="48.000019" - x="1051.3622" - y="-48.000019" - transform="matrix(0,1,-1,0,0,0)" /> + <g + id="g4136" + transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> + <rect + y="1004.3622" + x="0" + height="48.000019" + width="47" + id="rect4749" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1004.3622" + x="47" + height="48.000019" + width="1" + id="rect4749-4" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-left.svg b/common/gnome-shell/3.14/common-assets/dash/dash-left.svg index 12d3b6b..5fb7bf2 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-left.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-left.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="-8.268968" - inkscape:cy="37.523776" + inkscape:zoom="45.254834" + inkscape:cx="43.604809" + inkscape:cy="43.393322" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,12 +58,12 @@ id="layer1" transform="translate(0,-1004.3622)"> <path - style="display:inline;opacity:0.68;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M 0 0 L 0 1 L 45 1 C 46.108 1 47 1.892 47 3 L 47 45 C 47 46.108 46.108 47 45 47 L 0 47 L 0 48 L 46 48 C 47.108 48 48 47.108 48 46 L 48 2 C 48 0.892 47.108 0 46 0 L 0 0 z " transform="translate(0,1004.3622)" id="rect4749-1" /> <path - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" id="rect4749-48" inkscape:connector-curvature="0" diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-right.svg b/common/gnome-shell/3.14/common-assets/dash/dash-right.svg index e7f7551..64c1e9b 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-right.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-right.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="-6.5243243" - inkscape:cy="14.85871" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,16 +57,21 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <path - style="display:inline;opacity:0.68000004;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 48,1004.3622 0,1 -45,0 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,1 -46,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-44 c 0,-1.108 0.892,-2 2,-2 l 46,0 z" - id="rect4749-1" - inkscape:connector-curvature="0" /> - <path - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 3,1005.3622 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,-46 z" - id="rect4749-48" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csscccc" /> + <g + id="g4136" + transform="matrix(-1,0,0,1,48,0)"> + <path + id="rect4749-1" + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="csscccc" + inkscape:connector-curvature="0" + id="rect4749-48" + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/dash-top.svg b/common/gnome-shell/3.14/common-assets/dash/dash-top.svg index 1d05a3c..5f52736 100644 --- a/common/gnome-shell/3.14/common-assets/dash/dash-top.svg +++ b/common/gnome-shell/3.14/common-assets/dash/dash-top.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="-6.5243243" - inkscape:cy="14.85871" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> <g - id="g4208" - transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> + id="g4136" + transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> <path - inkscape:connector-curvature="0" id="rect4749-1" - d="m 48,1004.3622 0,1 -45,0 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,1 -46,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-44 c 0,-1.108 0.892,-2 2,-2 l 46,0 z" - style="display:inline;opacity:0.68000016;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="csscccc" inkscape:connector-curvature="0" id="rect4749-48" - d="m 3,1005.3622 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,-46 z" - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/misc/bg.svg b/common/gnome-shell/3.14/common-assets/misc/bg.svg index cf27958..feeddea 100644 --- a/common/gnome-shell/3.14/common-assets/misc/bg.svg +++ b/common/gnome-shell/3.14/common-assets/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="bg.svg"> <defs id="defs5388" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="14.604606" - inkscape:cy="20.53994" + inkscape:zoom="11.313708" + inkscape:cx="18.271674" + inkscape:cy="5.838404" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> <rect - style="display:inline;opacity:0.72;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164-4-3" width="23" height="21.999889" @@ -67,7 +67,7 @@ rx="2.0000005" ry="1.9999999" /> <rect - style="display:inline;opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164" width="22" height="20.999971" @@ -78,7 +78,7 @@ <g transform="translate(-425.99995,658.36226)" id="g4271" - style="display:inline;opacity:0.75"> + style="display:inline;opacity:0.65"> <rect ry="8" rx="8" diff --git a/common/gnome-shell/3.14/common-assets/misc/button-box.svg b/common/gnome-shell/3.14/common-assets/misc/button-box.svg index 7435084..036f0d1 100644 --- a/common/gnome-shell/3.14/common-assets/misc/button-box.svg +++ b/common/gnome-shell/3.14/common-assets/misc/button-box.svg @@ -40,8 +40,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="-0.14173931" - inkscape:cy="13.244492" + inkscape:cx="9.376447" + inkscape:cy="10.14915" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -83,15 +83,8 @@ id="layer1" transform="translate(-5,-1027.3622)"> <path - style="opacity:0.67;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 0,3.6512857e-5 0,17 c 0,1.108 0.892,2 2,2 l 18,0 c 1.108,0 2,-0.892 2,-2 L 22,3.6512857e-5 Z M 21,1.0000365 21,17 c 0,0.554 -0.446,1 -1,1 L 2,18 C 1.446,18 1,17.554 1,17 L 1,1.0000365 Z" - transform="translate(5,1027.3622)" - id="rect4147" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csssscccsssscc" /> - <path - style="opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 26,1027.3622 0,17 c 0,0.554 -0.446,1 -1,1 l -18,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-17 z" + style="opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 27,1027.3622 0,17.9445 c 0,0.5848 -0.4906,1.0555 -1.1,1.0555 l -19.8,0 c -0.6094,0 -1.1,-0.4707 -1.1,-1.0555 l 0,-17.9445 z" id="rect4145-1" inkscape:connector-curvature="0" sodipodi:nodetypes="csssscc" /> diff --git a/common/gnome-shell/3.14/common-assets/misc/notification.svg b/common/gnome-shell/3.14/common-assets/misc/notification.svg index 21a613a..94c92a9 100644 --- a/common/gnome-shell/3.14/common-assets/misc/notification.svg +++ b/common/gnome-shell/3.14/common-assets/misc/notification.svg @@ -39,9 +39,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="15.008847" - inkscape:cy="15.732233" + inkscape:zoom="15.999999" + inkscape:cx="8.9535339" + inkscape:cy="19.450947" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -67,7 +67,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -76,76 +76,71 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1028.3622)"> + <rect + style="display:inline;opacity:0.81000001;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4164-4-3" + width="23" + height="21.999889" + x="4.5000052" + y="1032.8622" + rx="2.0000005" + ry="1.9999999" /> + <rect + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4164" + width="22" + height="20.999971" + x="5.0000052" + y="1033.3622" + rx="1.4" + ry="1.4" /> <g - id="g4142" - clip-path="url(#clipPath4158)" - transform="translate(5.3131104e-6,8.0000174)"> + transform="translate(-425.99994,666.36228)" + id="g4271" + style="display:inline;opacity:0.64999999"> <rect - ry="1.9999999" - rx="2.0000005" - y="1024.8622" - x="4.5" - height="21.999889" - width="23" - id="rect4164-4-3" - style="display:inline;opacity:0.72000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + ry="8" + rx="8" + y="362.49994" + x="426.49994" + height="31" + width="31.000011" + id="rect4164-4-7-5-3-8-8" + style="display:inline;opacity:0.02000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <rect - ry="1.4" - rx="1.4" - y="1025.3622" - x="5" - height="20.999971" - width="22" - id="rect4164" - style="display:inline;opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <g - style="display:inline;opacity:0.75" - id="g4271" - transform="translate(-425.99995,658.36226)"> - <rect - style="display:inline;opacity:0.02000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4164-4-7-5-3-8-8" - width="31.000011" - height="31" - x="426.49994" - y="362.49994" - rx="8" - ry="8" /> - <rect - style="display:inline;opacity:0.07000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4164-4-7-5-3-8" - width="29.000011" - height="28.999996" - x="427.49994" - y="363.49997" - rx="7" - ry="6.999999" /> - <rect - style="display:inline;opacity:0.12999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4164-4-7-5-3" - width="27.000011" - height="26.999998" - x="428.49994" - y="364.49994" - rx="6" - ry="6" /> - <rect - style="display:inline;opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4164-4-7-5" - width="24.999981" - height="24.999998" - x="429.49997" - y="365.49997" - rx="4.9999995" - ry="5" /> - <path - sodipodi:nodetypes="csscssc" - inkscape:connector-curvature="0" - style="display:inline;opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 431.64844,388.30469 C 432.37319,389.0416 433.37997,389.5 434.5,389.5 l 15.00023,0 c 1.12003,0 2.12681,-0.4584 2.85156,-1.19531 -0.2591,0.12217 -0.5451,0.19531 -0.85156,0.19531 l -19.00023,0 c -0.30646,0 -0.59246,-0.0731 -0.85156,-0.19531 z" - id="rect4164-4-7" - transform="translate(-6.1035156e-5,0)" /> - </g> + ry="6.999999" + rx="7" + y="363.49997" + x="427.49994" + height="28.999996" + width="29.000011" + id="rect4164-4-7-5-3-8" + style="display:inline;opacity:0.07000002;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + ry="6" + rx="6" + y="364.49994" + x="428.49994" + height="26.999998" + width="27.000011" + id="rect4164-4-7-5-3" + style="display:inline;opacity:0.12999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + ry="5" + rx="4.9999995" + y="365.49997" + x="429.49997" + height="24.999998" + width="24.999981" + id="rect4164-4-7-5" + style="display:inline;opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + transform="translate(-6.1035156e-5,0)" + id="rect4164-4-7" + d="M 431.64844,388.30469 C 432.37319,389.0416 433.37997,389.5 434.5,389.5 l 15.00023,0 c 1.12003,0 2.12681,-0.4584 2.85156,-1.19531 -0.2591,0.12217 -0.5451,0.19531 -0.85156,0.19531 l -19.00023,0 c -0.30646,0 -0.59246,-0.0731 -0.85156,-0.19531 z" + style="display:inline;opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csscssc" /> </g> </g> </svg> diff --git a/common/gnome-shell/3.14/common-assets/misc/osd.svg b/common/gnome-shell/3.14/common-assets/misc/osd.svg index e7a4202..df41a00 100644 --- a/common/gnome-shell/3.14/common-assets/misc/osd.svg +++ b/common/gnome-shell/3.14/common-assets/misc/osd.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="osd.svg"> <defs id="defs5388" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="8.7900421" - inkscape:cy="21.131226" + inkscape:zoom="16" + inkscape:cx="23.210075" + inkscape:cy="11.575503" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> <rect - style="display:inline;opacity:0.8;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.85;fill:none;fill-opacity:1;stroke:#0f1116;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164-4-3" width="23" height="21.999889" @@ -67,7 +67,7 @@ rx="2.0000005" ry="1.9999999" /> <rect - style="display:inline;opacity:0.95;fill:#252a2f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164" width="22" height="20.999971" @@ -78,7 +78,7 @@ <g transform="translate(-425.99995,658.36226)" id="g4271" - style="display:inline;opacity:0.75"> + style="display:inline;opacity:0.65"> <rect ry="8" rx="8" diff --git a/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg b/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg index 7e48535..c955747 100644 --- a/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg +++ b/common/gnome-shell/3.14/common-assets/panel/panel-overview.svg @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="14.96115" - inkscape:cy="0.2334765" + inkscape:zoom="11.313708" + inkscape:cx="12.34771" + inkscape:cy="7.591971" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> <rect - style="display:inline;opacity:0.95;fill:#24282c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713" width="27" height="26" x="0" y="1025.3622" /> <rect - style="display:inline;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713-4" width="27" height="1" diff --git a/common/gnome-shell/3.14/common-assets/panel/panel.svg b/common/gnome-shell/3.14/common-assets/panel/panel.svg index 106ffac..c0a64da 100644 --- a/common/gnome-shell/3.14/common-assets/panel/panel.svg +++ b/common/gnome-shell/3.14/common-assets/panel/panel.svg @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="17.27365" - inkscape:cy="5.4834765" + inkscape:zoom="22.627416" + inkscape:cx="11.460174" + inkscape:cy="2.920327" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> <rect - style="display:inline;opacity:0.95;fill:#24282c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713" width="27" height="26" x="0" y="1025.3622" /> <rect - style="display:inline;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713-4" width="27" height="1" diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index fd409c3..fb4b7bb 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -31,6 +31,13 @@ stage { font-size: 1em; font-weight: normal; } +.app-well-app.running > .overview-icon, .app-well-app.running:hover > .overview-icon, .app-well-app.running:active > .overview-icon, +.app-well-app.running:checked > .overview-icon { + background-color: transparent !important; + background-gradient-direction: none !important; + border: none !important; + border-radius: 0 !important; } + .popup-menu .modal-dialog-button { font-size: 1em; min-height: 20px; @@ -39,40 +46,40 @@ stage { border-radius: 2px; background-gradient-direction: none !important; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .popup-menu .modal-dialog-button:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .popup-menu .modal-dialog-button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .popup-menu .modal-dialog-button:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; - color: #5294E2; + color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .popup-menu .modal-dialog-button:active, .popup-menu .modal-dialog-button:active:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .popup-menu .modal-dialog-button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .candidate-page-button, .hotplug-notification-item, @@ -90,19 +97,17 @@ stage { transition-duration: 0; border-radius: 2px; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .candidate-page-button:hover, .hotplug-notification-item:hover, .hotplug-resident-eject-button:hover, .modal-dialog-button:hover, .modal-dialog-button-box .button:hover, .notification-button:hover, .notification-icon-button:hover, .hotplug-resident-mount:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .candidate-page-button:focus, .hotplug-notification-item:focus, .hotplug-resident-eject-button:focus, @@ -113,7 +118,6 @@ stage { .hotplug-resident-eject-button:active, .modal-dialog-button:active, .modal-dialog-button-box .button:active, .notification-button:active, .notification-icon-button:active, .hotplug-resident-mount:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -122,10 +126,9 @@ stage { .hotplug-resident-eject-button:insensitive, .modal-dialog-button:insensitive, .modal-dialog-button-box .button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .hotplug-resident-mount:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(102, 109, 132, 0.2); } StEntry { font-size: 1em; @@ -139,17 +142,17 @@ StEntry { color: #5c616c; background-color: #ffffff; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } StEntry:focus, StEntry:hover { color: #5c616c; background-color: #ffffff; border: 1px solid #5294E2; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } StEntry:insensitive { color: rgba(92, 97, 108, 0.55); background-color: #fbfbfb; border-color: 1px solid #e0e4ee; - box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); } + box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.05); } StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -488,7 +491,7 @@ StScrollBar { .candidate-popup-boxpointer { -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 5; @@ -499,7 +502,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } .background-menu { -boxpointer-gap: 4px; @@ -552,7 +555,7 @@ StScrollBar { padding: 8px; border-radius: 2px; } .switcher-list .item-box:outlined { - padding: 6px; + padding: 8px; border: 1px solid #5294E2; } .switcher-list .item-box:selected { color: #ffffff; @@ -626,7 +629,7 @@ StScrollBar { height: 2.1em; min-height: 27px; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } - #panel .dynamic-top-bar-white-btn { + #panel.dynamic-top-bar-white-btn { border-image: none; } #panel.unlock-screen, #panel.login-screen, @@ -1004,7 +1007,8 @@ StScrollBar { spacing: 12px; } #overview { - spacing: 24px; } + spacing: 24px; + background: #3c404e; } .overview-controls { padding-bottom: 32px; } @@ -1273,30 +1277,32 @@ StScrollBar { .app-view-control { padding: 4px 32px; background-gradient-direction: none; - background-color: rgba(42, 44, 51, 0.95); + text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.7); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-view-control:hover { - background-color: rgba(42, 44, 51, 0.95); + text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border-color: #5294E2; } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-view-control:checked { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; - border: 1px solid #5294E2; - background-color: #5294E2; } + background-color: #5294E2; + border-color: #5294E2; } .app-view-control:first-child:ltr, .app-view-control:last-child:rtl { - border-radius: 2px 0 0 2px; } + border-radius: 2px 0 0 2px; + border-right-width: 0; } .app-view-control:last-child:ltr, .app-view-control:first-child:rtl { - border-radius: 0 2px 2px 0; } + border-radius: 0 2px 2px 0; + border-left-width: 0; } .search-provider-icon:active, .search-provider-icon:checked, .list-search-result:active, .list-search-result:checked { - background-color: rgba(19, 20, 23, 0.85); } + background-color: rgba(31, 33, 40, 0.85); } .search-provider-icon:focus, .search-provider-icon:selected, @@ -1311,7 +1317,7 @@ StScrollBar { .app-well-app.app-folder:checked .overview-icon, .grid-search-result:active .overview-icon, .grid-search-result:checked .overview-icon { - background-color: rgba(19, 20, 23, 0.85); + background-color: rgba(31, 33, 40, 0.85); box-shadow: inset 0 0 #5294E2; } .app-well-app:hover .overview-icon, @@ -1328,6 +1334,18 @@ StScrollBar { border-image: none; background-image: none; } +.app-well-app.running > .overview-icon { + background: none !important; + text-shadow: black 0px 0px; + border-image: url("common-assets/dash/button-running-bottom.svg") 5 5 5 5; } + +.app-well-app.running:hover > .overview-icon { + border-image: url("common-assets/dash/button-running-hover-bottom.svg") 5 5 5 5; } + +.app-well-app.running:active > .overview-icon, +.app-well-app.running:checked > .overview-icon { + border-image: url("common-assets/dash/button-running-active-bottom.svg") 5 5 5 5; } + .search-provider-icon, .list-search-result, .app-well-app .overview-icon, .app-well-app.app-folder .overview-icon, @@ -1340,11 +1358,11 @@ StScrollBar { text-align: center; } .app-well-app.app-folder > .overview-icon { - background-color: rgba(8, 8, 9, 0.8); - border: 1px solid rgba(186, 195, 207, 0.3); } + background-color: rgba(46, 50, 60, 0.95); + border: 1px solid rgba(37, 40, 49, 0.95); } .app-well-app.app-folder:hover > .overview-icon { - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(71, 76, 92, 0.95); } .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { background-color: #5294E2; @@ -1355,12 +1373,11 @@ StScrollBar { .app-folder-popup { -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-color: transparent; - -arrow-border-width: 0; - -arrow-base: 0; - -arrow-rise: 0; - border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } + -arrow-background-color: rgba(46, 50, 60, 0.95); + -arrow-border-color: rgba(37, 40, 49, 0.95); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; } .app-folder-popup-bin { padding: 5px; } @@ -1416,7 +1433,7 @@ StScrollBar { color: #5c616c; } #message-tray { - background: #2a2c33; + background: #353945; background-repeat: repeat; height: 72px; border: solid rgba(0, 0, 0, 0.6); @@ -1492,20 +1509,17 @@ StScrollBar { padding-left: 6px; } .summary-source-button .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .summary-source-button:hover .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .summary-source-button:focus .summary-source, .summary-source-button:selected .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -1562,12 +1576,12 @@ StScrollBar { padding: 7px; caret-color: #BAC3CF; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -1595,12 +1609,12 @@ StScrollBar { StEntry.chat-response { padding: 7px; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StEntry.chat-response:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -1667,10 +1681,10 @@ StEntry.chat-response { border-width: 0; } #keyboard { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); border-width: 0; border-top-width: 1px; - border-color: rgba(0, 0, 0, 0.4); } + border-color: rgba(0, 0, 0, 0.2); } .keyboard-layout { spacing: 10px; @@ -1688,34 +1702,30 @@ StEntry.chat-response { box-shadow: none; background-gradient-direction: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(0, 0, 0, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -1782,28 +1792,28 @@ StEntry.chat-response { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .login-dialog-logo-bin { padding: 24px 0px; } @@ -1937,7 +1947,7 @@ StEntry.chat-response { .screen-shield-notifications-container .screen-shield-notification-source { padding: 12px 6px; border: 1px solid rgba(186, 195, 207, 0.2); - background-color: rgba(42, 44, 51, 0.45); + background-color: rgba(53, 57, 69, 0.45); color: #BAC3CF; border-radius: 4px; } .screen-shield-notifications-container .notification { @@ -1951,7 +1961,7 @@ StEntry.chat-response { padding: 0px 0px 0px 12px; } #panel.lock-screen { - background-color: rgba(42, 44, 51, 0.5); } + background-color: rgba(53, 57, 69, 0.5); } .screen-shield-background { background: black; @@ -2008,12 +2018,12 @@ StEntry.chat-response { selection-background-color: #5294E2; selected-color: #ffffff; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog StEntry:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -2046,7 +2056,7 @@ StEntry.chat-response { .lg-extension { border: 1px solid rgba(0, 0, 0, 0.7); border-radius: 2px; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); padding: 4px; } .lg-extension-name { diff --git a/common/gnome-shell/3.14/sass/_colors.scss b/common/gnome-shell/3.14/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/gnome-shell/3.14/sass/_colors.scss +++ b/common/gnome-shell/3.14/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $fg_color: if($variant =='light', #5c616c, #D3DAE3); $selected_fg_color: #ffffff; $selected_bg_color: #5294E2; $selected_borders_color: darken($selected_bg_color, 20%); -$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); - -$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); - -$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); -$button_border: $entry_border; - $header_bg: red; @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); -$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); +$header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $osd_insensitive_bg_color: darken($osd_bg_color, 3%); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); $osd_borders_color: transparentize(black, 0.3); -$panel_bg: darken($osd_bg_color, 4.7%); -$panel_fg: $osd_fg_color; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // Minimize, Maximize -$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); -$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $wm_button_active_bg: $selected_bg_color; -$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); -$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); -$wm_button_hover_border: $selected_bg_color; -$wm_button_active_border: $selected_bg_color; +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 9aee0a1..d8d6780 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -614,7 +614,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu @@ -641,7 +641,7 @@ StScrollBar { background: none; border: none; border-radius: 5px; - border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; .osd-monitor-label { font-size: 3em; } @@ -686,7 +686,7 @@ StScrollBar { border-radius: 2px; &:outlined { - padding: 6px; + padding: 8px; border: 1px solid $selected_bg_color; } @@ -802,7 +802,7 @@ StScrollBar { border-image: url('common-assets/panel/panel.svg') 1 1 1 1; // Fix dynamic top bar extension - .dynamic-top-bar-white-btn { border-image: none; } + &.dynamic-top-bar-white-btn { border-image: none; } &.unlock-screen, &.login-screen, @@ -1272,7 +1272,10 @@ StScrollBar { // // Overview // -#overview { spacing: 24px; } +#overview { + spacing: 24px; + background: lighten(opacify($dark_sidebar_bg, 1), 3%); +} .overview-controls { padding-bottom: 32px; } @@ -1613,22 +1616,20 @@ StScrollBar { padding: 4px 32px; background-gradient-direction: none; - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: rgba(0,0,0,0.7); + @include button(osd); - &:hover { - background-color: $osd_bg_color; - color: $osd_fg_color; + &:hover { @include button(osd-hover); } + &:checked { + color: $selected_fg_color; + background-color: $selected_bg_color; border-color: $selected_bg_color; } - &:checked { @include button(osd-active); } &:first-child:ltr, - &:last-child:rtl { border-radius: 2px 0 0 2px; } + &:last-child:rtl { border-radius: 2px 0 0 2px; border-right-width: 0; } &:last-child:ltr, - &:first-child:rtl { border-radius: 0 2px 2px 0; } + &:first-child:rtl { border-radius: 0 2px 2px 0; border-left-width: 0;} } // @@ -1669,6 +1670,27 @@ StScrollBar { } } +.app-well-app.running { + > .overview-icon { + @extend %reset_style; + background: none !important; + + text-shadow: black 0px 0px; + border-image: url("common-assets/dash/button-running-bottom.svg") 5 5 5 5; + } + &:hover > .overview-icon { + @extend %reset_style; + + border-image: url("common-assets/dash/button-running-hover-bottom.svg") 5 5 5 5; + } + &:active > .overview-icon, + &:checked > .overview-icon { + @extend %reset_style; + + border-image: url("common-assets/dash/button-running-active-bottom.svg") 5 5 5 5; + } +} + %icon_tile { color: $selected_fg_color; border-radius: 2px; @@ -1684,12 +1706,12 @@ StScrollBar { .app-well-app.app-folder { > .overview-icon { - background-color: transparentize(darken($panel_bg,10%), 0.15); - border: 1px solid transparentize($osd_fg_color, 0.7); + background-color: darken($dark_sidebar_bg, 3%); + border: 1px solid darken($dark_sidebar_bg, 7%); } &:hover > .overview-icon { - background-color: lighten($panel_bg, 10%); + background-color: lighten($dark_sidebar_bg, 8%); } &:active > .overview-icon, &:checked > .overview-icon { @@ -1704,12 +1726,12 @@ StScrollBar { .app-folder-popup { //expanded collection -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-color: transparent; - -arrow-border-width: 0; - -arrow-base: 0; - -arrow-rise: 0; - border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + -arrow-background-color: darken($dark_sidebar_bg, 3%); + -arrow-border-color: darken($dark_sidebar_bg, 7%); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; + } .app-folder-popup-bin { padding: 5px; } .app-folder-icon { @@ -2059,7 +2081,7 @@ StEntry.chat-response { background-color: $osd_bg_color; border-width: 0; border-top-width: 1px; - border-color: transparentize(black, 0.6); + border-color: transparentize(black, 0.8); } .keyboard-layout { diff --git a/common/gnome-shell/3.14/sass/_drawing.scss b/common/gnome-shell/3.14/sass/_drawing.scss index 5ab1463..7301495 100644 --- a/common/gnome-shell/3.14/sass/_drawing.scss +++ b/common/gnome-shell/3.14/sass/_drawing.scss @@ -20,41 +20,41 @@ color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==insensitive { color: $insensitive_fg_color; background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); - box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95); } @if $t==osd { color: $osd_fg_color; - background-color: transparentize(black, 0.8); - border: 1px solid transparentize(black, 0.6); + background-color: $osd_entry_bg; + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { - color: $osd_fg_color; - background-color: transparentize(black, 0.8); + color: $selected_fg_color; + background-color: $selected_bg_color; border: 1px solid $selected_bg_color; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { - color: $osd_insensitive_fg_color; - background-color: transparentize(black, 0.9); - border-color: 1px solid transparentize(black, 0.6); + color: transparentize($osd_fg_color, 0.45); + background-color: transparentize($osd_entry_bg, 0.15); + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -68,7 +68,6 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 black; @if $t==normal { // @@ -77,6 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -86,15 +86,17 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus-hover { // // focused button // - color: $selected_bg_color; + color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -102,8 +104,9 @@ // hovered button // color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + background-color: lighten($button_bg, 5%); + border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -113,6 +116,7 @@ color: $selected_fg_color; background-color: $selected_bg_color; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px $selected_bg_color; } @else if $t==insensitive { @@ -122,6 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -129,8 +134,8 @@ // normal osd button // color: $osd_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border: 1px solid darken($osd_button_border, 12%); + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -138,8 +143,8 @@ // active osd button // color: $osd_fg_color; - border: 1px solid $selected_bg_color; - background-color: transparentize(black, 0.7); + border: 1px solid darken($osd_button_border, 22%); + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -156,7 +161,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border: 1px solid darken($osd_button_border, 12%); + background-color: transparentize($osd_button_bg, 0.15); } } diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg b/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg index b9e8761..ad2de78 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-bottom.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="33.341558" - inkscape:cy="21.66656" + inkscape:zoom="5.6568542" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> <g - id="g4208" - transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> + id="g4136" + transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> <path - inkscape:connector-curvature="0" id="rect4749-1" - d="m 48,1004.3622 0,1 -45,0 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,1 -46,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-44 c 0,-1.108 0.892,-2 2,-2 l 46,0 z" - style="display:inline;opacity:0.6800001;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="csscccc" inkscape:connector-curvature="0" id="rect4749-48" - d="m 3,1005.3622 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,-46 z" - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg index 2d7ca3b..6d0c2d2 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-bottom.svg @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> <inkscape:grid type="xygrid" id="grid5349" /> @@ -48,7 +49,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749" - width="47" - height="48.000019" - x="-1052.3622" - y="-48.000019" - transform="matrix(0,-1,-1,0,0,0)" /> - <rect - style="display:inline;opacity:0.68000034;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749-4" - width="1" - height="48.000019" - x="-1005.3622" - y="-48.000019" - transform="matrix(0,-1,-1,0,0,0)" /> + <g + id="g4136" + transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> + <rect + y="1004.3622" + x="0" + height="48.000019" + width="47" + id="rect4749" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1004.3622" + x="47" + height="48.000019" + width="1" + id="rect4749-4" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg index e80ed3f..c666279 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-left.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="32.981286" - inkscape:cy="14.79234" + inkscape:zoom="7.9999996" + inkscape:cx="15.785874" + inkscape:cy="23.97024" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -59,14 +59,14 @@ id="layer1" transform="translate(0,-1004.3622)"> <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4749" width="47" height="48.000019" x="0" y="1004.3622" /> <rect - style="display:inline;opacity:0.68;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4749-4" width="1" height="48.000019" diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg index 5c68f7f..72a0403 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-right.svg @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="7.9999996" + inkscape:cx="15.758223" + inkscape:cy="23.965229" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> <inkscape:grid type="xygrid" id="grid5349" /> @@ -48,7 +49,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749" - width="47" - height="48.000019" - x="-48" - y="1004.3622" - transform="scale(-1,1)" /> - <rect - style="display:inline;opacity:0.68000034;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749-4" - width="1" - height="48.000019" - x="-1" - y="1004.3622" - transform="scale(-1,1)" /> + <g + id="g4136" + transform="matrix(-1,0,0,1,48,0)"> + <rect + y="1004.3622" + x="0" + height="48.000019" + width="47" + id="rect4749" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1004.3622" + x="47" + height="48.000019" + width="1" + id="rect4749-4" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg b/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg index b56904e..a501da7 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-extended-top.svg @@ -23,11 +23,11 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="-9.1188503" - inkscape:cy="22.886139" + inkscape:zoom="11.313708" + inkscape:cx="12.059039" + inkscape:cy="31.364908" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -35,7 +35,8 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> + inkscape:snap-bbox-edge-midpoints="true" + showborder="false"> <inkscape:grid type="xygrid" id="grid5349" /> @@ -48,7 +49,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,21 +58,23 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <rect - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749" - width="47" - height="48.000019" - x="1004.3622" - y="-48.000019" - transform="matrix(0,1,-1,0,0,0)" /> - <rect - style="display:inline;opacity:0.68000034;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4749-4" - width="1" - height="48.000019" - x="1051.3622" - y="-48.000019" - transform="matrix(0,1,-1,0,0,0)" /> + <g + id="g4136" + transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> + <rect + y="1004.3622" + x="0" + height="48.000019" + width="47" + id="rect4749" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1004.3622" + x="47" + height="48.000019" + width="1" + id="rect4749-4" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-left.svg b/common/gnome-shell/3.16/common-assets/dash/dash-left.svg index 12d3b6b..5fb7bf2 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-left.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-left.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="-8.268968" - inkscape:cy="37.523776" + inkscape:zoom="45.254834" + inkscape:cx="43.604809" + inkscape:cy="43.393322" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,12 +58,12 @@ id="layer1" transform="translate(0,-1004.3622)"> <path - style="display:inline;opacity:0.68;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M 0 0 L 0 1 L 45 1 C 46.108 1 47 1.892 47 3 L 47 45 C 47 46.108 46.108 47 45 47 L 0 47 L 0 48 L 46 48 C 47.108 48 48 47.108 48 46 L 48 2 C 48 0.892 47.108 0 46 0 L 0 0 z " transform="translate(0,1004.3622)" id="rect4749-1" /> <path - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" id="rect4749-48" inkscape:connector-curvature="0" diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-right.svg b/common/gnome-shell/3.16/common-assets/dash/dash-right.svg index e7f7551..64c1e9b 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-right.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-right.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="-6.5243243" - inkscape:cy="14.85871" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -57,16 +57,21 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)"> - <path - style="display:inline;opacity:0.68000004;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 48,1004.3622 0,1 -45,0 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,1 -46,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-44 c 0,-1.108 0.892,-2 2,-2 l 46,0 z" - id="rect4749-1" - inkscape:connector-curvature="0" /> - <path - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 3,1005.3622 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,-46 z" - id="rect4749-48" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csscccc" /> + <g + id="g4136" + transform="matrix(-1,0,0,1,48,0)"> + <path + id="rect4749-1" + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="csscccc" + inkscape:connector-curvature="0" + id="rect4749-48" + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/dash-top.svg b/common/gnome-shell/3.16/common-assets/dash/dash-top.svg index 1d05a3c..5f52736 100644 --- a/common/gnome-shell/3.16/common-assets/dash/dash-top.svg +++ b/common/gnome-shell/3.16/common-assets/dash/dash-top.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="-6.5243243" - inkscape:cy="14.85871" + inkscape:cx="-0.050167206" + inkscape:cy="27.067669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -58,19 +58,20 @@ id="layer1" transform="translate(0,-1004.3622)"> <g - id="g4208" - transform="matrix(0,-1,-1,0,1052.3622,1052.3622)"> + id="g4136" + transform="matrix(0,1,-1,0,1052.3622,1004.3622)"> <path - inkscape:connector-curvature="0" id="rect4749-1" - d="m 48,1004.3622 0,1 -45,0 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,1 -46,0 c -1.108,0 -2,-0.892 -2,-2 l 0,-44 c 0,-1.108 0.892,-2 2,-2 l 46,0 z" - style="display:inline;opacity:0.68000016;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + transform="translate(0,1004.3622)" + d="m 0,0 0,1 45,0 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,1 46,0 c 1.108,0 2,-0.892 2,-2 L 48,2 C 48,0.892 47.108,0 46,0 L 0,0 Z" + style="display:inline;opacity:0.81000001;fill:#161a26;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="csscccc" inkscape:connector-curvature="0" id="rect4749-48" - d="m 3,1005.3622 c -1.108,0 -2,0.892 -2,2 l 0,42 c 0,1.108 0.892,2 2,2 l 45,0 0,-46 z" - style="display:inline;opacity:0.85;fill:#2f333b;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="m 45,1005.3622 c 1.108,0 2,0.892 2,2 l 0,42 c 0,1.108 -0.892,2 -2,2 l -45,0 0,-46 z" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> </g> </svg> diff --git a/common/gnome-shell/3.16/common-assets/misc/bg.svg b/common/gnome-shell/3.16/common-assets/misc/bg.svg index cf27958..feeddea 100644 --- a/common/gnome-shell/3.16/common-assets/misc/bg.svg +++ b/common/gnome-shell/3.16/common-assets/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="bg.svg"> <defs id="defs5388" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="14.604606" - inkscape:cy="20.53994" + inkscape:zoom="11.313708" + inkscape:cx="18.271674" + inkscape:cy="5.838404" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> <rect - style="display:inline;opacity:0.72;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.81;fill:none;fill-opacity:1;stroke:#161a26;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164-4-3" width="23" height="21.999889" @@ -67,7 +67,7 @@ rx="2.0000005" ry="1.9999999" /> <rect - style="display:inline;opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164" width="22" height="20.999971" @@ -78,7 +78,7 @@ <g transform="translate(-425.99995,658.36226)" id="g4271" - style="display:inline;opacity:0.75"> + style="display:inline;opacity:0.65"> <rect ry="8" rx="8" diff --git a/common/gnome-shell/3.16/common-assets/misc/button-box.svg b/common/gnome-shell/3.16/common-assets/misc/button-box.svg index 7435084..036f0d1 100644 --- a/common/gnome-shell/3.16/common-assets/misc/button-box.svg +++ b/common/gnome-shell/3.16/common-assets/misc/button-box.svg @@ -40,8 +40,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="-0.14173931" - inkscape:cy="13.244492" + inkscape:cx="9.376447" + inkscape:cy="10.14915" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -83,15 +83,8 @@ id="layer1" transform="translate(-5,-1027.3622)"> <path - style="opacity:0.67;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 0,3.6512857e-5 0,17 c 0,1.108 0.892,2 2,2 l 18,0 c 1.108,0 2,-0.892 2,-2 L 22,3.6512857e-5 Z M 21,1.0000365 21,17 c 0,0.554 -0.446,1 -1,1 L 2,18 C 1.446,18 1,17.554 1,17 L 1,1.0000365 Z" - transform="translate(5,1027.3622)" - id="rect4147" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csssscccsssscc" /> - <path - style="opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="m 26,1027.3622 0,17 c 0,0.554 -0.446,1 -1,1 l -18,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-17 z" + style="opacity:0.95;fill:#353945;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 27,1027.3622 0,17.9445 c 0,0.5848 -0.4906,1.0555 -1.1,1.0555 l -19.8,0 c -0.6094,0 -1.1,-0.4707 -1.1,-1.0555 l 0,-17.9445 z" id="rect4145-1" inkscape:connector-curvature="0" sodipodi:nodetypes="csssscc" /> diff --git a/common/gnome-shell/3.16/common-assets/misc/osd.svg b/common/gnome-shell/3.16/common-assets/misc/osd.svg index e7a4202..df41a00 100644 --- a/common/gnome-shell/3.16/common-assets/misc/osd.svg +++ b/common/gnome-shell/3.16/common-assets/misc/osd.svg @@ -15,7 +15,7 @@ id="svg5386" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="notification.svg"> + sodipodi:docname="osd.svg"> <defs id="defs5388" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="8.7900421" - inkscape:cy="21.131226" + inkscape:zoom="16" + inkscape:cx="23.210075" + inkscape:cy="11.575503" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -58,7 +58,7 @@ id="layer1" transform="translate(0,-1020.3622)"> <rect - style="display:inline;opacity:0.8;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.85;fill:none;fill-opacity:1;stroke:#0f1116;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164-4-3" width="23" height="21.999889" @@ -67,7 +67,7 @@ rx="2.0000005" ry="1.9999999" /> <rect - style="display:inline;opacity:0.95;fill:#252a2f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4164" width="22" height="20.999971" @@ -78,7 +78,7 @@ <g transform="translate(-425.99995,658.36226)" id="g4271" - style="display:inline;opacity:0.75"> + style="display:inline;opacity:0.65"> <rect ry="8" rx="8" diff --git a/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg b/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg index 7e48535..c955747 100644 --- a/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg +++ b/common/gnome-shell/3.16/common-assets/panel/panel-overview.svg @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="14.96115" - inkscape:cy="0.2334765" + inkscape:zoom="11.313708" + inkscape:cx="12.34771" + inkscape:cy="7.591971" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> <rect - style="display:inline;opacity:0.95;fill:#24282c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713" width="27" height="26" x="0" y="1025.3622" /> <rect - style="display:inline;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713-4" width="27" height="1" diff --git a/common/gnome-shell/3.16/common-assets/panel/panel.svg b/common/gnome-shell/3.16/common-assets/panel/panel.svg index 106ffac..c0a64da 100644 --- a/common/gnome-shell/3.16/common-assets/panel/panel.svg +++ b/common/gnome-shell/3.16/common-assets/panel/panel.svg @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="8" - inkscape:cx="17.27365" - inkscape:cy="5.4834765" + inkscape:zoom="22.627416" + inkscape:cx="11.460174" + inkscape:cy="2.920327" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" units="px" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -48,7 +48,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -58,14 +58,14 @@ id="layer1" transform="translate(0,-1025.3622)"> <rect - style="display:inline;opacity:0.95;fill:#24282c;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.95;fill:#252a35;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713" width="27" height="26" x="0" y="1025.3622" /> <rect - style="display:inline;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="display:inline;opacity:0.85;fill:#0f1116;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4713-4" width="27" height="1" diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index eecc3a4..34072e2 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -31,73 +31,69 @@ stage { .notification-banner:hover .notification-button, .notification-banner:focus .notification-button, .hotplug-notification-item { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .button:focus, .notification-banner .notification-button:focus, .hotplug-notification-item:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .button:hover, .notification-banner .notification-button:hover, .hotplug-notification-item:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .button:hover:focus, .notification-banner .notification-button:hover:focus, .hotplug-notification-item:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; - color: #5294E2; + color: #5c616c; background-color: #fbfbfc; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .button:active, .notification-banner .notification-button:active, .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, .hotplug-notification-item:active:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .button:insensitive, .notification-banner .notification-button:insensitive, .hotplug-notification-item:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .modal-dialog-button-box .button { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .modal-dialog-button-box .button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .modal-dialog-button-box .button:focus { color: #5294E2; } .modal-dialog-button-box .button:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .modal-dialog-button-box .button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } StEntry { padding: 7px; @@ -109,17 +105,17 @@ StEntry { color: #5c616c; background-color: #ffffff; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } StEntry:focus, StEntry:hover { color: #5c616c; background-color: #ffffff; border: 1px solid #5294E2; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } StEntry:insensitive { color: rgba(92, 97, 108, 0.55); background-color: #fbfbfb; border-color: 1px solid #e0e4ee; - box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); } + box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.05); } StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -458,7 +454,7 @@ StScrollBar { .candidate-popup-boxpointer { -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 5; @@ -469,7 +465,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; } + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } .background-menu { -boxpointer-gap: 4px; @@ -768,18 +764,18 @@ StScrollBar { .world-clocks-button:focus, .message-list-section-title:hover, .message-list-section-title:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .datemenu-today-button:active, .world-clocks-button:active, .message-list-section-title:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .datemenu-today-button .date-label { font-size: 1.5em; } @@ -1021,7 +1017,8 @@ StScrollBar { spacing: 12px; } #overview { - spacing: 24px; } + spacing: 24px; + background: #3c404e; } .overview-controls { padding-bottom: 32px; } @@ -1236,30 +1233,31 @@ StScrollBar { .app-view-control { padding: 4px 32px; - background-color: rgba(42, 44, 51, 0.95); + text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border-color: rgba(0, 0, 0, 0.7); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .app-view-control:hover { - background-color: rgba(42, 44, 51, 0.95); + text-shadow: 0 1px rgba(255, 255, 255, 0); color: #BAC3CF; - border-color: #5294E2; } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .app-view-control:checked { - text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; - border: 1px solid #5294E2; background-color: #5294E2; } .app-view-control:first-child:ltr, .app-view-control:last-child:rtl { - border-radius: 2px 0 0 2px; } + border-radius: 2px 0 0 2px; + border-right-width: 0; } .app-view-control:last-child:ltr, .app-view-control:first-child:rtl { - border-radius: 0 2px 2px 0; } + border-radius: 0 2px 2px 0; + border-left-width: 0; } .search-provider-icon:active, .search-provider-icon:checked, .list-search-result:active, .list-search-result:checked { - background-color: rgba(19, 20, 23, 0.85); } + background-color: rgba(31, 33, 40, 0.85); } .search-provider-icon:focus, .search-provider-icon:selected, @@ -1274,7 +1272,7 @@ StScrollBar { .app-well-app.app-folder:checked .overview-icon, .grid-search-result:active .overview-icon, .grid-search-result:checked .overview-icon { - background-color: rgba(19, 20, 23, 0.85); + background-color: rgba(31, 33, 40, 0.85); box-shadow: inset 0 0 #5294E2; } .app-well-app:hover .overview-icon, @@ -1309,11 +1307,11 @@ StScrollBar { text-align: center; } .app-well-app.app-folder > .overview-icon { - background-color: rgba(8, 8, 9, 0.8); - border: 1px solid rgba(186, 195, 207, 0.3); } + background-color: rgba(46, 50, 60, 0.95); + border: 1px solid rgba(37, 40, 49, 0.95); } .app-well-app.app-folder:hover > .overview-icon { - background-color: rgba(54, 57, 65, 0.95); } + background-color: rgba(71, 76, 92, 0.95); } .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { background-color: #5294E2; @@ -1324,12 +1322,11 @@ StScrollBar { .app-folder-popup { -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-color: transparent; - -arrow-border-width: 0; - -arrow-base: 0; - -arrow-rise: 0; - border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } + -arrow-background-color: rgba(46, 50, 60, 0.95); + -arrow-border-color: rgba(37, 40, 49, 0.95); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; } .app-folder-popup-bin { padding: 5px; } @@ -1507,7 +1504,7 @@ StScrollBar { color: pink; } .legacy-tray { - background-color: rgba(31, 33, 37, 0.95); } + background-color: rgba(43, 46, 55, 0.95); } .legacy-tray:ltr { border-radius: 0 2px 0 0; border-left-width: 0; } @@ -1542,10 +1539,10 @@ StScrollBar { border-width: 0; } #keyboard { - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); border-width: 0; border-top-width: 1px; - border-color: rgba(0, 0, 0, 0.4); } + border-color: rgba(0, 0, 0, 0.2); } .keyboard-layout { spacing: 10px; @@ -1562,34 +1559,30 @@ StScrollBar { border-radius: 3px; box-shadow: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.35); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #BAC3CF; - border: 1px solid #5294E2; - background-color: rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; - color: #555a62; - border: 1px solid rgba(0, 0, 0, 0.45); - background-color: rgba(0, 0, 0, 0.15); } + color: #5d626e; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(102, 109, 132, 0.2); } .keyboard-subkeys { color: #BAC3CF; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: rgba(42, 44, 51, 0.95); + -arrow-background-color: rgba(53, 57, 69, 0.95); -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -1656,28 +1649,28 @@ StScrollBar { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #5c616c; - background-color: #fbfbfc; - border: 1px solid #5294E2; } + background-color: white; + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); - background-color: rgba(251, 251, 252, 0.55); } + background-color: rgba(251, 251, 252, 0.55); + box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } .login-dialog-logo-bin { padding: 24px 0px; } @@ -1811,7 +1804,7 @@ StScrollBar { .screen-shield-notifications-container .screen-shield-notification-source { padding: 12px 6px; border: 1px solid rgba(186, 195, 207, 0.2); - background-color: rgba(42, 44, 51, 0.45); + background-color: rgba(53, 57, 69, 0.45); color: #BAC3CF; border-radius: 4px; } .screen-shield-notifications-container .notification { @@ -1825,7 +1818,7 @@ StScrollBar { padding: 0px 0px 0px 12px; } #panel.lock-screen { - background-color: rgba(42, 44, 51, 0.5); } + background-color: rgba(53, 57, 69, 0.5); } .screen-shield-background { background: black; @@ -1882,12 +1875,12 @@ StScrollBar { selection-background-color: #5294E2; selected-color: #ffffff; color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(102, 109, 132, 0.35); + border: 1px solid rgba(26, 28, 34, 0.35); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog StEntry:focus { - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #ffffff; + background-color: #5294E2; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } @@ -1920,7 +1913,7 @@ StScrollBar { .lg-extension { border: 1px solid rgba(0, 0, 0, 0.7); border-radius: 2px; - background-color: rgba(42, 44, 51, 0.95); + background-color: rgba(53, 57, 69, 0.95); padding: 4px; } .lg-extension-name { diff --git a/common/gnome-shell/3.16/sass/_colors.scss b/common/gnome-shell/3.16/sass/_colors.scss index 9c51858..47daa0f 100644 --- a/common/gnome-shell/3.16/sass/_colors.scss +++ b/common/gnome-shell/3.16/sass/_colors.scss @@ -2,15 +2,15 @@ // it gets @if ed depending on $variant -$base_color: if($variant =='light', #ffffff, #383C45); +$base_color: if($variant =='light', #ffffff, #404552); $text_color: if($variant == 'light', #5c616c, #D3DAE3); -$bg_color: if($variant =='light', #F5F6F7, #444852); +$bg_color: if($variant =='light', #F5F6F7, #383C4A); $fg_color: if($variant =='light', #5c616c, #D3DAE3); $selected_fg_color: #ffffff; $selected_bg_color: #5294E2; $selected_borders_color: darken($selected_bg_color, 20%); -$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,10%)); +$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%)); $link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); @@ -28,63 +28,67 @@ $suggested_color: #4DADD4; $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); $insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); - -$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); - -$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); -$button_border: $entry_border; - $header_bg: red; @if $transparency=='true' and $variant=='light' { $header_bg: transparentize(#e7e8eb, 0.05); } @if $transparency=='false' and $variant=='light' { $header_bg: #e7e8eb; } -@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343b, 0.03); } -@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343b; } +@if $transparency=='true' and ($variant=='dark' or $darker=='true') { $header_bg: transparentize(#2f343f, 0.03); } +@if $transparency=='false' and ($variant=='dark' or $darker=='true') { $header_bg: #2f343f; } $header_bg_backdrop: if($darker == 'true' or $variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); -$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); +$header_border: if($variant == 'light' and $darker=='false', darken($header_bg, 7%), darken($header_bg, 4%)); $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); -$dark_sidebar_bg: if($transparency == 'true', transparentize(#3c4049, 0.05), #3c4049); +$dark_sidebar_bg: if($transparency == 'true', transparentize(#353945, 0.05), #353945); $dark_sidebar_fg: #BAC3CF; -$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 10%)); +$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%)); $osd_fg_color: $dark_sidebar_fg; -$osd_bg_color: darken($dark_sidebar_bg, 8%); +$osd_bg_color: $dark_sidebar_bg; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $osd_insensitive_bg_color: darken($osd_bg_color, 3%); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); $osd_borders_color: transparentize(black, 0.3); -$panel_bg: darken($osd_bg_color, 4.7%); -$panel_fg: $osd_fg_color; +$panel_bg: darken($dark_sidebar_bg, 4.7%); +$panel_fg: $dark_sidebar_fg; + +$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); +$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); + +$header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); +$header_entry_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); + +$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_border: $entry_border; + +$header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); +$header_button_border: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); //WM Buttons // Close -$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f37076, #e45e65); -$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f79da1, #f48085); -$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #ef4048, #e6262f); +$wm_button_close_bg: if($variant == 'light' and $darker == 'false', #f46067, #cc575d); +$wm_button_close_hover_bg: if($variant == 'light' and $darker == 'false', #f68086, #d7787d); +$wm_button_close_active_bg: if($variant == 'light' and $darker == 'false', #f13039, #be3841); -$wm_icon_close_bg: $selected_fg_color; -$wm_icon_close_hover_bg: $selected_fg_color; -$wm_icon_close_active_bg: $selected_fg_color; +$wm_icon_close_bg: if($variant == 'light' and $darker == 'false',#F8F8F9 , #2f343f); // Minimize, Maximize -$wm_button_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); -$wm_button_unfocused_bg: if($variant == 'light' and $darker == 'false', #f6f7f8, #2a3035); -$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #272c32); +$wm_button_hover_bg: if($variant == 'light' and $darker == 'false', #fdfdfd, #454C5C); $wm_button_active_bg: $selected_bg_color; -$wm_button_border: if($variant == 'light' and $darker == 'false', #d8dae0, #191C21); -$wm_button_unfocused_border: if($variant == 'light' and $darker == 'false', #dddee2, #1F2328); -$wm_button_hover_border: $selected_bg_color; -$wm_button_active_border: $selected_bg_color; +$wm_button_hover_border: if($variant == 'light' and $darker == 'false', #D1D3DA, #262932); -$wm_icon_bg: if($variant == 'light' and $darker == 'false', #8d93a4, #939ca8); -$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #b8bcc7, #686f78); -$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #70788d, #afb8c5); +$wm_icon_bg: if($variant == 'light' and $darker == 'false', #90949E, #90939B); +$wm_icon_unfocused_bg: if($variant == 'light' and $darker == 'false', #B6B8C0, #666A74); +$wm_icon_hover_bg: if($variant == 'light' and $darker == 'false', #7A7F8B, #C4C7CC); $wm_icon_active_bg: $selected_fg_color; diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 2578ae7..3b1647c 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -587,7 +587,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu @@ -1292,7 +1292,10 @@ StScrollBar { // // Overview // -#overview { spacing: 24px; } +#overview { + spacing: 24px; + background: lighten(opacify($dark_sidebar_bg, 1), 3%); +} .overview-controls { padding-bottom: 32px; } @@ -1555,22 +1558,19 @@ StScrollBar { .app-view-control { padding: 4px 32px; - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: rgba(0,0,0,0.7); + @include button(osd); - &:hover { - background-color: $osd_bg_color; - color: $osd_fg_color; - border-color: $selected_bg_color; + &:hover { @include button(osd-hover); } + &:checked { + color: $selected_fg_color; + background-color: $selected_bg_color; } - &:checked { @include button(osd-active); } &:first-child:ltr, - &:last-child:rtl { border-radius: 2px 0 0 2px; } + &:last-child:rtl { border-radius: 2px 0 0 2px; border-right-width: 0; } &:last-child:ltr, - &:first-child:rtl { border-radius: 0 2px 2px 0; } + &:first-child:rtl { border-radius: 0 2px 2px 0; border-left-width: 0;} } // @@ -1633,12 +1633,12 @@ StScrollBar { .app-well-app.app-folder { > .overview-icon { - background-color: transparentize(darken($panel_bg,10%), 0.15); - border: 1px solid transparentize($osd_fg_color, 0.7); + background-color: darken($dark_sidebar_bg, 3%); + border: 1px solid darken($dark_sidebar_bg, 7%); } &:hover > .overview-icon { - background-color: lighten($panel_bg, 10%); + background-color: lighten($dark_sidebar_bg, 8%); } &:active > .overview-icon, &:checked > .overview-icon { @@ -1653,12 +1653,12 @@ StScrollBar { .app-folder-popup { //expanded collection -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-color: transparent; - -arrow-border-width: 0; - -arrow-base: 0; - -arrow-rise: 0; - border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + -arrow-background-color: darken($dark_sidebar_bg, 3%); + -arrow-border-color: darken($dark_sidebar_bg, 7%); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; + } .app-folder-popup-bin { padding: 5px; } .app-folder-icon { @@ -1880,7 +1880,7 @@ $legacy_icon_size: 24px; background-color: $osd_bg_color; border-width: 0; border-top-width: 1px; - border-color: transparentize(black, 0.6); + border-color: transparentize(black, 0.8); } .keyboard-layout { diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss index 5ab1463..738a69d 100644 --- a/common/gnome-shell/3.16/sass/_drawing.scss +++ b/common/gnome-shell/3.16/sass/_drawing.scss @@ -20,41 +20,41 @@ color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==insensitive { color: $insensitive_fg_color; background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); - box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95); } @if $t==osd { color: $osd_fg_color; - background-color: transparentize(black, 0.8); - border: 1px solid transparentize(black, 0.6); + background-color: $osd_entry_bg; + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { - color: $osd_fg_color; - background-color: transparentize(black, 0.8); + color: $selected_fg_color; + background-color: $selected_bg_color; border: 1px solid $selected_bg_color; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { - color: $osd_insensitive_fg_color; - background-color: transparentize(black, 0.9); - border-color: 1px solid transparentize(black, 0.6); + color: transparentize($osd_fg_color, 0.45); + background-color: transparentize($osd_entry_bg, 0.15); + border: 1px solid $osd_entry_border; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -68,7 +68,6 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 black; @if $t==normal { // @@ -77,6 +76,7 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus { @@ -86,15 +86,17 @@ color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==focus-hover { // // focused button // - color: $selected_bg_color; + color: $fg_color; background-color: $button_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==hover { @@ -102,8 +104,9 @@ // hovered button // color: $fg_color; - background-color: $button_bg; - border: 1px solid $selected_bg_color; + background-color: lighten($button_bg, 5%); + border: 1px solid $button_border; + box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95); } @else if $t==active { @@ -113,6 +116,7 @@ color: $selected_fg_color; background-color: $selected_bg_color; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px $selected_bg_color; } @else if $t==insensitive { @@ -122,6 +126,7 @@ color: $insensitive_fg_color; border: 1px solid transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); + box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @else if $t==osd { @@ -129,8 +134,8 @@ // normal osd button // color: $osd_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: $osd_button_bg; } @else if $t==osd-hover { @@ -138,8 +143,8 @@ // active osd button // color: $osd_fg_color; - border: 1px solid $selected_bg_color; - background-color: transparentize(black, 0.7); + border: 1px solid $osd_button_border; + background-color: opacify(lighten($osd_button_bg, 7%), 0.1); } @else if $t==osd-active { @@ -156,7 +161,7 @@ // insensitive osd button // color: $osd_insensitive_fg_color; - border: 1px solid transparentize(black, 0.55); - background-color: transparentize(black, 0.85); + border: 1px solid $osd_button_border; + background-color: transparentize($osd_button_bg, 0.15); } } |
