diff --git a/Paper/gtk-3.0/assets/scalable/switch-on.svg b/Paper/gtk-3.0/assets/scalable/switch-on.svg index e0171f7..31ee091 100644 --- a/Paper/gtk-3.0/assets/scalable/switch-on.svg +++ b/Paper/gtk-3.0/assets/scalable/switch-on.svg @@ -95,6 +95,16 @@ d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f7c8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + + + .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:insensitive > .label, .message-dialog.csd .dialog-action-area .titlebar .button.titlebutton:insensitive > .label, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive > .label, .message-dialog.csd .dialog-action-area .header-bar .button.titlebutton:backdrop:insensitive > .label, diff --git a/Paper/gtk-3.0/widgets/progressbars.css b/Paper/gtk-3.0/widgets/progressbars.css index 953712a..dd54f2c 100644 --- a/Paper/gtk-3.0/widgets/progressbars.css +++ b/Paper/gtk-3.0/widgets/progressbars.css @@ -17,6 +17,11 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ +@define-color progressbar_background @progress_color; +@define-color progressbar_border shade(@progressbar_background, 0.7); +@define-color backdrop_progressbar_background shade(@progressbar_background, 1.2); +@define-color insensitive_progressbar_background shade(@insensitive_background, 0.85); + /**************** * Progress bar * @@ -24,65 +29,64 @@ GtkProgressBar { padding: 0; + border: 1px solid; border-radius: 4px; } -GtkProgressBar.progressbar, +GtkProgressBar.progressbar { + box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1); + border-color: @progressbar_border; + color: @text; + background-color: @progressbar_background; +} + GtkProgressBar.progressbar:active { - border: 1px solid shade(@progressbar_background, 0.7); - border-radius: 4px; + border-color: @progressbar_border; color: @text; background-color: @progressbar_background; } GtkProgressBar.progressbar:backdrop, GtkProgressBar.progressbar:active:backdrop { - border: 1px solid shade(@progressbar_background, 0.7); - border-radius: 4px; + border-color: @progressbar_border; color: @backdrop_text; background-color: @backdrop_progressbar_background; } GtkProgressBar.trough { - border: 1px solid @border; - border-radius: 4px; - color: @text; + border-color: @trough_border; background-color: @trough_background; } GtkProgressBar.trough:backdrop { - border: 1px solid @backdrop_border; - border-radius: 4px; - color: @backdrop_text; + border-color: @backdrop_trough_border; background-color: @backdrop_trough_background; } GtkProgressBar.trough:insensitive { - border: 1px solid @insensitive_border; - border-radius: 4px; - color: @insensitive_text; + border-color: @insensitive_trough_border; background-color: @insensitive_trough_background; } .trough, .trough.vertical { padding: 0; - border: 1px solid @border; + border: 1px solid @trough_border; background-color: @trough_background; } .trough:insensitive, .trough.vertical:insensitive { background-image:none; - background-color:@insensitive_base; - border: 1px solid @insensitive_border; + background-color:@insensitive_trough_background; + border: 1px solid @insensitive_rough_border; } .trough:backdrop, .trough.vertical:backdrop { padding: 0; - border: 1px solid @backdrop_border; - background-color: @backdrop_background; + border: 1px solid @backdrop_trough_border; + background-color: @backdrop_trough_background; } @@ -98,8 +102,9 @@ GtkProgressBar.trough:insensitive { .progressbar.vertical row:hover, .progressbar.vertical row:selected, .progressbar.vertical row:selected:focus { - border: 1px solid shade(@progressbar_background, 0.7); - border-radius: 0px; + border: 1px solid @progressbar_border; + border-radius: 4px; + padding: 0; color: alpha(#000,0.5); background-color: @selection; } @@ -112,8 +117,9 @@ GtkProgressBar.trough:insensitive { .progressbar.vertical row:hover:insensitive, .progressbar.vertical row:selected:insensitive, .progressbar.vertical row:selected:focus:insensitive { - border: 1px solid shade(@progressbar_background, 0.7); - border-radius: 0px; + border: 1px solid @insensitive_progressbar_border; + border-radius: 4px; + padding: 0; color: alpha(#000,0.5); background-color: @selection; } @@ -126,8 +132,9 @@ GtkProgressBar.trough:insensitive { .progressbar.vertical row:hover:backdrop, .progressbar.vertical row:selected:backdrop, .progressbar.vertical row:selected:focus:backdrop { - border: 1px solid shade(@progressbar_background, 0.7); - border-radius: 0px; + border: 1px solid @backdrop_progressbar_border; + border-radius: 4px; + padding: 0; color: alpha(#000,0.5); background-color: @backdrop_progressbar_background; } @@ -141,13 +148,10 @@ GtkProgressBar.trough:insensitive { .trough.vertical row:selected, .trough.vertical row:selected:focus { border: 1px solid alpha(#000, 0.2); - border-radius: 0px; + border-radius: 4px; + padding: 0; color: alpha(#000,0.5); background-color: @trough_background; - background-image: linear-gradient(to bottom, - @trough_background, - shade(@trough_background, 1.05) - ); } @@ -160,7 +164,8 @@ GtkProgressBar.trough:insensitive { .trough.vertical row:selected:insensitive, .trough.vertical row:selected:focus:insensitive { border: 1px solid alpha(#000, 0.2); - border-radius: 0px; + border-radius: 4px; + padding: 0; color: alpha(#000,0.5); background-color: @insensitive_trough_background; } @@ -174,7 +179,8 @@ GtkProgressBar.trough:insensitive { .trough.vertical row:selected:backdrop, .trough.vertical row:selected:focus:backdrop { border: 1px solid alpha(#000, 0.2); - border-radius: 0px; + border-radius: 4px; + padding: 0; color: alpha(#000,0.5); background-color: @backdrop_trough_background; } \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/scales.css b/Paper/gtk-3.0/widgets/scales.css index 4ca27cf..d5bcd53 100644 --- a/Paper/gtk-3.0/widgets/scales.css +++ b/Paper/gtk-3.0/widgets/scales.css @@ -16,6 +16,11 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ +@define-color scale_background @progress_color; +@define-color scale_border shade(@scale_background, 0.7); +@define-color backdrop_scale_background shade(@scale_background, 1.2); +@define-color insensitive_scale_background shade(@insensitive_background, 0.8); + /********** * Scales * **********/ @@ -32,8 +37,8 @@ .scale.vertical.highlight.bottom, .menubar .menuitem .scale.highlight.left, .menubar .menuitem .scale.highlight.bottom { - border: 1px solid @selection; - background-color: @selection; + border: 1px solid @scale_background; + background-color: @scale_background; } /* Insensitive fill colors */ @@ -41,26 +46,17 @@ .scale.highlight.bottom:insensitive, .menubar .menuitem .scale.highlight.left:insensitive, .menubar .menuitem .scale.highlight.bottom:insensitive { - border: 1px solid @insensitive_base; - background-color: @insensitive_base; + border: 1px solid @insensitive_scale_background; + background-color: @insensitive_scale_background; } -/* Hover fill colors */ -.scale.highlight.left:hover, -.scale.highlight.bottom:hover, -.menubar .menuitem .scale.highlight.left:hover, -.menubar .menuitem .scale.highlight.bottom:hover { - border: 1px solid shade(@selection, 1.05); - background-color: shade(@selection, 1.05); -} - -/* backdrop fill colors */ +/* Backdrop fill colors */ .scale.vertical.highlight.left:backdrop, .scale.vertical.highlight.bottom:backdrop, .menubar .menuitem.scale.highlight.left:backdrop, .menubar .menuitem.scale.highlight.bottom:backdrop { - border: 1px solid @backdrop_selection; - background-color: @backdrop_selection; + border: 1px solid @backdrop_scale_background; + background-color: @backdrop_scale_background; } /*********** @@ -81,7 +77,7 @@ /* Trough colors */ .scale.trough, .scale.trough.vertical { - border: 1px solid @border; + border: 1px solid @trough_background; background-color: @trough_background; } @@ -89,20 +85,20 @@ .scale.trough:hover, .scale.trough.vertical:hover { border: 1px solid @border; - background-color: @hover_background; + background-color: @border; } /* Insensitive trough colors */ .scale.trough:insensitive, .scale.trough.vertical:insensitive { - border: 1px solid @border; + border: 1px solid @insensitive_trough_background; background-color: @insensitive_trough_background; } -/* backdrop trough colors */ +/* Backdrop trough colors */ .scale.trough:backdrop, .scale.trough.vertical:backdrop { - border: 1px solid @border; + border: 1px solid @backdrop_trough_background; background-color: @backdrop_trough_background; } @@ -111,8 +107,8 @@ ****************/ .scale.progressbar .scale.progressbar.vertical { - background-color: @selection; - border: 1px solid @selection; + background-color: @scale_background; + border: 1px solid @scale_background; } .scale.progressbar:insensitive, diff --git a/Paper/gtk-3.0/widgets/scrollbars.css b/Paper/gtk-3.0/widgets/scrollbars.css index c44c687..5bd5009 100644 --- a/Paper/gtk-3.0/widgets/scrollbars.css +++ b/Paper/gtk-3.0/widgets/scrollbars.css @@ -16,6 +16,14 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ +@define-color scrollbar_slider shade(@foreground,1.2); +@define-color scrollbar_slider_backdrop shade(@scrollbar_slider,0.95); +@define-color scrollbar_slider_insensitive shade(@scrollbar_slider,1.05); + +@define-color scrollbar_trough transparent; +@define-color scrollbar_trough_insensitive shade(@scrollbar_trough,0.95); +@define-color scrollbar_trough_backdrop shade(@scrollbar_trough,0.95); + /************** * Scrollbars * **************/ diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css index d82d30f..de17089 100644 --- a/Paper/gtk-3.0/widgets/titlebar.css +++ b/Paper/gtk-3.0/widgets/titlebar.css @@ -27,7 +27,7 @@ background-color: @header; color: @header_text; box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1), - inset 0 -1px 0 0 rgba(0,0,0,0.1); + inset 0 -1px 2px 0 rgba(0,0,0,0.1); } .maximized .titlebar { @@ -59,7 +59,7 @@ padding-left: 13px; padding-right: 13px; color: @header_text; - font: Bold 10; + font: Bold 9; } /* Subtitle */ @@ -133,7 +133,7 @@ } .titlebar .text-button:active { - font: Bold 10; + font: Bold 9; } /* Checked Button */ @@ -154,7 +154,7 @@ } .titlebar .text-button:checked { - font: Bold 10; + font: Bold 9; } /* Focus Button */ @@ -190,15 +190,6 @@ color: @header_text; } -.titlebar .linked:focus, -.titlebar .image-button:focus -.titlebar .linked:active, -.titlebar .image-button:active -.titlebar .linked:checked, -.titlebar .image-button:checked { - box-shadow: 0 2px 0 0 @header_text; -} - /* Backdrop Button */ .titlebar .button:backdrop, .titlebar .text-button:backdrop, @@ -255,19 +246,8 @@ } -.titlebar .titlebutton:focus:backdrop, -.titlebar .image-button:focus:backdrop -.titlebar .linked:focus:backdrop, -.titlebar .image-button:focus:backdrop -.titlebar .linked:active:backdrop, -.titlebar .image-button:active:backdrop -.titlebar .linked:checked:backdrop, -.titlebar .image-button:checked:backdrop { - box-shadow: 0 2px 0 0 @backdrop_header_text; -} - .titlebar .text-button:active:backdrop { - font: Bold 10; + font: Bold 9; } /* Backdrop:Hover; Button */ diff --git a/src/gtk3/gtk3-assets.svg b/src/gtk3/gtk3-assets.svg index 767357c..20ac713 100644 --- a/src/gtk3/gtk3-assets.svg +++ b/src/gtk3/gtk3-assets.svg @@ -16,7 +16,7 @@ height="300" id="svg11300" sodipodi:version="0.32" - inkscape:version="0.91 r13725" + inkscape:version="0.91 r" sodipodi:docname="gtk3-assets.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" @@ -34,17 +34,17 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="341.56373" - inkscape:cy="88.060311" + inkscape:cx="350.88113" + inkscape:cy="56.461941" inkscape:current-layer="layer2" showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:showpageshadow="false" inkscape:window-width="1366" - inkscape:window-height="699" + inkscape:window-height="713" inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-y="28" width="400px" height="300px" inkscape:snap-nodes="true" @@ -3335,15 +3335,15 @@ + style="fill:#d8d8d8;fill-opacity:1"> + style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" /> + style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" /> + style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#9fb0b9;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" /> + style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#9fb0b9;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#9fb0b9;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new" />