diff options
28 files changed, 699 insertions, 1359 deletions
@@ -0,0 +1,9 @@ +# Arc Theme + +Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell. Currently it only supports Gnome 3.16, but support for Gnome 3.14 will be added. + +### Installation +Copy the directory this README resides in to `/usr/share/themes` and apply the theme with `gnome-tweak-tool` or a similar program. + +### Preview + diff --git a/gnome-shell/_common.scss b/gnome-shell/_common.scss index c9bdc89..dd0ef43 100644 --- a/gnome-shell/_common.scss +++ b/gnome-shell/_common.scss @@ -75,6 +75,7 @@ StEntry { selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; transition-duration: 300ms; + border-radius: 20px; @include entry(normal); @@ -197,7 +198,7 @@ StScrollBar { color: $fg_color; background-color: transparentize($bg_color, 1); border: none; - border-image: url("misc/modal2.svg") 10 10 10 10; + border-image: url("misc/modal.svg") 10 10 10 10; padding: 0 6px 6px 6px; > * { padding: 14px; } @@ -209,7 +210,7 @@ StScrollBar { background-color: opacify($osd_bg_color, 1); border: solid 0px rgba(0,0,0,0.3); border-top: 1px; - border-radius: 0px 0px 2px 2px; + border-radius: 0px 0px 1px 1px; .button { @include button(osd); @@ -569,9 +570,9 @@ StScrollBar { .candidate-popup-boxpointer { -arrow-border-radius: 2px; - -arrow-background-color: $base_color; + -arrow-background-color: $panel_bg; -arrow-border-width: 1px; - -arrow-border-color: $borders_color; + -arrow-border-color: darken($panel_bg, 7%); -arrow-base: 5; -arrow-rise: 5; } @@ -642,7 +643,7 @@ StScrollBar { .switcher-list { background: none; border: none; - border-image: url("misc/modal.svg") 10 10 35 14; + border-image: url("misc/bg.svg") 10 10 35 14; border-radius: 3px; padding: 20px; @@ -709,7 +710,7 @@ StScrollBar { &-group { padding: 12px; } &-container { - border-image: url("misc/modal.svg") 10 10 35 14; + border-image: url("misc/bg.svg") 10 10 35 14; border-radius: 3px; padding: 20px; padding-bottom: 24px; @@ -764,9 +765,11 @@ StScrollBar { // #panel { background-color: $panel_bg; + border-color: darken($panel_bg, 9%); + border-bottom-width: 1px; font-weight: bold; height: 2.1em; - min-height: 23px; + min-height: 26px; &.unlock-screen, &.login-screen, @@ -775,6 +778,8 @@ StScrollBar { border-image: none; } + &:overview { background-color: transparentize(darken($panel_bg,10%), 0.15); } + #panelLeft, #panelCenter { // spacing between activities<>app menu and such spacing: 8px; } @@ -1369,34 +1374,30 @@ StScrollBar { // #dash { font-size: 1em; - color: $fg_color; - background-color: transparent; - padding: 10px 0px 10px 0px; - border: none; + color: $osd_fg_color; + background-color: transparentize($panel_bg, 0.08); + padding: 6px 0px 6px 0px; + border-color: transparentize(darken($panel_bg, 9%), 0.08); border-radius: 0px 3px 3px 0px; - border-image: url('dash/dash.svg') 6 11 10 10; .right &, &:rtl { - padding: 10px 0px 10px 0px; + padding: 6px 0px 6px 0px; border-radius: 3px 0 0 3px; - border-image: url('dash/dash-right.svg') 11 6 10 10; } .bottom & { - padding: 0px 10px 0px 10px; + padding: 0px 6px 0px 6px; border-radius: 3px 3px 0 0; - border-image: url('dash/dash-bottom.svg') 10 10 11 6; } .top & { - padding: 0px 10px 0px 10px; + padding: 0px 6px 0px 6px; border-radius: 0 0 3px 3px; - border-image: url('dash/dash-top.svg') 10 10 6 11; } .placeholder { - background-image: url("dash/dash-placeholder.svg"); + background-image: url("misc/dash-placeholder.svg"); background-size: contain; height: 24px; } @@ -1408,11 +1409,11 @@ StScrollBar { } .dash-item-container > StWidget { - padding: 0px 10px 0px 3px; + padding: 0px 4px 0px 5px; - .right &, &:rtl { padding: 0px 3px 0px 10px; } - .bottom & { padding: 10px 0px 3px 0px; } - .top & { padding: 3px 0px 10px 0px; } + .right &, &:rtl { padding: 0px 5px 0px 4px; } + .bottom & { padding: 4px 0px 5px 0px; } + .top & { padding: 5px 0px 4px 0px; } } //osd tooltip @@ -1434,31 +1435,21 @@ StScrollBar { #dash .app-well-app { .overview-icon, - .right & .overview-icon { - padding: 10px; - } - + .right & .overview-icon, .bottom & .overview-icon, .top & .overview-icon { padding: 10px; } &:hover .overview-icon, - .right &:hover .overview-icon { - background-color: $selected_bg_color; - } - + .right &:hover .overview-icon, .bottom &:hover .overview-icon, .top &:hover .overview-icon { background-color: $selected_bg_color; } &:active .overview-icon, - .right &:active .overview-icon { - box-shadow: none; - background-color: darken($selected_bg_color, 10%); - } - + .right &:active .overview-icon, .bottom &:active .overview-icon, .top &:active .overview-icon { box-shadow: none; @@ -1466,14 +1457,10 @@ StScrollBar { } &-running-dot { - width: 20px; + width: 11px; height: 2px; - margin-bottom: 4px; + margin-bottom: 6px; background-color: $selected_bg_color; - - .bottom &, .top & { - margin-bottom: 0px; - } } } @@ -1522,9 +1509,9 @@ StScrollBar { .app-view-control { padding: 4px 32px; - color: transparentize($selected_fg_color, 0.4); + color: transparentize($selected_fg_color, 0.2); background-color: transparentize(darken($panel_bg,10%), 0.15); - border-color: transparentize(darken($panel_bg,10%), 0.15); + border-color: transparentize($osd_fg_color, 0.7); &:hover { color: $selected_fg_color; @@ -1556,7 +1543,7 @@ StScrollBar { &:active, &:checked { background-color: transparentize(darken($osd_bg_color,10%),.1); } &:focus, &:selected, &:hover { - background-color: transparentize($osd_fg_color,.9); + background-color: transparentize($osd_fg_color,.6); transition-duration: 200ms; } } @@ -1572,13 +1559,13 @@ StScrollBar { &:active .overview-icon, &:checked .overview-icon { background-color: transparentize(darken($osd_bg_color,10%),.1); - box-shadow: inset 0 1px 2px $osd_borders_color; + box-shadow: inset 0 0 $selected_bg_color; } &:hover .overview-icon, &:focus .overview-icon, &:selected .overview-icon { - background-color: transparentize($osd_fg_color,.9); + background-color: transparentize($osd_fg_color,.6); transition-duration: 0ms; border-image: none; background-image: none; @@ -1607,7 +1594,8 @@ StScrollBar { .app-well-app.app-folder { > .overview-icon { - background-color: $panel_bg; + background-color: transparentize(darken($panel_bg,10%), 0.15); + border: 1px solid transparentize($osd_fg_color, 0.7); } &:hover > .overview-icon { @@ -1626,12 +1614,11 @@ StScrollBar { .app-folder-popup { //expanded collection -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-color: transparent; - -arrow-border-width: 0px; - -arrow-base: 0px; - -arrow-rise: 0px; - border-image: url("misc/modal.svg") 10 10 35 14; + -arrow-background-color: transparentize(darken($panel_bg,10%), 0.15); + -arrow-border-color: transparentize($osd_fg_color, 0.7); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; } .app-folder-popup-bin { padding: 5px; } .app-folder-icon { @@ -1669,15 +1656,19 @@ StScrollBar { .workspace-thumbnails { //container ala dash visible-width: 40px; //amount visible before hover spacing: 11px; - padding: 18px 9px 18px 18px; - background-color: transparent; - border-image: url('dash/dash-right.svg') 10 10 10 10; + padding: 12px; + padding-right: 7px; + border-radius: 3px 0 0 3px; + background-color: transparentize($panel_bg, 0.08); + border-color: transparentize(darken($panel_bg, 9%), 0.08); &:rtl { - padding: 18px 18px 18px 9px; - border-image: url('dash/dash.svg') 10 10 10 10; + padding: 12px; + padding-left: 7px; + border-radius: 0 3px 3px 0; } } + .workspace-thumbnail-indicator { border: 4px solid transparentize($selected_bg_color, 0.2); border-radius: 1px; @@ -1712,7 +1703,7 @@ StScrollBar { margin: 5px; padding: 10px; border-radius: 2px; - color: $osd_fg_color; + color: $fg_color; background-color: $bg_color; border: 0px solid transparent; box-shadow: 0 1px 5px transparentize(black, 0.8); @@ -1743,7 +1734,7 @@ StScrollBar { // Chat Bubbles .chat-body { spacing: 5px; } .chat-response { margin: 5px; } -.chat-log-message { color: darken($osd_fg_color,10%); } +.chat-log-message { color: $fg_color; } .chat-new-group { padding-top: 1em; } .chat-received { padding-left: 4px; @@ -1753,7 +1744,7 @@ StScrollBar { .chat-sent { padding-left: 18pt; - color: darken($osd_fg_color, 15%); + color: $selected_bg_color; &:rtl { padding-left: 0; padding-right: 18pt; } } @@ -1762,7 +1753,7 @@ StScrollBar { padding-left: 4px; font-size: 9pt; font-weight: bold; - color: darken($osd_fg_color,20%); + color: transparentize($fg_color, 0.4); &:rtl { padding-left: 0; padding-right: 4px; } } @@ -1898,16 +1889,18 @@ $legacy_icon_size: 24px; .candidate-popup-content { padding: 0.5em; spacing: 0.3em; + color: $osd_fg_color; } .candidate-index { padding: 0 0.5em 0 0; - color: darken($fg_color,10%); + color: lighten($osd_fg_color, 10%); } .candidate-box { padding: 0.3em 0.5em 0.3em 0.5em; border-radius: 4px; + color: $osd_fg_color; &:selected,&:hover { background-color: $selected_bg_color; color: $selected_fg_color; } } @@ -2132,12 +2125,14 @@ $legacy_icon_size: 24px; padding: 8px 8px 10px 8px; background-color: transparentize(black, 0.3); border: 1px solid black; - border-image: url("misc/osd.svg") 10 10 9 11; + border-image: url("misc/osd.svg") 10 10 9 11; border-radius: 2px; + color: $osd_fg_color; + & > #Toolbar { padding: 3px; - border: 1px solid $borders_color; - background-color: $bg_color; + border: 1px solid darken($osd_bg_color, 7%); + background-color: transparent; border-radius: 0px; } .labels { spacing: 4px; } @@ -2145,17 +2140,17 @@ $legacy_icon_size: 24px; -natural-hpadding: 12px; -minimum-hpadding: 6px; font-weight: bold; - color: transparentize($fg_color, 0.5); + color: $osd_fg_color; transition-duration: 100ms; padding-left: .3em; padding-right: .3em; &:hover { - color: $fg_color; + color: $selected_fg_color; text-shadow: black 0px 2px 2px; } &:selected { border-bottom-width: 0px; - color: $selected_fg_color; + color: $selected_bg_color; text-shadow: black 0px 2px 2px; } } @@ -2165,8 +2160,13 @@ $legacy_icon_size: 24px; .lg-dialog { StEntry { + background-color: transparentize(black, 0.7); + color: $osd_fg_color; selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; + border-color: transparentize($osd_fg_color, 0.7); + + &:focus { border-color: $selected_bg_color; } } .shell-link { color: $link_color; diff --git a/gnome-shell/_drawing.scss b/gnome-shell/_drawing.scss index 9c8ca57..0e60551 100644 --- a/gnome-shell/_drawing.scss +++ b/gnome-shell/_drawing.scss @@ -44,6 +44,8 @@ // //@extend %reset_style; + text-shadow: 0 1px transparentize($base_color, 1); + box-shadow: inset 0 0 transparentize($base_color, 1); @if $t==normal { // @@ -51,7 +53,6 @@ // color: $fg_color; background-color: $button_bg; - box-shadow: inset 0 0 transparentize($base_color, 1); border: 1px solid $button_border; } @@ -61,7 +62,6 @@ // color: $fg_color; background-color: $button_bg; - box-shadow: none; border: 1px solid $selected_bg_color; } @@ -71,7 +71,6 @@ // color: $selected_bg_color; background-color: $button_bg; - box-shadow: none; border: 1px solid $selected_bg_color; } @@ -81,7 +80,6 @@ // color: $fg_color; background-color: $button_bg; - box-shadow: none; border: 1px solid $selected_bg_color; } @@ -91,7 +89,6 @@ // color: $selected_fg_color; background-color: $selected_bg_color; - box-shadow: none; border: 1px solid $selected_bg_color; } @@ -108,7 +105,7 @@ // // normal osd button // - color: $osd_fg_color; + color: lighten($osd_fg_color, 10%); outline-color: transparentize($osd_fg_color, 0.7); border-color: transparentize($osd_fg_color, 0.7); background-color: darken($osd_bg_color, 5%); diff --git a/gnome-shell/dash/dash-bottom.svg b/gnome-shell/dash/dash-bottom.svg deleted file mode 100644 index 6f76257..0000000 --- a/gnome-shell/dash/dash-bottom.svg +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="65" - height="49" - viewBox="0 0 64.999999 49.000001" - id="svg4356" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="dash-bottom.svg"> - <defs - id="defs4358" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="16.979352" - inkscape:cy="46.227605" - inkscape:document-units="px" - inkscape:current-layer="g4305" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1366" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4904" - originx="-35.999999" - originy="-744.9998" /> - </sodipodi:namedview> - <metadata - id="metadata4361"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-36,-258.36236)"> - <g - id="g4305" - style="opacity:1" - transform="matrix(-1,0,0,-1,346,452.22457)"> - <g - id="g4305-9" - style="opacity:0.25"> - <rect - rx="8" - ry="8" - y="118.86221" - x="246.5" - height="73" - width="62" - id="rect4179-2-0-9-4-4-3-8-0" - style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="4" - ry="4" - y="122.8622" - x="250.49998" - height="65.000015" - width="54.000015" - id="rect4179-2-0-9-2-6" - style="opacity:0.45;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="5" - ry="5" - y="121.86221" - x="249.5" - height="67" - width="56" - id="rect4179-2-0-9-4-6-2" - style="opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="6" - ry="6" - y="120.86219" - x="248.5" - height="69.000023" - width="58" - id="rect4179-2-0-9-4-4-0" - style="opacity:0.125;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="7" - ry="7" - y="119.8622" - x="247.5" - height="71.000015" - width="60" - id="rect4179-2-0-9-4-4-3-3" - style="opacity:0.06199999;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="3" - ry="3" - y="123.3622" - x="251.5" - height="63.500011" - width="52" - id="rect4179-2-0-9-2-3-3" - style="opacity:0.5;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - <g - transform="matrix(0,1,1,0,-183.99995,135.86268)" - id="g5140-5" /> - <g - id="g4289" - transform="matrix(0,1,1,0,2.637851,108.86221)"> - <path - inkscape:connector-curvature="0" - id="rect4254" - d="m 28,248.36215 47,0 c 1.662,0 3,1.338 3,3 l 0,47 c 0,1.662 -1.338,3 -3,3 l -47,0 c -1.662,0 -3,-1.338 -3,-3 l 0,-47 c 0,-1.662 1.338,-3 3,-3 z" - style="opacity:0.95;fill:#25272d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - </g> - </g> -</svg> diff --git a/gnome-shell/dash/dash-right.svg b/gnome-shell/dash/dash-right.svg deleted file mode 100644 index 16990b3..0000000 --- a/gnome-shell/dash/dash-right.svg +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="49" - height="65" - viewBox="0 0 48.999999 65.000001" - id="svg4356" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="dash-right.svg"> - <defs - id="defs4358" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="45.254834" - inkscape:cx="4.6263238" - inkscape:cy="51.623152" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1366" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true" - showguides="false"> - <inkscape:grid - type="xygrid" - id="grid4904" - originx="-35.999999" - originy="-744.9998" /> - </sodipodi:namedview> - <metadata - id="metadata4361"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-36,-242.36236)"> - <g - id="g4305" - style="opacity:0.25" - transform="matrix(0,1,-1,0,229.86221,-2.6378515)"> - <rect - rx="8" - ry="8" - y="118.86221" - x="246.5" - height="73" - width="62" - id="rect4179-2-0-9-4-4-3-8" - style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="4" - ry="4" - y="122.8622" - x="250.49998" - height="65.000015" - width="54.000015" - id="rect4179-2-0-9-2" - style="opacity:0.45;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="5" - ry="5" - y="121.86221" - x="249.5" - height="67" - width="56" - id="rect4179-2-0-9-4-6" - style="opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="6" - ry="6" - y="120.86219" - x="248.5" - height="69.000023" - width="58" - id="rect4179-2-0-9-4-4" - style="opacity:0.125;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="7" - ry="7" - y="119.8622" - x="247.5" - height="71.000015" - width="60" - id="rect4179-2-0-9-4-4-3" - style="opacity:0.06199999;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="3" - ry="3" - y="123.3622" - x="251.5" - height="63.500011" - width="52" - id="rect4179-2-0-9-2-3" - style="opacity:0.5;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - <g - transform="matrix(-1,0,0,1,93.999527,-186.6378)" - id="g5140-5" /> - <g - id="g4289" - transform="matrix(-1,0,0,1,121,0)"> - <path - inkscape:connector-curvature="0" - id="rect4254" - d="m 28,248.36215 47,0 c 1.662,0 3,1.338 3,3 l 0,47 c 0,1.662 -1.338,3 -3,3 l -47,0 c -1.662,0 -3,-1.338 -3,-3 l 0,-47 c 0,-1.662 1.338,-3 3,-3 z" - style="opacity:0.95;fill:#25272d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - </g> -</svg> diff --git a/gnome-shell/dash/dash-top.svg b/gnome-shell/dash/dash-top.svg deleted file mode 100644 index e563de9..0000000 --- a/gnome-shell/dash/dash-top.svg +++ /dev/null @@ -1,148 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="65" - height="49" - viewBox="0 0 64.999999 49.000001" - id="svg4356" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="dash-top.svg"> - <defs - id="defs4358" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="8.0000001" - inkscape:cx="24.801326" - inkscape:cy="17.195282" - inkscape:document-units="px" - inkscape:current-layer="g4305" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1366" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4904" - originx="-35.999999" - originy="-744.9998" /> - </sodipodi:namedview> - <metadata - id="metadata4361"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-36,-258.36236)"> - <g - id="g4305" - style="opacity:1" - transform="matrix(-1,0,0,-1,346,452.22457)"> - <g - id="g4305-9" - style="opacity:0.25" - transform="matrix(1,0,0,-1,-5e-7,338.72442)"> - <rect - rx="8" - ry="8" - y="118.86221" - x="246.5" - height="73" - width="62" - id="rect4179-2-0-9-4-4-3-8-0" - style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="4" - ry="4" - y="122.8622" - x="250.49998" - height="65.000015" - width="54.000015" - id="rect4179-2-0-9-2-6" - style="opacity:0.45;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="5" - ry="5" - y="121.86221" - x="249.5" - height="67" - width="56" - id="rect4179-2-0-9-4-6-2" - style="opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="6" - ry="6" - y="120.86219" - x="248.5" - height="69.000023" - width="58" - id="rect4179-2-0-9-4-4-0" - style="opacity:0.125;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="7" - ry="7" - y="119.8622" - x="247.5" - height="71.000015" - width="60" - id="rect4179-2-0-9-4-4-3-3" - style="opacity:0.06199999;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="3" - ry="3" - y="123.3622" - x="251.5" - height="63.500011" - width="52" - id="rect4179-2-0-9-2-3-3" - style="opacity:0.5;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - <g - transform="matrix(0,-1,1,0,-183.99995,202.86174)" - id="g5140-5" /> - <g - id="g4289" - transform="matrix(0,-1,1,0,2.637851,229.86221)"> - <path - inkscape:connector-curvature="0" - id="rect4254" - d="m 28,248.36215 47,0 c 1.662,0 3,1.338 3,3 l 0,47 c 0,1.662 -1.338,3 -3,3 l -47,0 c -1.662,0 -3,-1.338 -3,-3 l 0,-47 c 0,-1.662 1.338,-3 3,-3 z" - style="opacity:0.95;fill:#25272d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - </g> - </g> -</svg> diff --git a/gnome-shell/dash/dash.svg b/gnome-shell/dash/dash.svg deleted file mode 100644 index 6afde21..0000000 --- a/gnome-shell/dash/dash.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="49" - height="65" - viewBox="0 0 48.999999 65.000001" - id="svg4356" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="dash.svg"> - <defs - id="defs4358" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="37.937324" - inkscape:cy="49.56597" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - units="px" - inkscape:window-width="1366" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:snap-bbox="true" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true" - showguides="false"> - <inkscape:grid - type="xygrid" - id="grid4904" - originx="-35.999999" - originy="-744.9998" /> - </sodipodi:namedview> - <metadata - id="metadata4361"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-36,-242.36236)"> - <g - id="g4305" - style="opacity:0.24999999" - transform="matrix(0,1,1,0,-108.86221,-2.6378515)"> - <rect - rx="8" - ry="8" - y="118.86221" - x="246.5" - height="73" - width="62" - id="rect4179-2-0-9-4-4-3-8" - style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="4" - ry="4" - y="122.8622" - x="250.49998" - height="65.000015" - width="54.000015" - id="rect4179-2-0-9-2" - style="opacity:0.45;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="5" - ry="5" - y="121.86221" - x="249.5" - height="67" - width="56" - id="rect4179-2-0-9-4-6" - style="opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="6" - ry="6" - y="120.86219" - x="248.5" - height="69.000023" - width="58" - id="rect4179-2-0-9-4-4" - style="opacity:0.125;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="7" - ry="7" - y="119.8622" - x="247.5" - height="71.000015" - width="60" - id="rect4179-2-0-9-4-4-3" - style="opacity:0.06199999;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="3" - ry="3" - y="123.3622" - x="251.5" - height="63.500011" - width="52" - id="rect4179-2-0-9-2-3" - style="opacity:0.5;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - <g - transform="translate(27.000473,-186.6378)" - id="g5140-5" /> - <g - id="g4289"> - <path - id="rect4254" - d="m 28,248.36215 47,0 c 1.662,0 3,1.338 3,3 l 0,47 c 0,1.662 -1.338,3 -3,3 l -47,0 c -1.662,0 -3,-1.338 -3,-3 l 0,-47 c 0,-1.662 1.338,-3 3,-3 z" - style="opacity:0.95;fill:#25272d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - </g> -</svg> diff --git a/gnome-shell/gnome-shell.css b/gnome-shell/gnome-shell.css index 555b20a..9edbfee 100644 --- a/gnome-shell/gnome-shell.css +++ b/gnome-shell/gnome-shell.css @@ -28,31 +28,38 @@ stage { padding: 5px 32px; transition-duration: 0; border-radius: 2px; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); border: 1px solid #cfd6e6; } .button:focus, .notification-banner .notification-button:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .button:hover, .notification-banner .notification-button:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .button:hover:focus, .notification-banner .notification-button:hover:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5294E2; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .button:active, .notification-banner .notification-button:active, .button:active:focus, .notification-banner .notification-button:active:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; - box-shadow: none; border: 1px solid #5294E2; } .button:insensitive, .notification-banner .notification-button:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(252, 253, 253, 0.55); } @@ -63,6 +70,7 @@ StEntry { selection-background-color: #5294E2; selected-color: #ffffff; transition-duration: 300ms; + border-radius: 20px; box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; @@ -160,7 +168,7 @@ StScrollBar { color: #5c616c; background-color: rgba(249, 250, 251, 0); border: none; - border-image: url("misc/modal2.svg") 10 10 10 10; + border-image: url("misc/modal.svg") 10 10 10 10; padding: 0 6px 6px 6px; } .modal-dialog > * { padding: 14px; } @@ -171,23 +179,31 @@ StScrollBar { background-color: #3c4049; border: solid 0px rgba(0, 0, 0, 0.3); border-top: 1px; - border-radius: 0px 0px 2px 2px; } + border-radius: 0px 0px 1px 1px; } .modal-dialog-button-box .button, .modal-dialog-button-box .notification-banner .notification-button, .notification-banner .modal-dialog-button-box .notification-button { - color: #A8ADB5; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #c4c7cc; outline-color: rgba(168, 173, 181, 0.3); border-color: rgba(168, 173, 181, 0.3); background-color: rgba(48, 52, 59, 0.95); } .modal-dialog-button-box .button:hover, .modal-dialog-button-box .notification-banner .notification-button:hover, .notification-banner .modal-dialog-button-box .notification-button:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border-color: #5294E2; background-color: rgba(48, 52, 59, 0.95); } .modal-dialog-button-box .button:focus, .modal-dialog-button-box .notification-banner .notification-button:focus, .notification-banner .modal-dialog-button-box .notification-button:focus { color: #5294E2; } .modal-dialog-button-box .button:active, .modal-dialog-button-box .notification-banner .notification-button:active, .notification-banner .modal-dialog-button-box .notification-button:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border-color: #5294E2; background-color: #5294E2; } .modal-dialog-button-box .button:insensitive, .modal-dialog-button-box .notification-banner .notification-button:insensitive, .notification-banner .modal-dialog-button-box .notification-button:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c6069; border-color: rgba(168, 173, 181, 0.2); background-image: rgba(53, 57, 65, 0.95); } @@ -427,9 +443,9 @@ StScrollBar { .candidate-popup-boxpointer { -arrow-border-radius: 2px; - -arrow-background-color: #ffffff; + -arrow-background-color: rgba(37, 39, 45, 0.95); -arrow-border-width: 1px; - -arrow-border-color: #dde3e9; + -arrow-border-color: rgba(21, 22, 25, 0.95); -arrow-base: 5; -arrow-rise: 5; } @@ -481,7 +497,7 @@ StScrollBar { .switcher-list { background: none; border: none; - border-image: url("misc/modal.svg") 10 10 35 14; + border-image: url("misc/bg.svg") 10 10 35 14; border-radius: 3px; padding: 20px; } .switcher-list-item-container { @@ -525,7 +541,7 @@ StScrollBar { .workspace-switcher-group { padding: 12px; } .workspace-switcher-container { - border-image: url("misc/modal.svg") 10 10 35 14; + border-image: url("misc/bg.svg") 10 10 35 14; border-radius: 3px; padding: 20px; padding-bottom: 24px; } @@ -561,12 +577,16 @@ StScrollBar { #panel { background-color: rgba(37, 39, 45, 0.95); + border-color: rgba(16, 17, 20, 0.95); + border-bottom-width: 1px; font-weight: bold; height: 2.1em; - min-height: 23px; } + min-height: 26px; } #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { background-color: transparent; border-image: none; } + #panel:overview { + background-color: rgba(14, 15, 17, 0.8); } #panel #panelLeft, #panel #panelCenter { spacing: 8px; } #panel .panel-corner { @@ -706,16 +726,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 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .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 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; - box-shadow: none; border: 1px solid #5294E2; } .datemenu-today-button .date-label { @@ -853,20 +875,23 @@ StScrollBar { background-color: #5294E2; } .message { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); border: 1px solid #cfd6e6; padding: 4px; } .message:hover, .message:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .message:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; - box-shadow: none; border: 1px solid #5294E2; } .message-icon-bin { @@ -1057,26 +1082,22 @@ StScrollBar { #dash { font-size: 1em; - color: #5c616c; - background-color: transparent; - padding: 10px 0px 10px 0px; - border: none; - border-radius: 0px 3px 3px 0px; - border-image: url("dash/dash.svg") 6 11 10 10; } + color: #A8ADB5; + background-color: rgba(37, 39, 45, 0.87); + padding: 6px 0px 6px 0px; + border-color: rgba(16, 17, 20, 0.87); + border-radius: 0px 3px 3px 0px; } .right #dash, #dash:rtl { - padding: 10px 0px 10px 0px; - border-radius: 3px 0 0 3px; - border-image: url("dash/dash-right.svg") 11 6 10 10; } + padding: 6px 0px 6px 0px; + border-radius: 3px 0 0 3px; } .bottom #dash { - padding: 0px 10px 0px 10px; - border-radius: 3px 3px 0 0; - border-image: url("dash/dash-bottom.svg") 10 10 11 6; } + padding: 0px 6px 0px 6px; + border-radius: 3px 3px 0 0; } .top #dash { - padding: 0px 10px 0px 10px; - border-radius: 0 0 3px 3px; - border-image: url("dash/dash-top.svg") 10 10 6 11; } + padding: 0px 6px 0px 6px; + border-radius: 0 0 3px 3px; } #dash .placeholder { - background-image: url("dash/dash-placeholder.svg"); + background-image: url("misc/dash-placeholder.svg"); background-size: contain; height: 24px; } #dash .empty-dash-drop-target { @@ -1084,13 +1105,13 @@ StScrollBar { height: 24px; } .dash-item-container > StWidget { - padding: 0px 10px 0px 3px; } + padding: 0px 4px 0px 5px; } .right .dash-item-container > StWidget, .dash-item-container > StWidget:rtl { - padding: 0px 3px 0px 10px; } + padding: 0px 5px 0px 4px; } .bottom .dash-item-container > StWidget { - padding: 10px 0px 3px 0px; } + padding: 4px 0px 5px 0px; } .top .dash-item-container > StWidget { - padding: 3px 0px 10px 0px; } + padding: 5px 0px 4px 0px; } .dash-label { border-radius: 3px; @@ -1103,27 +1124,18 @@ StScrollBar { -y-offset: 3px; -x-offset: 0; } -#dash .app-well-app .overview-icon, .right #dash .app-well-app .overview-icon { - padding: 10px; } -.bottom #dash .app-well-app .overview-icon, .top #dash .app-well-app .overview-icon { +#dash .app-well-app .overview-icon, .right #dash .app-well-app .overview-icon, .bottom #dash .app-well-app .overview-icon, .top #dash .app-well-app .overview-icon { padding: 10px; } -#dash .app-well-app:hover .overview-icon, .right #dash .app-well-app:hover .overview-icon { +#dash .app-well-app:hover .overview-icon, .right #dash .app-well-app:hover .overview-icon, .bottom #dash .app-well-app:hover .overview-icon, .top #dash .app-well-app:hover .overview-icon { background-color: #5294E2; } -.bottom #dash .app-well-app:hover .overview-icon, .top #dash .app-well-app:hover .overview-icon { - background-color: #5294E2; } -#dash .app-well-app:active .overview-icon, .right #dash .app-well-app:active .overview-icon { - box-shadow: none; - background-color: #2679db; } -.bottom #dash .app-well-app:active .overview-icon, .top #dash .app-well-app:active .overview-icon { +#dash .app-well-app:active .overview-icon, .right #dash .app-well-app:active .overview-icon, .bottom #dash .app-well-app:active .overview-icon, .top #dash .app-well-app:active .overview-icon { box-shadow: none; background-color: #2679db; } #dash .app-well-app-running-dot { - width: 20px; + width: 11px; height: 2px; - margin-bottom: 4px; + margin-bottom: 6px; background-color: #5294E2; } - .bottom #dash .app-well-app-running-dot, .top #dash .app-well-app-running-dot { - margin-bottom: 0px; } .show-apps .overview-icon { padding: 11px; @@ -1151,14 +1163,16 @@ StScrollBar { .app-view-control { padding: 4px 32px; - color: rgba(255, 255, 255, 0.6); + color: rgba(255, 255, 255, 0.8); background-color: rgba(14, 15, 17, 0.8); - border-color: rgba(14, 15, 17, 0.8); } + border-color: rgba(168, 173, 181, 0.3); } .app-view-control:hover { color: #ffffff; background-color: rgba(14, 15, 17, 0.8); border-color: #5294E2; } .app-view-control:checked { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border-color: #5294E2; background-color: #5294E2; } @@ -1175,7 +1189,7 @@ StScrollBar { .list-search-result:focus, .list-search-result:selected, .list-search-result:hover { - background-color: rgba(168, 173, 181, 0.1); + background-color: rgba(168, 173, 181, 0.4); transition-duration: 200ms; } .app-well-app:active .overview-icon, .app-well-app:checked .overview-icon, @@ -1184,7 +1198,7 @@ StScrollBar { .grid-search-result:active .overview-icon, .grid-search-result:checked .overview-icon { background-color: rgba(37, 39, 45, 0.85); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.7); } + box-shadow: inset 0 0 #5294E2; } .app-well-app:hover .overview-icon, .app-well-app:focus .overview-icon, .app-well-app:selected .overview-icon, .app-well-app.app-folder:hover .overview-icon, .app-well-app.app-folder:focus .overview-icon, @@ -1192,7 +1206,7 @@ StScrollBar { .grid-search-result:hover .overview-icon, .grid-search-result:focus .overview-icon, .grid-search-result:selected .overview-icon { - background-color: rgba(168, 173, 181, 0.1); + background-color: rgba(168, 173, 181, 0.4); transition-duration: 0ms; border-image: none; background-image: none; } @@ -1215,7 +1229,8 @@ StScrollBar { text-align: center; } .app-well-app.app-folder > .overview-icon { - background-color: rgba(37, 39, 45, 0.95); } + background-color: rgba(14, 15, 17, 0.8); + border: 1px solid rgba(168, 173, 181, 0.3); } .app-well-app.app-folder:hover > .overview-icon { background-color: rgba(60, 64, 73, 0.95); } .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon { @@ -1226,12 +1241,11 @@ StScrollBar { .app-folder-popup { -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-color: transparent; - -arrow-border-width: 0px; - -arrow-base: 0px; - -arrow-rise: 0px; - border-image: url("misc/modal.svg") 10 10 35 14; } + -arrow-background-color: rgba(14, 15, 17, 0.8); + -arrow-border-color: rgba(168, 173, 181, 0.3); + -arrow-border-width: 1px; + -arrow-base: 5; + -arrow-rise: 5; } .app-folder-popup-bin { padding: 5px; } @@ -1262,12 +1276,15 @@ StScrollBar { .workspace-thumbnails { visible-width: 40px; spacing: 11px; - padding: 18px 9px 18px 18px; - background-color: transparent; - border-image: url("dash/dash-right.svg") 10 10 10 10; } + padding: 12px; + padding-right: 7px; + border-radius: 3px 0 0 3px; + background-color: rgba(37, 39, 45, 0.87); + border-color: rgba(16, 17, 20, 0.87); } .workspace-thumbnails:rtl { - padding: 18px 18px 18px 9px; - border-image: url("dash/dash.svg") 10 10 10 10; } + padding: 12px; + padding-left: 7px; + border-radius: 0 3px 3px 0; } .workspace-thumbnail-indicator { border: 4px solid rgba(82, 148, 226, 0.8); @@ -1295,7 +1312,7 @@ StScrollBar { margin: 5px; padding: 10px; border-radius: 2px; - color: #A8ADB5; + color: #5c616c; background-color: #f9fafb; border: 0px solid transparent; box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); } @@ -1339,7 +1356,7 @@ StScrollBar { margin: 5px; } .chat-log-message { - color: #8c939e; } + color: #5c616c; } .chat-new-group { padding-top: 1em; } @@ -1352,7 +1369,7 @@ StScrollBar { .chat-sent { padding-left: 18pt; - color: #7f8692; } + color: #5294E2; } .chat-sent:rtl { padding-left: 0; padding-right: 18pt; } @@ -1361,7 +1378,7 @@ StScrollBar { padding-left: 4px; font-size: 9pt; font-weight: bold; - color: #727985; } + color: rgba(92, 97, 108, 0.6); } .chat-meta-message:rtl { padding-left: 0; padding-right: 4px; } @@ -1454,7 +1471,9 @@ StScrollBar { spacing: 15px; } .keyboard-key { - color: #A8ADB5; + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); + color: #c4c7cc; outline-color: rgba(168, 173, 181, 0.3); border-color: rgba(168, 173, 181, 0.3); background-color: rgba(48, 52, 59, 0.95); @@ -1465,15 +1484,20 @@ StScrollBar { border-radius: 3px; box-shadow: none; } .keyboard-key:focus { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .keyboard-key:hover, .keyboard-key:checked { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border-color: #5294E2; background-color: rgba(48, 52, 59, 0.95); } .keyboard-key:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border-color: #5294E2; background-color: #5294E2; } @@ -1495,15 +1519,17 @@ StScrollBar { .candidate-popup-content { padding: 0.5em; - spacing: 0.3em; } + spacing: 0.3em; + color: #A8ADB5; } .candidate-index { padding: 0 0.5em 0 0; - color: #454850; } + color: #c4c7cc; } .candidate-box { padding: 0.3em 0.5em 0.3em 0.5em; - border-radius: 4px; } + border-radius: 4px; + color: #A8ADB5; } .candidate-box:selected, .candidate-box:hover { background-color: #5294E2; color: #ffffff; } @@ -1549,21 +1575,26 @@ StScrollBar { .login-dialog .modal-dialog-button { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); border: 1px solid #cfd6e6; } .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 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fcfdfd; - box-shadow: none; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; - box-shadow: none; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { + text-shadow: 0 1px rgba(255, 255, 255, 0); + box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(252, 253, 253, 0.55); } @@ -1735,11 +1766,12 @@ StScrollBar { background-color: rgba(0, 0, 0, 0.7); border: 1px solid black; border-image: url("misc/osd.svg") 10 10 9 11; - border-radius: 2px; } + border-radius: 2px; + color: #A8ADB5; } #LookingGlassDialog > #Toolbar { padding: 3px; - border: 1px solid #dde3e9; - background-color: #f9fafb; + border: 1px solid rgba(44, 47, 53, 0.95); + background-color: transparent; border-radius: 0px; } #LookingGlassDialog .labels { spacing: 4px; } @@ -1747,16 +1779,16 @@ StScrollBar { -natural-hpadding: 12px; -minimum-hpadding: 6px; font-weight: bold; - color: rgba(92, 97, 108, 0.5); + color: #A8ADB5; transition-duration: 100ms; padding-left: .3em; padding-right: .3em; } #LookingGlassDialog .notebook-tab:hover { - color: #5c616c; + color: #ffffff; text-shadow: black 0px 2px 2px; } #LookingGlassDialog .notebook-tab:selected { border-bottom-width: 0px; - color: #ffffff; + color: #5294E2; text-shadow: black 0px 2px 2px; } #LookingGlassDialog StBoxLayout#EvalBox { padding: 4px; @@ -1765,8 +1797,13 @@ StScrollBar { spacing: 4px; } .lg-dialog StEntry { + background-color: rgba(0, 0, 0, 0.3); + color: #A8ADB5; selection-background-color: #5294E2; - selected-color: #ffffff; } + selected-color: #ffffff; + border-color: rgba(168, 173, 181, 0.3); } + .lg-dialog StEntry:focus { + border-color: #5294E2; } .lg-dialog .shell-link { color: #2679db; } .lg-dialog .shell-link:hover { diff --git a/gnome-shell/misc/modal2.svg b/gnome-shell/misc/bg.svg index 5648294..5e219e0 100644 --- a/gnome-shell/misc/modal2.svg +++ b/gnome-shell/misc/bg.svg @@ -15,7 +15,7 @@ id="svg5653" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="modal2.svg"> + sodipodi:docname="bg.svg"> <defs id="defs5655" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="4.0515156" - inkscape:cy="48.740716" + inkscape:zoom="5.6568542" + inkscape:cx="36.163589" + inkscape:cy="29.185779" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -71,7 +71,7 @@ transform="translate(-245,-342.3622)"> <g id="g4305" - style="opacity:0.15" + style="opacity:0.25" transform="translate(-2.9802322e-8,224.49998)"> <rect rx="4" @@ -120,22 +120,13 @@ style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <rect - style="opacity:0.95;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.66666667" + style="opacity:0.95;fill:#25272d;fill-opacity:1;stroke:#101114;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4179-2-0-9" - width="54" - height="65.000008" - x="251" - y="347.36218" + width="53" + height="64.000008" + x="251.5" + y="347.86218" ry="2.0000002" rx="2" /> - <rect - style="opacity:0.1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4179-2-0-9-7" - width="55" - height="66.000008" - x="250.5" - y="346.86218" - ry="2.5" - rx="2.4999998" /> </g> </svg> diff --git a/gnome-shell/dash/dash-placeholder.svg b/gnome-shell/misc/dash-placeholder.svg index cbae148..cbae148 100755 --- a/gnome-shell/dash/dash-placeholder.svg +++ b/gnome-shell/misc/dash-placeholder.svg diff --git a/gnome-shell/misc/lg.svg b/gnome-shell/misc/lg.svg deleted file mode 100644 index ccd8974..0000000 --- a/gnome-shell/misc/lg.svg +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="66" - height="64" - viewBox="0 0 66.000001 63.999996" - id="svg5653" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="lg.svg"> - <defs - id="defs5655"> - <linearGradient - inkscape:collect="always" - id="linearGradient4331"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop4333" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop4335" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient4629"> - <stop - style="stop-color:#212425;stop-opacity:1" - offset="0" - id="stop4631" /> - <stop - style="stop-color:#0f0f0f;stop-opacity:1" - offset="1" - id="stop4633" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient4363"> - <stop - style="stop-color:#000000;stop-opacity:1" - offset="0" - id="stop4365" /> - <stop - style="stop-color:#000000;stop-opacity:0" - offset="1" - id="stop4367" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.18531469,0,0,1.0500002,151.43008,307.96218)" - gradientUnits="userSpaceOnUse" - y2="42.285721" - x2="682.99994" - y1="38" - x1="683" - id="linearGradient4193-7-7" - xlink:href="#linearGradient4629" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="41" - x2="683" - y1="40" - x1="683" - id="linearGradient4337-5-6" - xlink:href="#linearGradient4331" - inkscape:collect="always" - gradientTransform="matrix(0.18021202,0,0,0.99999983,154.9152,309.36223)" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="41" - x2="683" - y1="40" - x1="683" - id="linearGradient4337-8-5-6" - xlink:href="#linearGradient4363" - inkscape:collect="always" - gradientTransform="matrix(0.18021202,0,0,1.0000002,154.9152,-449.36227)" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="64" - inkscape:cx="8.0460123" - inkscape:cy="5.863949" - inkscape:document-units="px" - inkscape:current-layer="g4305" - showgrid="false" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:window-width="1366" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="1" - showguides="true" - inkscape:snap-bbox="true" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true" - units="px" - inkscape:guide-bbox="true"> - <inkscape:grid - type="xygrid" - id="grid4149" - originx="0" - originy="-133.99999" /> - <sodipodi:guide - position="-80.000001,21.000002" - orientation="0,1" - id="guide4593" /> - </sodipodi:namedview> - <metadata - id="metadata5658"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-245,-354.3622)"> - <g - id="g4305" - style="opacity:0.75" - transform="translate(-2.9802322e-8,224.49998)"> - <rect - rx="4" - ry="4" - y="122.8622" - x="250.49998" - height="64.999992" - width="54.999996" - id="rect4179-2-0-9-2" - style="opacity:0.45;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="5" - ry="5" - y="121.86221" - x="249.5" - height="67" - width="57" - id="rect4179-2-0-9-4-6" - style="opacity:0.25;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="6" - ry="6" - y="120.86219" - x="248.5" - height="69" - width="59" - id="rect4179-2-0-9-4-4" - style="opacity:0.125;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="7" - ry="7" - y="119.8622" - x="247.5" - height="70.999992" - width="61" - id="rect4179-2-0-9-4-4-3" - style="opacity:0.06199999;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="8" - ry="8" - y="118.86221" - x="246.5" - height="73" - width="63" - id="rect4179-2-0-9-4-4-3-8" - style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <rect - rx="3" - ry="3" - y="123.3622" - x="251.5" - height="63.500004" - width="53" - id="rect4179-2-0-9-2-3" - style="opacity:0.5;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - </g> - <rect - style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4179-2-0-9-4" - width="53" - height="62.999985" - x="251.5" - y="347.86221" - ry="2.0000002" - rx="2" /> - <rect - style="opacity:0.8;fill:url(#linearGradient4193-7-7);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4179-2-5" - width="53" - height="63.000011" - x="251.5" - y="347.86218" - ry="2.0000002" - rx="1.9999999" /> - <rect - style="opacity:0.15;fill:none;fill-opacity:1;stroke:url(#linearGradient4337-5-6);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4179-3-8-9" - width="51" - height="56.999989" - x="252.5" - y="348.86218" - ry="0.99999994" - rx="0.99999994" /> - <rect - style="opacity:0.1;fill:none;fill-opacity:1;stroke:url(#linearGradient4337-8-5-6);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4179-3-3-2-3" - width="51" - height="57.000011" - x="252.5" - y="-409.86221" - ry="1" - rx="0.99999988" - transform="scale(1,-1)" /> - </g> -</svg> diff --git a/gnome-shell/misc/modal.svg b/gnome-shell/misc/modal.svg index cd2cd7c..5648294 100644 --- a/gnome-shell/misc/modal.svg +++ b/gnome-shell/misc/modal.svg @@ -15,7 +15,7 @@ id="svg5653" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="modal.svg"> + sodipodi:docname="modal2.svg"> <defs id="defs5655" /> <sodipodi:namedview @@ -25,12 +25,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="23.474705" - inkscape:cy="35.375708" + inkscape:zoom="1" + inkscape:cx="4.0515156" + inkscape:cy="48.740716" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" @@ -60,7 +60,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> @@ -71,7 +71,7 @@ transform="translate(-245,-342.3622)"> <g id="g4305" - style="opacity:0.25" + style="opacity:0.15" transform="translate(-2.9802322e-8,224.49998)"> <rect rx="4" @@ -120,7 +120,7 @@ style="opacity:0.02999998;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> </g> <rect - style="opacity:0.95;fill:#3c4049;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.66666667" + style="opacity:0.95;fill:#f9fafb;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.66666667" id="rect4179-2-0-9" width="54" height="65.000008" @@ -128,5 +128,14 @@ y="347.36218" ry="2.0000002" rx="2" /> + <rect + style="opacity:0.1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4179-2-0-9-7" + width="55" + height="66.000008" + x="250.5" + y="346.86218" + ry="2.5" + rx="2.4999998" /> </g> </svg> diff --git a/gnome-shell/misc/summary-counter.svg b/gnome-shell/misc/summary-counter.svg deleted file mode 100644 index 7a102bd..0000000 --- a/gnome-shell/misc/summary-counter.svg +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.0" - id="Foreground" - x="0px" - y="0px" - width="32" - height="32" - viewBox="0 0 23.272727 23.272727" - enable-background="new 0 0 16 16" - xml:space="preserve" - sodipodi:version="0.32" - inkscape:version="0.48.5 r10040" - sodipodi:docname="summary-counter.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata - id="metadata2399"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs - id="defs2397"><linearGradient - id="linearGradient3836"><stop - style="stop-color:#ff5757;stop-opacity:1;" - offset="0" - id="stop3838" /><stop - style="stop-color:#d74747;stop-opacity:1;" - offset="1" - id="stop3840" /></linearGradient><filter - color-interpolation-filters="sRGB" - inkscape:collect="always" - id="filter16494-4" - x="-0.20989846" - width="1.4197969" - y="-0.20903821" - height="1.4180764"><feGaussianBlur - inkscape:collect="always" - stdDeviation="1.3282637" - id="feGaussianBlur16496-8" /></filter><linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3836" - id="linearGradient3842" - x1="17" - y1="5" - x2="17" - y2="27" - gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview - inkscape:window-height="1035" - inkscape:window-width="1463" - inkscape:pageshadow="2" - inkscape:pageopacity="0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#000000" - id="base" - showgrid="true" - inkscape:zoom="11.313708" - inkscape:cx="15.197485" - inkscape:cy="3.6319749" - inkscape:window-x="0" - inkscape:window-y="22" - inkscape:current-layer="Foreground" - showguides="true" - inkscape:guide-bbox="true" - borderlayer="true" - inkscape:showpageshadow="false" - inkscape:window-maximized="0"><inkscape:grid - type="xygrid" - id="grid11246" - empspacing="5" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /></sodipodi:namedview><g - id="g3175-4" - transform="translate(4.0260763,2.0966202)" - style="opacity:0.8"><path - transform="translate(0,1.028519)" - d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z" - id="path16480-5" - style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate" - xlink:href="#path2394-32" - inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z " - inkscape:radius="0" - sodipodi:type="inkscape:offset" - inkscape:href="#path2394-32" /><g - id="g3172-6" /></g><path - sodipodi:type="arc" - style="opacity:0.75;fill:#892929;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path3003" - sodipodi:cx="17" - sodipodi:cy="15" - sodipodi:rx="12" - sodipodi:ry="12" - d="M 29,15 A 12,12 0 1 1 5,15 12,12 0 1 1 29,15 z" - transform="matrix(0.72727272,0,0,0.72727272,-0.72727202,2.3750005e-8)" /><path - sodipodi:type="arc" - style="fill:url(#linearGradient3842);fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path3808" - sodipodi:cx="17" - sodipodi:cy="16" - sodipodi:rx="11" - sodipodi:ry="11" - d="M 28,16 A 11,11 0 1 1 6,16 11,11 0 1 1 28,16 z" - transform="matrix(0.72727272,0,0,0.72727272,-0.727272,-0.72727269)" /><path - style="opacity:0.15;fill:#ffffff;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - d="m 11.636364,2.9090909 c -4.4182778,0 -7.9999997,3.5817221 -7.9999997,8.0000001 0,0.122777 0.017255,0.24221 0.022727,0.363636 0.1914686,-4.2482383 3.6817716,-7.6363634 7.9772727,-7.6363634 4.295502,0 7.785805,3.3881251 7.977273,7.6363634 0.0055,-0.121426 0.02273,-0.240859 0.02273,-0.363636 0,-4.418278 -3.581721,-8.0000001 -7.999999,-8.0000001 z" - id="path3808-0" - inkscape:connector-curvature="0" /></svg>
\ No newline at end of file diff --git a/gtk-2.0/apps.rc b/gtk-2.0/apps.rc new file mode 100644 index 0000000..de154bd --- /dev/null +++ b/gtk-2.0/apps.rc @@ -0,0 +1,27 @@ +# +# Thunar +# +style "thunar-handle" { GtkPaned::handle-size = 2 } + +style "dark-sidebar" { + GtkTreeView::odd_row_color = "#3c4049" + GtkTreeView::even_row_color = "#3c4049" + + + base[NORMAL] = "#3c4049" + base[INSENSITIVE] = "#3c4049" + + text[NORMAL] = "#a8adb5" + text[ACTIVE] = @selected_fg_color + text[SELECTED] = @selected_fg_color +} + +style "thunar-frame" { + xthickness = 0 + ythickness = 0 +} + +widget_class "*ThunarWindow*.<GtkScrolledWindow>" style "thunar-frame" +widget_class "*ThunarShortcutsView*" style "dark-sidebar" +widget_class "*ThunarTreeView*" style "dark-sidebar" +widget_class "*ThunarWindow*.<GtkHPaned>" style "thunar-handle" diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 4b93c4e..3013c73 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -4,7 +4,8 @@ gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 gtk-primary-button-warps-slider = 1 -include "panel.rc" # This includes the file that handles the panels. +include "apps.rc" +include "panel.rc" # This includes the file that handles the panels. style "default" { @@ -689,7 +690,7 @@ style "menubar" { bg[NORMAL] = "#e7e8eb" fg[NORMAL] = "#70788d" fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = shade(0.8, "#70788d") + fg[INSENSITIVE] = shade(1.3, "#70788d") xthickness = 0 ythickness = 0 diff --git a/gtk-2.0/panel.rc b/gtk-2.0/panel.rc index e5baad0..9974b76 100644 --- a/gtk-2.0/panel.rc +++ b/gtk-2.0/panel.rc @@ -2,20 +2,20 @@ style "theme-panel" { ythickness = 0 - bg[NORMAL] = "#20242A" + bg[NORMAL] = "#25272d" bg[ACTIVE] = @selected_bg_color bg[PRELIGHT] = shade(1.1, @selected_bg_color) bg[SELECTED] = @selected_bg_color - fg[NORMAL] = "#edf5fb" + fg[NORMAL] = "#A8ADB5" fg[PRELIGHT] = @selected_fg_color fg[ACTIVE] = @selected_fg_color fg[SELECTED] = @selected_fg_color - text[NORMAL] = "#edf5fb" - text[PRELIGHT] = "#edf5fb" - text[ACTIVE] = "#edf5fb" - text[SELECTED] = "#edf5fb" + text[NORMAL] = "#A8ADB5" + text[PRELIGHT] = "#A8ADB5" + text[ACTIVE] = "#A8ADB5" + text[SELECTED] = "#A8ADB5" engine "murrine" { reliefstyle = 0 @@ -26,7 +26,7 @@ style "theme-panel" { gradient_shades = {1.0,1.0,1.0,1.0} textstyle = 0 contrast = 0.0 - textstyle = 1 + textstyle = 0 } } @@ -48,7 +48,7 @@ style "panelbuttons" { ythickness = 0 engine "murrine" { - textstyle = 1 + textstyle = 0 } } @@ -63,7 +63,7 @@ style "theme-panel-text" { text[ACTIVE] = "#edf5fb" engine "murrine" { - textstyle = 1 + textstyle = 0 text_shade = 0.2 } } diff --git a/gtk-3.0/README b/gtk-3.0/README index 413cff1..befb776 100644 --- a/gtk-3.0/README +++ b/gtk-3.0/README @@ -1,36 +1,9 @@ -Summary -------- - * Do not edit the CSS directly, edit the source SCSS files and process them with SASS (run `/.parse-sass.sh` when you have the required sofwtare installed, as described below) -* To be able to use the lates/adequate version of sass, install ruby, gem, sass & bundle. - On Fedora F20, this is done with `sudo dnf install rubygems && gem install bundle && bundle install` - from the same directory this README resides in. - -How to tweak the theme ----------------------- - -Adwaita is a complex themes, so to keep it maintainable it's written and processed in SASS, the -generated CSS is then transformed into a gresource file during gtk build and used at runtime in a -non-legible or editable form. - -It is very likely your change will happen in the _common.scss file. That's where most of the widget -selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the -right place for a drive by stylesheet fix: - -_colors.scss - global color definitions. We keep the number of defined colors to a necessary minimum, - most colors are derived form a handful of basics. It covers both the light variant and - the dark variant. - -_colors-public.scss - SCSS colors exported through gtk to allow for 3rd party apps color mixing. -_drawing.scss - drawing helper mixings/functions to allow easier definition of widget drawing under - specific context. This is why Adwaita isn't 15000 LOC. +* To be able to use the lates/adequate version of sass, install ruby and get the sass gem via bundle. + This is done with `gem install bundle && bundle install` from the same directory this README resides in. -_common.scss - actual definitions of style for each widget. This is where you are likely to add/remove - your changes. - -You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the -_common.scss file, you can either run the ./parse-sass.sh script or keep SASS watching for changes as you +You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to any .scss file, you can either run the ./parse-sass.sh script or keep SASS watching for changes as you edit. This is done by running `bundle exec sass --watch --sourcemap=none .` If sass is out of date, or is missing, you can install it with `bundle install`. diff --git a/gtk-3.0/_applications.scss b/gtk-3.0/_applications.scss index 18f95b5..1d41d80 100644 --- a/gtk-3.0/_applications.scss +++ b/gtk-3.0/_applications.scss @@ -155,7 +155,7 @@ NemoWindow GtkSeparator.separator.horizontal { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoPathBar.linked > .button { +NemoWindow .primary-toolbar NemoPathBar.linked > .button { @include button(header-hover); &:hover { border-color: $selected_bg_color; } @@ -170,15 +170,22 @@ NemoPathBar.linked > .button { .gedit-headerbar-paned { color: darken($header_bg, 7%); } .open-document-selector-treeview.view { - padding: 3px 6px 3px 6px; - border-color: $base_color; // disable borders, making them transparent doesn't work for some reason + padding: 3px 6px 3px 6px; + border-color: $base_color; // disable borders, making them transparent doesn't work for some reason - &:prelight { background-color: transparentize(black, 0.95); } + &:prelight { + background-color: transparentize(black, 0.95); + + &:selected { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + } } /* Only normal state is handle */ .open-document-selector-name-label { - color: $fg_color; + color: $fg_color; } /* Only normal state is handle */ @@ -268,15 +275,36 @@ GeditFileBrowserWidget .toolbar { // GbSearchBox.linked { + + > GtkMenuButton.button:last-child:dir(ltr), + > GtkMenuButton.button:first-child:dir(rtl) { + border-color: transparentize($header_fg, 0.7); + background-color: transparentize($button_bg, 0.1); + + &:hover { + border-color: $selected_bg_color; + } + &:active, &:checked { + color: $selected_fg_color; + background-color: $selected_bg_color; + border-color: $selected_bg_color; + } + } + > GtkMenuButton.button:last-child:dir(ltr) { - background-color: darken($header_bg, 6%); + + border-left-style: none; border-radius: 0 14.5px 14.5px 0; outline-radius: 0 12.5px 12.5px 0; + + &:hover { box-shadow: -1px 0 $selected_bg_color; } } > GtkMenuButton.button:first-child:dir(rtl) { - background-color: darken($header_bg, 6%); + border-right-style: none; border-radius: 14.5px 0 0 14.5px; outline-radius: 12.5px 0 0 12.5px; + + &:hover { box-shadow: 1px 0 $selected_bg_color; } } } @@ -307,21 +335,20 @@ GbPreferencesPageLanguage { // Command Bar styling GtkBox.gb-command-bar-box { - //border: none; - //border-top: 1px solid nth($_borders_color, 2); - //background-image: linear-gradient(to bottom, nth($_base_color, 2)); - //box-shadow: inset 0px 2px 3px -1px transparentize(black, 0.7); + border: none; + background-color: opacify($osd_bg_color, 1); - //GtkLabel { color: nth($_fg_color, 2); } + GtkLabel { color: $osd_fg_color; } } GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; + color: $osd_fg_color; background-image: none; - background-color: transparent; + background-color: opacify($osd_bg_color, 1); padding: 6px 6px 6px 6px; - //color: nth($_fg_color, 2); + border: none; &:selected, &:selected:focus { @@ -608,9 +635,9 @@ MarlinViewWindow *:selected:focus { icon-shadow: none; } -.panel .menubar .menuitem:hover { - background-color: transparent; -} +.panel .menubar > .menuitem { padding: 3px 6px; } + +.panel .menubar > .menuitem:hover { background-color: transparent; } .panel .window-frame.menu.csd, .panel .window-frame.popup.csd { diff --git a/gtk-3.0/_colors-public.scss b/gtk-3.0/_colors-public.scss index 34ace1f..c281d89 100644 --- a/gtk-3.0/_colors-public.scss +++ b/gtk-3.0/_colors-public.scss @@ -9,6 +9,12 @@ @define-color theme_base_color #{"" + $base_color}; @define-color theme_selected_bg_color #{"" + $selected_bg_color}; @define-color theme_selected_fg_color #{"" + $selected_fg_color}; +@define-color fg_color #{"" + $fg_color}; +@define-color text_color #{"" + $text_color}; +@define-color bg_color #{"" + $bg_color}; +@define-color base_color #{"" + $base_color}; +@define-color selected_bg_color #{"" + $selected_bg_color}; +@define-color selected_fg_color #{"" + $selected_fg_color}; @define-color insensitive_bg_color #{"" + $insensitive_bg_color}; @define-color insensitive_fg_color #{"" + $insensitive_fg_color}; @define-color insensitive_base_color #{"" + $base_color}; @@ -16,20 +22,17 @@ @define-color theme_unfocused_text_color #{"" + $text_color}; @define-color theme_unfocused_bg_color #{"" + $bg_color}; @define-color theme_unfocused_base_color #{"" + $base_color}; -@define-color theme_unfocused_selected_bg_color #{"" + $selected_bg_color}; -@define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color}; @define-color borders #{"" + $borders_color}; @define-color unfocused_borders #{"" + $borders_color}; @define-color warning_color #{"" + $warning_color}; @define-color error_color #{"" + $error_color}; @define-color success_color #{"" + $success_color}; -//@define-color desctructive_color #{"" + $destructive_color} @define-color placeholder_text_color #A8A8A8; //WM $wm_highlight: lighten(opacify($header_bg, 1), 4%); -$wm_bg_unfocused: opacify($header_bg, 1); +$wm_bg_unfocused: opacify(lighten($header_bg, 3%), 1); @define-color wm_title #{"" + $header_fg}; @define-color wm_unfocused_title alpha(#{"" + $header_fg}, 0.7); diff --git a/gtk-3.0/_common.scss b/gtk-3.0/_common.scss index d56bf8d..164ed58 100644 --- a/gtk-3.0/_common.scss +++ b/gtk-3.0/_common.scss @@ -1025,15 +1025,18 @@ GtkComboBox { border-color: darken($header_bg, 7%); color: $header_fg; - background-color: $header_bg; + background-color: opacify($header_bg, 1); + + .csd & { background-color: $header_bg; } // Transparent header-bars only in csd windows &:backdrop { color: transparentize($header_fg, 0.3); - background-color: lighten($header_bg, 3%); + background-color: lighten(opacify($header_bg, 1), 3%); + + .csd & { background-color: lighten($header_bg, 3%); } // Transparent header-bars only in csd windows } .title { - font-weight: bold; padding: 0px 12px; } @@ -1050,20 +1053,53 @@ GtkComboBox { border-color: darken($selection_mode_bg, 4%); box-shadow: none; - &:backdrop { background-color: $selection_mode_bg; } + &:backdrop { + background-color: $selection_mode_bg; + color: transparentize($selected_fg_color, 0.4); + } .subtitle:link { @extend *:link:selected; } .button { - @extend %selected-button + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 1); + + &.flat { + @include button(undecorated); + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + } + &:hover { + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize($selected_fg_color, 0.95); + border-color: transparentize($selected_fg_color, 0.5); + } + &:active, &:checked { + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize(black, 0.8); + border-color: transparentize(black, 0.8); + } + &:insensitive { + color: transparentize($selected_fg_color, 0.6); + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 1); + + &:active, &:checked { + color: transparentize($selected_fg_color, 0.6); + background-color: transparentize(black, 0.85); + border-color: transparentize(black, 0.85); + } + } } .selection-menu { box-shadow: none; padding-left: 10px; padding-right: 10px; - padding-top: 12px; - padding-bottom: 12px; GtkArrow { -GtkArrow-arrow-scaling: 1; } .arrow { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); @@ -1087,7 +1123,7 @@ GtkComboBox { padding-top: 5px; // less padding for ssd padding-bottom: 5px; // background-color: opacify($header_bg, 1); - border-bottom: none; + border-bottom-width: 0; &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); } } @@ -1131,7 +1167,10 @@ GtkComboBox { &:backdrop { opacity: 0.85; } - &:focus { @include entry(header-focus); } + &:focus { + @include entry(header-focus); + background-clip: border-box; + } &:insensitive { @include entry(header-insensitive); } &:selected:focus { @@ -1167,30 +1206,34 @@ GtkComboBox { @extend %linked; } - // Suggested and Destructive Action buttons + // Header-bar Suggested and Destructive Action buttons @each $b_type, $b_color in (suggested-action, $suggested_color), (destructive-action, $destructive_color) { .button.#{$b_type} { color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: $b_color; background-color: $b_color; &.flat { @include button(undecorated); color: $b_color; + outline-color: transparentize($b_color, 0.7); } &:hover { color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: lighten($b_color, 9%); background-color: lighten($b_color, 9%); } &:active, &:checked { color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); border-color: darken($b_color, 7%); background-color: darken($b_color, 7%); } &.flat:insensitive { - + color: transparentize($b_color, 0.55); } &:insensitive { color: transparentize($selected_fg_color, 0.4); @@ -1246,6 +1289,7 @@ GtkComboBox { &:backdrop { opacity: 0.75; } } + // Header-bar Scale .scale { &:backdrop { opacity: 0.75; } @@ -1461,7 +1505,7 @@ column-header.button.dnd { // for treeview-like derive widgets color: $insensitive_fg_color; } - &.separator { color: $base_color; } + &.separator { color: transparentize($base_color, 1); } //submenu indicators &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } @@ -1497,7 +1541,7 @@ column-header.button.dnd { // for treeview-like derive widgets box-shadow: 0 2px 6px 1px transparentize(black, 0.93); - & .separator { color: transparentize(black, 1); } + & .separator { color: transparentize($base_color, 1); } .label.separator { @extend .label.separator; } // Noice > .list, @@ -1632,7 +1676,6 @@ column-header.button.dnd { // for treeview-like derive widgets } GtkLabel { //tab text padding: 0 2px; // needed for a nicer focus ring - font-weight: bold; color: $insensitive_fg_color; } .prelight-page GtkLabel, GtkLabel.prelight-page { @@ -2404,7 +2447,8 @@ GtkInfoBar { .info, .question, .warning, -.error { +.error, +GtkInfoBar { background-color: $selected_bg_color; color: $selected_fg_color; } @@ -2601,6 +2645,8 @@ GtkVolumeButton.button { padding: 8px; } &.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px $_wm_border; + + &.maximized { border-radius: 0; } } &.csd { &.popup, &.menu { @@ -2640,6 +2686,7 @@ GtkVolumeButton.button { padding: 8px; } padding: 7px 4px; @include button(undecorated); + background-color: transparentize($header_bg, 1); border-width: 0; &:hover { @@ -2648,7 +2695,6 @@ GtkVolumeButton.button { padding: 8px; } &:active, &:checked { @include button(header-active); } - //&:backdrop { color: $wm_unfocused_title; } &.close, &.maximize, &.minimize { @@ -2680,28 +2726,6 @@ GtkVolumeButton.button { padding: 8px; } // catch all extend :) -%dark_button { - color: $header_fg; - background-color: lighten($header_bg, 12.5%); - - GtkLabel, GtkImage { color: $header_fg; } - - &:hover { - color: $header_fg; - background-color: lighten($header_bg, 15%); - - GtkLabel, GtkImage { color: $header_fg; } - } - &:active, &:checked { - color: $selected_bg_color; - background-image: none; - background-color: transparentize(darken($header_bg, 10%), 0.4); - border-color: transparentize(darken($header_bg, 14%), 0.4); - - GtkLabel, GtkImage { color: $selected_bg_color; } - } -} - %selected_items { background-image: none; background-color: $selected_bg_color; diff --git a/gtk-3.0/_drawing.scss b/gtk-3.0/_drawing.scss index eda1f1f..0300ce1 100644 --- a/gtk-3.0/_drawing.scss +++ b/gtk-3.0/_drawing.scss @@ -221,9 +221,9 @@ // // header-bar insensitive pushed button // - color: transparentize($selected_fg_color, 0.45); - background-color: transparentize($header_bg, 1); - border-color: transparentize($header_bg, 1); + color: transparentize($selected_fg_color, 0.25); + border-color: transparentize($selected_bg_color, 0.35); + background-color: transparentize($selected_bg_color, 0.35); } @else if $t==osd { diff --git a/gtk-3.0/_transparent_widgets.scss b/gtk-3.0/_transparent_widgets.scss index d5bacce..154ee8f 100644 --- a/gtk-3.0/_transparent_widgets.scss +++ b/gtk-3.0/_transparent_widgets.scss @@ -4,18 +4,24 @@ GtkFileChooserDialog .dialog-action-box { background-color: $bg_color } // fix for non gnome environments +NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar + GtkFileChooserDialog *, -NautilusWindow * { +NautilusWindow *, +NemoWindow { -GtkPaned-handle-size: 0; } // Dark transparent sidebars GtkFileChooserDialog, -NautilusWindow { +NautilusWindow, +NemoWindow, +MarlinViewWindow { - &.background { background-color: transparent; } + &.background, + .source-list, .source-list.view, .source-list.view:prelight { background-color: transparent; } - .sidebar { + .sidebar, .source-list.sidebar.view { background-color: $dark_sidebar_bg; .view { @@ -81,6 +87,8 @@ GeditWindow.background { .titlebar .pane-separator { background-color: darken($header_bg, 7%); } } +.gedit-bottom-panel-paned { background-color: $base_color; } + .gedit-document-panel { background-color: $dark_sidebar_bg; diff --git a/gtk-3.0/_unity.scss b/gtk-3.0/_unity.scss index 0e0830d..e50b1d9 100644 --- a/gtk-3.0/_unity.scss +++ b/gtk-3.0/_unity.scss @@ -1,14 +1,14 @@ // Decorations UnityDecoration { - -UnityDecoration-extents: 28px 0 0 0; + -UnityDecoration-extents: 28px 1 1 1; -UnityDecoration-input-extents: 10px; -UnityDecoration-shadow-offset-x: 0px; - -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.3); - -UnityDecoration-active-shadow-radius: 10px; - -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.15); - -UnityDecoration-inactive-shadow-radius: 5px; + -UnityDecoration-shadow-offset-y: 3px; + -UnityDecoration-active-shadow-color: rgba(0, 0, 0, 0.15); + -UnityDecoration-active-shadow-radius: 12px; + -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, 0.07); + -UnityDecoration-inactive-shadow-radius: 7px; -UnityDecoration-glow-size: 10px; -UnityDecoration-glow-color: $selected_bg_color; @@ -18,7 +18,7 @@ UnityDecoration { -UnityDecoration-title-alignment: 0.0; &.top { - border: none; + border: 1px solid rgba(0, 0, 0, 0.1); border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; @@ -36,7 +36,7 @@ UnityDecoration { } &.left, &.right, &.bottom, &.left:backdrop, &.right:backdrop, &.bottom:backdrop { - background-image: none; + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } } @@ -44,7 +44,7 @@ UnityDecoration { UnityPanelWidget, .unity-panel { background-image: linear-gradient(to bottom, opacify($panel_bg, 1)); - color: $panel_fg; + color: lighten($panel_fg, 20%); box-shadow: none; } diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css index c591e28..1afb597 100644 --- a/gtk-3.0/gtk-contained.css +++ b/gtk-3.0/gtk-contained.css @@ -502,49 +502,49 @@ GtkTextView { .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, .primary-toolbar .linked.stack-switcher > .button, .header-bar .linked.stack-switcher > .button, .primary-toolbar .linked.path-bar > .button, -.header-bar .linked.path-bar > .button, NemoPathBar.linked > .button, .linked > GtkComboBox > .button:dir(ltr) { +.header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .button:dir(ltr) { border-radius: 0; border-left-style: none; border-right-style: none; } .inline-toolbar GtkToolButton > .button.flat:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover, GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .button:hover, .primary-toolbar .linked.stack-switcher > .button:hover, .header-bar .linked.stack-switcher > .button:hover, .primary-toolbar .linked.path-bar > .button:hover, - .header-bar .linked.path-bar > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { + .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .button:hover:dir(ltr) { box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2; } .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl), .header-bar .linked.stack-switcher > .button:dir(rtl), .primary-toolbar .linked.path-bar > .button:dir(rtl), - .header-bar .linked.path-bar > .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { + .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { border-radius: 0; } .osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button, .primary-toolbar .linked.stack-switcher > .button:first-child, .header-bar .linked.stack-switcher > .button:first-child, .primary-toolbar .linked.path-bar > .button:first-child, -.header-bar .linked.path-bar > .button:first-child { +.header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child { border-radius: 3px 0 0 3px; border-left-style: solid; } .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover, .inline-toolbar GtkToolButton:first-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .button:first-child:hover, .linked > GtkComboBox:first-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover, .header-bar .linked.stack-switcher > .button:first-child:hover, .primary-toolbar .linked.path-bar > .button:first-child:hover, - .header-bar .linked.path-bar > .button:first-child:hover { + .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover { box-shadow: inset -1px 0 #5294E2; } .osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button, .primary-toolbar .linked.stack-switcher > .button:last-child, .header-bar .linked.stack-switcher > .button:last-child, .primary-toolbar .linked.path-bar > .button:last-child, -.header-bar .linked.path-bar > .button:last-child { +.header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child { border-radius: 0 3px 3px 0; border-right-style: solid; } .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover, .inline-toolbar GtkToolButton:last-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .button:last-child:hover, .linked > GtkComboBox:last-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover, .header-bar .linked.stack-switcher > .button:last-child:hover, .primary-toolbar .linked.path-bar > .button:last-child:hover, - .header-bar .linked.path-bar > .button:last-child:hover { + .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover { box-shadow: inset 1px 0 #5294E2; } .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl), .header-bar .linked.stack-switcher > .button:last-child:dir(rtl), .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), - .header-bar .linked.path-bar > .button:last-child:dir(rtl) { + .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) { border-bottom-left-radius: 0; } .osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button, .primary-toolbar .linked.stack-switcher > .button:only-child, .header-bar .linked.stack-switcher > .button:only-child, .primary-toolbar .linked.path-bar > .button:only-child, -.header-bar .linked.path-bar > .button:only-child { +.header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child { border-radius: 3px; border-style: solid; } .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover, .inline-toolbar GtkToolButton:only-child > .button.flat:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .button:only-child:hover, .linked > GtkComboBox:only-child > .button:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover, .header-bar .linked.stack-switcher > .button:only-child:hover, .primary-toolbar .linked.path-bar > .button:only-child:hover, - .header-bar .linked.path-bar > .button:only-child:hover { + .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover { box-shadow: none; } .linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > .button:active, .linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .button, @@ -779,12 +779,15 @@ GtkComboBox { border-radius: 0; border-color: rgba(212, 213, 219, 0.95); color: rgba(82, 93, 118, 0.8); - background-color: rgba(231, 232, 235, 0.95); } + background-color: #e7e8eb; } + .csd .header-bar { + background-color: rgba(231, 232, 235, 0.95); } .header-bar:backdrop { color: rgba(82, 93, 118, 0.5); - background-color: rgba(239, 240, 242, 0.95); } + background-color: #eff0f2; } + .csd .header-bar:backdrop { + background-color: rgba(239, 240, 242, 0.95); } .header-bar .title { - font-weight: bold; padding: 0px 12px; } .header-bar .subtitle { font-size: smaller; @@ -795,13 +798,41 @@ GtkComboBox { border-color: rgba(65, 137, 223, 0.95); box-shadow: none; } .header-bar.selection-mode:backdrop { - background-color: rgba(82, 148, 226, 0.95); } + background-color: rgba(82, 148, 226, 0.95); + color: rgba(255, 255, 255, 0.6); } + .header-bar.selection-mode .button { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + background-color: rgba(255, 255, 255, 0); + border-color: rgba(255, 255, 255, 0); } + .header-bar.selection-mode .button.flat { + border-color: transparent; + background-color: transparent; + background-image: none; + color: #ffffff; + background-color: rgba(255, 255, 255, 0); } + .header-bar.selection-mode .button:hover { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + background-color: rgba(255, 255, 255, 0.05); + border-color: rgba(255, 255, 255, 0.5); } + .header-bar.selection-mode .button:active, .header-bar.selection-mode .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + background-color: rgba(0, 0, 0, 0.2); + border-color: rgba(0, 0, 0, 0.2); } + .header-bar.selection-mode .button:insensitive { + color: rgba(255, 255, 255, 0.4); + background-color: rgba(255, 255, 255, 0); + border-color: rgba(255, 255, 255, 0); } + .header-bar.selection-mode .button:insensitive:active, .header-bar.selection-mode .button:insensitive:checked { + color: rgba(255, 255, 255, 0.4); + background-color: rgba(0, 0, 0, 0.15); + border-color: rgba(0, 0, 0, 0.15); } .header-bar.selection-mode .selection-menu { box-shadow: none; padding-left: 10px; - padding-right: 10px; - padding-top: 12px; - padding-bottom: 12px; } + padding-right: 10px; } .header-bar.selection-mode .selection-menu GtkArrow { -GtkArrow-arrow-scaling: 1; } .header-bar.selection-mode .selection-menu .arrow { @@ -818,7 +849,7 @@ GtkComboBox { padding-top: 5px; padding-bottom: 5px; background-color: #e7e8eb; - border-bottom: none; } + border-bottom-width: 0; } .header-bar.default-decoration:backdrop { background-color: #eff0f2; } @@ -851,7 +882,8 @@ GtkComboBox { .primary-toolbar .entry:focus, .header-bar .entry:focus { color: #ffffff; border-color: #5294E2; - background-image: linear-gradient(to bottom, #5294E2); } + background-image: linear-gradient(to bottom, #5294E2); + background-clip: border-box; } .primary-toolbar .entry:insensitive, .header-bar .entry:insensitive { color: rgba(82, 93, 118, 0.35); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); } @@ -883,9 +915,9 @@ GtkComboBox { .primary-toolbar .button:insensitive > GtkLabel, .header-bar .button:insensitive > GtkLabel { color: inherit; } .primary-toolbar .button:insensitive:active, .header-bar .button:insensitive:active, .primary-toolbar .button:insensitive:checked, .header-bar .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - background-color: rgba(231, 232, 235, 0); - border-color: rgba(231, 232, 235, 0); } + color: rgba(255, 255, 255, 0.75); + border-color: rgba(82, 148, 226, 0.65); + background-color: rgba(82, 148, 226, 0.65); } .primary-toolbar .linked > .button, .header-bar .linked > .button { border-radius: 3px; border-style: solid; } @@ -913,21 +945,27 @@ GtkComboBox { background-color: #5294E2; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #9EA4B5; background-color: #9EA4B5; } .primary-toolbar .button.suggested-action.flat, .header-bar .button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #9EA4B5; } + color: #9EA4B5; + outline-color: rgba(158, 164, 181, 0.3); } .primary-toolbar .button.suggested-action:hover, .header-bar .button.suggested-action:hover { color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #b8bcc9; background-color: #b8bcc9; } .primary-toolbar .button.suggested-action:active, .header-bar .button.suggested-action:active, .primary-toolbar .button.suggested-action:checked, .header-bar .button.suggested-action:checked { color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #8a91a6; background-color: #8a91a6; } + .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive { + color: rgba(158, 164, 181, 0.45); } .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive { color: rgba(255, 255, 255, 0.6); border-color: rgba(158, 164, 181, 0.65); @@ -938,21 +976,27 @@ GtkComboBox { opacity: 0.8; } .primary-toolbar .button.destructive-action, .header-bar .button.destructive-action { color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #FA4349; background-color: #FA4349; } .primary-toolbar .button.destructive-action.flat, .header-bar .button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #FA4349; } + color: #FA4349; + outline-color: rgba(250, 67, 73, 0.3); } .primary-toolbar .button.destructive-action:hover, .header-bar .button.destructive-action:hover { color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #fb7074; background-color: #fb7074; } .primary-toolbar .button.destructive-action:active, .header-bar .button.destructive-action:active, .primary-toolbar .button.destructive-action:checked, .header-bar .button.destructive-action:checked { color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); border-color: #f92027; background-color: #f92027; } + .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive { + color: rgba(250, 67, 73, 0.45); } .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive { color: rgba(255, 255, 255, 0.6); border-color: rgba(250, 67, 73, 0.65); @@ -1143,7 +1187,7 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem:insensitive, .popup .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { - color: #ffffff; } + color: rgba(255, 255, 255, 0); } .menu .menuitem.arrow, .popup .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { @@ -1176,7 +1220,7 @@ column-header .button, column-header .button:hover, column-header .button:active background-color: #ffffff; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.07); } .popover .separator, .popover GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .popover .view.separator { - color: transparent; } + color: rgba(255, 255, 255, 0); } .popover > .list, .popover > .view, .popover > .toolbar, @@ -1314,7 +1358,6 @@ column-header .button, column-header .button:hover, column-header .button:active background-color: rgba(0, 0, 0, 0.02); } .notebook tab GtkLabel { padding: 0 2px; - font-weight: bold; color: rgba(92, 97, 108, 0.55); } .notebook tab .prelight-page GtkLabel, .notebook tab GtkLabel.prelight-page { color: rgba(92, 97, 108, 0.775); } @@ -1908,36 +1951,37 @@ GtkInfoBar { .info, .question, .warning, -.error { +.error, +GtkInfoBar { background-color: #5294E2; color: #ffffff; } -.header-bar.selection-mode .button, .list-row:selected .button, GtkInfoBar .button { +.list-row:selected .button, GtkInfoBar .button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0.5); } - .header-bar.selection-mode .flat.button, .list-row:selected .flat.button, GtkInfoBar .flat.button { + .list-row:selected .flat.button, GtkInfoBar .flat.button { border-color: transparent; background-color: transparent; background-image: none; color: #ffffff; background-color: rgba(255, 255, 255, 0); } - .header-bar.selection-mode .button:hover, .list-row:selected .button:hover, GtkInfoBar .button:hover { + .list-row:selected .button:hover, GtkInfoBar .button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0.2); border-color: rgba(255, 255, 255, 0.8); } - .header-bar.selection-mode .button:active, .list-row:selected .button:active, GtkInfoBar .button:active, .header-bar.selection-mode .button:checked, .list-row:selected .button:checked, GtkInfoBar .button:checked { + .list-row:selected .button:active, GtkInfoBar .button:active, .list-row:selected .button:checked, GtkInfoBar .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); background-color: rgba(0, 0, 0, 0.2); border-color: rgba(255, 255, 255, 0.8); } - .header-bar.selection-mode .button:insensitive, .list-row:selected .button:insensitive, GtkInfoBar .button:insensitive { + .list-row:selected .button:insensitive, GtkInfoBar .button:insensitive { color: rgba(255, 255, 255, 0.4); background-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0.2); } - .header-bar.selection-mode .button:insensitive:active, .list-row:selected .button:insensitive:active, GtkInfoBar .button:insensitive:active, .header-bar.selection-mode .button:insensitive:checked, .list-row:selected .button:insensitive:checked, GtkInfoBar .button:insensitive:checked { + .list-row:selected .button:insensitive:active, GtkInfoBar .button:insensitive:active, .list-row:selected .button:insensitive:checked, GtkInfoBar .button:insensitive:checked { color: rgba(255, 255, 255, 0.4); background-color: rgba(0, 0, 0, 0.1); border-color: rgba(255, 255, 255, 0.2); } @@ -2048,6 +2092,8 @@ GtkVolumeButton.button { .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } + .window-frame.ssd.maximized { + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 3px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2073,6 +2119,7 @@ GtkVolumeButton.button { border-color: transparent; background-color: transparent; background-image: none; + background-color: rgba(231, 232, 235, 0); border-width: 0; } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { @@ -2303,14 +2350,14 @@ NemoWindow .sidebar .frame { NemoWindow GtkSeparator.separator.horizontal, NemoWindow GtkPlacesSidebar.sidebar GtkSeparator.horizontal.view.separator, GtkPlacesSidebar.sidebar NemoWindow GtkSeparator.horizontal.view.separator { color: #dde3e9; } -NemoPathBar.linked > .button { +NemoWindow .primary-toolbar NemoPathBar.linked > .button { color: rgba(82, 93, 118, 0.8); outline-color: rgba(82, 93, 118, 0.1); border-color: rgba(82, 93, 118, 0.1); background-color: rgba(252, 253, 253, 0.9); } - NemoPathBar.linked > .button:hover { + NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover { border-color: #5294E2; } - NemoPathBar.linked > .button:active, NemoPathBar.linked > .button:checked { + NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); border-color: #5294E2; @@ -2324,6 +2371,9 @@ NemoPathBar.linked > .button { border-color: #ffffff; } .open-document-selector-treeview.view:prelight { background-color: rgba(0, 0, 0, 0.05); } + .open-document-selector-treeview.view:prelight:selected { + color: #ffffff; + background-color: #5294E2; } /* Only normal state is handle */ .open-document-selector-name-label { @@ -2392,14 +2442,31 @@ GeditViewFrame .gedit-search-slider, GbEditorFrame .gb-search-slider { border-width: 0 1px 1px 1px; border-style: solid; } +GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr), +GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { + border-color: rgba(82, 93, 118, 0.1); + background-color: rgba(252, 253, 253, 0.9); } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + border-color: #5294E2; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active, GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked { + color: #ffffff; + background-color: #5294E2; + border-color: #5294E2; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { - background-color: rgba(214, 216, 221, 0.95); + border-left-style: none; border-radius: 0 14.5px 14.5px 0; outline-radius: 0 12.5px 12.5px 0; } + GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { + box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { - background-color: rgba(214, 216, 221, 0.95); + border-right-style: none; border-radius: 14.5px 0 0 14.5px; outline-radius: 12.5px 0 0 12.5px; } + GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { + box-shadow: 1px 0 #5294E2; } GbEditorFrame .gb-search-slider { padding: 2px; } @@ -2420,12 +2487,20 @@ GbPreferencesPageLanguage GtkSearchEntry { GbPreferencesPageLanguage GtkScrolledWindow { border-top-width: 0; } +GtkBox.gb-command-bar-box { + border: none; + background-color: #3c4049; } + GtkBox.gb-command-bar-box GtkLabel { + color: #A8ADB5; } + GtkEntry.gb-command-bar-entry.entry.flat, GtkEntry.gb-command-bar-entry.entry.flat:focus { font-family: Monospace; + color: #A8ADB5; background-image: none; - background-color: transparent; - padding: 6px 6px 6px 6px; } + background-color: #3c4049; + padding: 6px 6px 6px 6px; + border: none; } GbSourceStyleSchemeWidget GtkSourceView { font-family: Monospace; } @@ -2639,7 +2714,10 @@ MarlinViewWindow *:selected:focus { text-shadow: none; icon-shadow: none; } -.panel .menubar .menuitem:hover { +.panel .menubar > .menuitem { + padding: 3px 6px; } + +.panel .menubar > .menuitem:hover { background-color: transparent; } .panel .window-frame.menu.csd, @@ -2686,21 +2764,21 @@ SwitchboardCategoryView .view:selected:focus { color: #5c616c; } UnityDecoration { - -UnityDecoration-extents: 28px 0 0 0; + -UnityDecoration-extents: 28px 1 1 1; -UnityDecoration-input-extents: 10px; -UnityDecoration-shadow-offset-x: 0px; - -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba 0, 0, 0, 0.3; - -UnityDecoration-active-shadow-radius: 10px; - -UnityDecoration-inactive-shadow-color: rgba 0, 0, 0, 0.15; - -UnityDecoration-inactive-shadow-radius: 5px; + -UnityDecoration-shadow-offset-y: 3px; + -UnityDecoration-active-shadow-color: rgba(0, 0, 0, 0.15); + -UnityDecoration-active-shadow-radius: 12px; + -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, 0.07); + -UnityDecoration-inactive-shadow-radius: 7px; -UnityDecoration-glow-size: 10px; -UnityDecoration-glow-color: #5294E2; -UnityDecoration-title-indent: 10px; -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0.0; } UnityDecoration.top { - border: none; + border: 1px solid rgba(0, 0, 0, 0.1); border-bottom-width: 0; border-radius: 4px 4px 0 0; padding: 1px 6px 0 6px; @@ -2712,12 +2790,12 @@ UnityDecoration { background-image: linear-gradient(to bottom, #eff0f2); color: rgba(82, 93, 118, 0.5); } UnityDecoration.left, UnityDecoration.right, UnityDecoration.bottom, UnityDecoration.left:backdrop, UnityDecoration.right:backdrop, UnityDecoration.bottom:backdrop { - background-image: none; } + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } UnityPanelWidget, .unity-panel { background-image: linear-gradient(to bottom, #25272d); - color: #A8ADB5; + color: #dfe1e4; box-shadow: none; } .unity-panel.menubar.menuitem:hover, @@ -2887,59 +2965,141 @@ GtkListBox .h4 { GtkFileChooserDialog .dialog-action-box { background-color: #f9fafb; } +NemoWindow GtkEventBox { + background-color: #f9fafb; } + GtkFileChooserDialog *, -NautilusWindow * { +NautilusWindow *, +NemoWindow { -GtkPaned-handle-size: 0; } GtkFileChooserDialog.background, -NautilusWindow.background { +GtkFileChooserDialog .source-list, GtkFileChooserDialog .source-list.view, GtkFileChooserDialog .source-list.view:prelight, +NautilusWindow.background, +NautilusWindow .source-list, +NautilusWindow .source-list.view, +NautilusWindow .source-list.view:prelight, +NemoWindow.background, +NemoWindow .source-list, +NemoWindow .source-list.view, +NemoWindow .source-list.view:prelight, +MarlinViewWindow.background, +MarlinViewWindow .source-list, +MarlinViewWindow .source-list.view, +MarlinViewWindow .source-list.view:prelight { background-color: transparent; } -GtkFileChooserDialog .sidebar, -NautilusWindow .sidebar { +GtkFileChooserDialog .sidebar, GtkFileChooserDialog .source-list.sidebar.view, +NautilusWindow .sidebar, +NautilusWindow .source-list.sidebar.view, +NemoWindow .sidebar, +NemoWindow .source-list.sidebar.view, +MarlinViewWindow .sidebar, +MarlinViewWindow .source-list.sidebar.view { background-color: rgba(60, 64, 73, 0.95); } - GtkFileChooserDialog .sidebar .view, - NautilusWindow .sidebar .view { + GtkFileChooserDialog .sidebar .view, GtkFileChooserDialog .source-list.sidebar.view .view, + NautilusWindow .sidebar .view, + NautilusWindow .source-list.sidebar.view .view, + NemoWindow .sidebar .view, + NemoWindow .source-list.sidebar.view .view, + MarlinViewWindow .sidebar .view, + MarlinViewWindow .source-list.sidebar.view .view { background-color: transparent; color: #A8ADB5; } - GtkFileChooserDialog .sidebar .view.image, - NautilusWindow .sidebar .view.image { + GtkFileChooserDialog .sidebar .view.image, GtkFileChooserDialog .source-list.sidebar.view .view.image, + NautilusWindow .sidebar .view.image, + NautilusWindow .source-list.sidebar.view .view.image, + NemoWindow .sidebar .view.image, + NemoWindow .source-list.sidebar.view .view.image, + MarlinViewWindow .sidebar .view.image, + MarlinViewWindow .source-list.sidebar.view .view.image { color: rgba(168, 173, 181, 0.6); } - GtkFileChooserDialog .sidebar .view.cell:selected, - NautilusWindow .sidebar .view.cell:selected { + GtkFileChooserDialog .sidebar .view.cell:selected, GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected, + NautilusWindow .sidebar .view.cell:selected, + NautilusWindow .source-list.sidebar.view .view.cell:selected, + NemoWindow .sidebar .view.cell:selected, + NemoWindow .source-list.sidebar.view .view.cell:selected, + MarlinViewWindow .sidebar .view.cell:selected, + MarlinViewWindow .source-list.sidebar.view .view.cell:selected { background-color: #5294E2; color: #ffffff; } - GtkFileChooserDialog .sidebar.frame, - NautilusWindow .sidebar.frame { + GtkFileChooserDialog .sidebar.frame, GtkFileChooserDialog .source-list.sidebar.view.frame, + NautilusWindow .sidebar.frame, + NautilusWindow .source-list.sidebar.view.frame, + NemoWindow .sidebar.frame, + NemoWindow .source-list.sidebar.view.frame, + MarlinViewWindow .sidebar.frame, + MarlinViewWindow .source-list.sidebar.view.frame { color: #A8ADB5; } - GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, + GtkFileChooserDialog .sidebar .separator, GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator, GtkFileChooserDialog .source-list.sidebar.view .separator, NautilusWindow .sidebar .separator, - NautilusWindow GtkPlacesSidebar.sidebar .view.separator { + NautilusWindow GtkPlacesSidebar.sidebar .view.separator, + NautilusWindow .source-list.sidebar.view .separator, + NemoWindow .sidebar .separator, + NemoWindow GtkPlacesSidebar.sidebar .view.separator, + NemoWindow .source-list.sidebar.view .separator, + MarlinViewWindow .sidebar .separator, + MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, + MarlinViewWindow .source-list.sidebar.view .separator { color: transparent; } - GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, - NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { + GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, + NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, + NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, + NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, + NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, + MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, + MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider { background-color: #d1d4d8; border: 1px solid rgba(0, 0, 0, 0.3); } - GtkFileChooserDialog .sidebar .scrollbar .trough, - NautilusWindow .sidebar .scrollbar .trough { + GtkFileChooserDialog .sidebar .scrollbar .trough, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough, + NautilusWindow .sidebar .scrollbar .trough, + NautilusWindow .source-list.sidebar.view .scrollbar .trough, + NemoWindow .sidebar .scrollbar .trough, + NemoWindow .source-list.sidebar.view .scrollbar .trough, + MarlinViewWindow .sidebar .scrollbar .trough, + MarlinViewWindow .source-list.sidebar.view .scrollbar .trough { background-color: rgba(0, 0, 0, 0.2); border: none; } - GtkFileChooserDialog .sidebar .scrollbar .slider, - NautilusWindow .sidebar .scrollbar .slider { + GtkFileChooserDialog .sidebar .scrollbar .slider, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider, + NautilusWindow .sidebar .scrollbar .slider, + NautilusWindow .source-list.sidebar.view .scrollbar .slider, + NemoWindow .sidebar .scrollbar .slider, + NemoWindow .source-list.sidebar.view .scrollbar .slider, + MarlinViewWindow .sidebar .scrollbar .slider, + MarlinViewWindow .source-list.sidebar.view .scrollbar .slider { background-color: rgba(209, 212, 216, 0.7); } - GtkFileChooserDialog .sidebar .scrollbar .slider:hover, - NautilusWindow .sidebar .scrollbar .slider:hover { + GtkFileChooserDialog .sidebar .scrollbar .slider:hover, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover, + NautilusWindow .sidebar .scrollbar .slider:hover, + NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover, + NemoWindow .sidebar .scrollbar .slider:hover, + NemoWindow .source-list.sidebar.view .scrollbar .slider:hover, + MarlinViewWindow .sidebar .scrollbar .slider:hover, + MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover { background-color: #dfe1e4; } - GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, - NautilusWindow .sidebar .scrollbar .slider:prelight:active { + GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active, + NautilusWindow .sidebar .scrollbar .slider:prelight:active, + NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active, + NemoWindow .sidebar .scrollbar .slider:prelight:active, + NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active, + MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, + MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active { background-color: #5294E2; } - GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive, - NautilusWindow .sidebar .scrollbar .slider:insensitive { + GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive, GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive, + NautilusWindow .sidebar .scrollbar .slider:insensitive, + NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive, + NemoWindow .sidebar .scrollbar .slider:insensitive, + NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive, + MarlinViewWindow .sidebar .scrollbar .slider:insensitive, + MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive { background-color: transparent; } GtkFileChooserDialog.maximized .sidebar, -NautilusWindow.maximized .sidebar { +NautilusWindow.maximized .sidebar, +NemoWindow.maximized .sidebar, +MarlinViewWindow.maximized .sidebar { background-color: #3c4049; } GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator { +NautilusWindow .pane-separator, +NemoWindow .pane-separator, +MarlinViewWindow .pane-separator { background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { @@ -2953,6 +3113,9 @@ GeditWindow.background { GeditWindow.background .titlebar .pane-separator { background-color: rgba(212, 213, 219, 0.95); } +.gedit-bottom-panel-paned { + background-color: #ffffff; } + .gedit-document-panel { background-color: rgba(60, 64, 73, 0.95); } .maximized .gedit-document-panel { @@ -3056,6 +3219,12 @@ GtkFileChooserDialog .action-bar.frame { @define-color theme_base_color #ffffff; @define-color theme_selected_bg_color #5294E2; @define-color theme_selected_fg_color #ffffff; +@define-color fg_color #5c616c; +@define-color text_color #5c616c; +@define-color bg_color #f9fafb; +@define-color base_color #ffffff; +@define-color selected_bg_color #5294E2; +@define-color selected_fg_color #ffffff; @define-color insensitive_bg_color #fcfdfd; @define-color insensitive_fg_color rgba(92, 97, 108, 0.55); @define-color insensitive_base_color #ffffff; @@ -3063,8 +3232,6 @@ GtkFileChooserDialog .action-bar.frame { @define-color theme_unfocused_text_color #5c616c; @define-color theme_unfocused_bg_color #f9fafb; @define-color theme_unfocused_base_color #ffffff; -@define-color theme_unfocused_selected_bg_color #5294E2; -@define-color theme_unfocused_selected_fg_color #ffffff; @define-color borders #dde3e9; @define-color unfocused_borders #dde3e9; @define-color warning_color #F27835; @@ -3074,7 +3241,7 @@ GtkFileChooserDialog .action-bar.frame { @define-color wm_title rgba(82, 93, 118, 0.8); @define-color wm_unfocused_title alpha(rgba(82, 93, 118, 0.8), 0.7); @define-color wm_bg #e7e8eb; -@define-color wm_bg_unfocused #e7e8eb; +@define-color wm_bg_unfocused #eff0f2; @define-color wm_highlight #f2f3f4; @define-color wm_shadow alpha(black, 0.35); @define-color content_view_bg #ffffff; diff --git a/index.theme b/index.theme new file mode 100644 index 0000000..219f5de --- /dev/null +++ b/index.theme @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=X-GNOME-Metatheme +Name=Arc +Comment=A flat theme with transparent elements +Encoding=UTF-8 + +[X-GNOME-Metatheme] +GtkTheme=Arc +MetacityTheme=Arc +IconTheme=gnome +CursorTheme=DMZ-Black +ButtonLayout=menu:minimize,maximize,close diff --git a/metacity-1/metacity-theme-1.xml b/metacity-1/metacity-theme-1.xml index ba8ef37..ba83938 100644 --- a/metacity-1/metacity-theme-1.xml +++ b/metacity-1/metacity-theme-1.xml @@ -1,11 +1,11 @@ <?xml version="1.0"?> <metacity_theme> <info> - <name>flat</name> + <name>Arc</name> <author>horst3180</author> <copyright>horst3180</copyright> <date>2015</date> - <description>flat Metacity theme</description> + <description>Arc Metacity theme</description> </info> <!-- meaningfull constants --> @@ -24,12 +24,13 @@ <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> <distance name="bottom_height" value="0" /> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> + <distance name="left_titlebar_edge" value="5"/> + <distance name="right_titlebar_edge" value="5"/> <distance name="title_vertical_pad" value="3"/> <border name="title_border" left="10" right="10" top="3" bottom="3"/> - <border name="button_border" left="4" right="4" top="0" bottom="0"/> - <aspect_ratio name="button" value="1.0"/> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="button_width" value="30"/> + <distance name="button_height" value="16"/> </frame_geometry> <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal"> @@ -50,7 +51,6 @@ <frame_geometry name="small" title_scale="small" parent="normal" hide_buttons="true" rounded_top_left="1" rounded_top_right="1"> <distance name="title_vertical_pad" value="7"/> <border name="title_border" left="10" right="10" top="0" bottom="1"/> - <border name="button_border" left="3" right="3" top="0" bottom="2"/> </frame_geometry> <frame_geometry name="small_unfocused" parent="small"> @@ -64,7 +64,6 @@ <distance name="bottom_height" value="0" /> <distance name="title_vertical_pad" value="0" /> <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="3" right="3" top="0" bottom="0"/> </frame_geometry> <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml index ba8ef37..ba83938 100644 --- a/metacity-1/metacity-theme-2.xml +++ b/metacity-1/metacity-theme-2.xml @@ -1,11 +1,11 @@ <?xml version="1.0"?> <metacity_theme> <info> - <name>flat</name> + <name>Arc</name> <author>horst3180</author> <copyright>horst3180</copyright> <date>2015</date> - <description>flat Metacity theme</description> + <description>Arc Metacity theme</description> </info> <!-- meaningfull constants --> @@ -24,12 +24,13 @@ <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> <distance name="bottom_height" value="0" /> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> + <distance name="left_titlebar_edge" value="5"/> + <distance name="right_titlebar_edge" value="5"/> <distance name="title_vertical_pad" value="3"/> <border name="title_border" left="10" right="10" top="3" bottom="3"/> - <border name="button_border" left="4" right="4" top="0" bottom="0"/> - <aspect_ratio name="button" value="1.0"/> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="button_width" value="30"/> + <distance name="button_height" value="16"/> </frame_geometry> <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal"> @@ -50,7 +51,6 @@ <frame_geometry name="small" title_scale="small" parent="normal" hide_buttons="true" rounded_top_left="1" rounded_top_right="1"> <distance name="title_vertical_pad" value="7"/> <border name="title_border" left="10" right="10" top="0" bottom="1"/> - <border name="button_border" left="3" right="3" top="0" bottom="2"/> </frame_geometry> <frame_geometry name="small_unfocused" parent="small"> @@ -64,7 +64,6 @@ <distance name="bottom_height" value="0" /> <distance name="title_vertical_pad" value="0" /> <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="3" right="3" top="0" bottom="0"/> </frame_geometry> <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml index eeb1cb9..d0038a9 100644 --- a/metacity-1/metacity-theme-3.xml +++ b/metacity-1/metacity-theme-3.xml @@ -1,11 +1,11 @@ <?xml version="1.0"?> <metacity_theme> <info> - <name>flat</name> + <name>Arc</name> <author>horst3180</author> <copyright>horst3180</copyright> <date>2015</date> - <description>flat Metacity theme</description> + <description>Arc Metacity theme</description> </info> <!-- meaningfull constants --> @@ -24,12 +24,13 @@ <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> <distance name="bottom_height" value="0" /> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> + <distance name="left_titlebar_edge" value="5"/> + <distance name="right_titlebar_edge" value="5"/> <distance name="title_vertical_pad" value="3"/> <border name="title_border" left="10" right="10" top="3" bottom="3"/> - <border name="button_border" left="4" right="4" top="0" bottom="0"/> - <aspect_ratio name="button" value="1.0"/> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <distance name="button_width" value="30"/> + <distance name="button_height" value="16"/> </frame_geometry> <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal"> @@ -58,7 +59,6 @@ <frame_geometry name="small" title_scale="small" parent="normal" hide_buttons="true" rounded_top_left="1" rounded_top_right="3"> <distance name="title_vertical_pad" value="7"/> <border name="title_border" left="10" right="10" top="0" bottom="1"/> - <border name="button_border" left="3" right="3" top="0" bottom="2"/> </frame_geometry> <frame_geometry name="small_unfocused" parent="small"> @@ -71,7 +71,6 @@ <distance name="right_width" value="1" /> <distance name="bottom_height" value="1" /> <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="3" right="3" top="0" bottom="0"/> <distance name="title_vertical_pad" value="1" /> </frame_geometry> @@ -81,7 +80,6 @@ <distance name="bottom_height" value="0" /> <distance name="title_vertical_pad" value="0" /> <border name="title_border" left="10" right="10" top="0" bottom="0" /> - <border name="button_border" left="3" right="3" top="0" bottom="0"/> </frame_geometry> <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> @@ -129,20 +127,20 @@ <draw_ops name="entire_background_focused"> <rectangle color="C_wm_bg_focused" x="0" y="0" width="width" height="height" filled="true" /> - <rectangle color="C_wm_highlight" x="0" y="0" width="width" height="1" filled="true" /> </draw_ops> <draw_ops name="entire_background_unfocused"> <rectangle color="C_wm_bg_unfocused" x="0" y="0" width="width" height="height" filled="true" /> - <rectangle color="C_wm_highlight" x="0" y="0" width="width" height="1" filled="true" /> </draw_ops> <draw_ops name="titlebar_focused"> - + <rectangle color="C_wm_bg_focused" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_wm_highlight" x="0" y="0" width="width" height="1" filled="true" /> </draw_ops> <draw_ops name="titlebar_unfocused"> - <include name="titlebar_focused" /> + <rectangle color="C_wm_bg_unfocused" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_wm_highlight" x="0" y="0" width="width" height="1" filled="true" /> </draw_ops> <draw_ops name="titlebar_max"> |
