diff -Nru yaru-theme-19.04.2/debian/changelog yaru-theme-19.04.3/debian/changelog --- yaru-theme-19.04.2/debian/changelog 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/debian/changelog 2019-05-24 08:36:47.000000000 +0000 @@ -1,3 +1,17 @@ +yaru-theme (19.04.3) disco; urgency=medium + + * gbp.conf: Update branch for ubuntu/disco + * Sync Yaru with changes in GNOME Shell 3.32.1 + - Fixes switches in VPN submenu (LP: #1829699) + - Fixes region screenshots (Shift + Print Screen) not displaying the + region properly (LP: #1830003) + - Fixes 1px gap next to some lists (e.g. gnome-control-center's users + panel) (LP: #1830203) + - Fixes clock on lock screen not being very readable with very bright + backgrounds (LP: #1830335) + + -- Iain Lane Fri, 24 May 2019 09:36:47 +0100 + yaru-theme (19.04.2) disco; urgency=medium [ Feichtmeier ] diff -Nru yaru-theme-19.04.2/debian/gbp.conf yaru-theme-19.04.3/debian/gbp.conf --- yaru-theme-19.04.2/debian/gbp.conf 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/debian/gbp.conf 2019-05-24 08:36:47.000000000 +0000 @@ -1,4 +1,5 @@ [DEFAULT] +debian-branch=ubuntu/disco debian-tag=%(version)s [dch] diff -Nru yaru-theme-19.04.2/gnome-shell/src/gnome-shell-sass/_common.scss yaru-theme-19.04.3/gnome-shell/src/gnome-shell-sass/_common.scss --- yaru-theme-19.04.2/gnome-shell/src/gnome-shell-sass/_common.scss 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/src/gnome-shell-sass/_common.scss 2019-05-24 08:36:47.000000000 +0000 @@ -189,15 +189,10 @@ width: 65px; height: 22px; background-size: contain; + background-image: url("toggle-off.svg"); + &:checked { background-image: url("toggle-on.svg"); } } - @each $v in us, intl { - .toggle-switch-#{$v} { - background-image: url("toggle-off.svg"); - &:checked { background-image: url("toggle-on.svg"); } - } - } - /* links */ .shell-link { color: $link_color; @@ -1268,10 +1263,16 @@ box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%); } +// Rubberband for select-area screenshots +.select-area-rubberband { + background-color: transparentize($selected_bg_color,0.7); + border: 1px solid $selected_bg_color; +} + .ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position // not really top bar only -.popup-menu-arrow {icon-size: 1.09em; } +.popup-menu-arrow { icon-size: 1.09em; } .popup-menu-icon { icon-size: 1.09em; } //close buttons @@ -1614,9 +1615,9 @@ } &:hover .page-indicator-icon { border-color: white; } - &:active .page-indicator-icon { border: none; margin: 2px; background-color:#fff; } + &:active .page-indicator-icon { border: none; margin: 2px; background-color: white; } &:checked .page-indicator-icon, - &:checked:active { background-color: #fff;} + &:checked:active .page-indicator-icon { background-color: white;} } .no-frequent-applications-label { @extend %status_text; } @@ -2083,6 +2084,8 @@ //SCREEN SHIELD +$_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726); + .screen-shield-arrows { padding-bottom: 3em; } @@ -2092,12 +2095,12 @@ width: 80px; height: 48px; -arrow-thickness: 12px; - -arrow-shadow: 0 1px 1px rgba(0,0,0,0.4); + -arrow-shadow: $_screenshield_shadow; } .screen-shield-clock { color: white; - text-shadow: 0px 1px 2px rgba(0,0,0,0.6); + text-shadow: $_screenshield_shadow; font-weight: bold; text-align: center; padding-bottom: 1.5em; @@ -2105,7 +2108,7 @@ .screen-shield-clock-time { font-size: 72pt; - text-shadow: 0px 2px 2px rgba(0,0,0,0.4); + text-shadow: $_screenshield_shadow; font-feature-settings: "tnum"; } diff -Nru yaru-theme-19.04.2/gnome-shell/upstream/gnome-shell-sass/_colors.scss yaru-theme-19.04.3/gnome-shell/upstream/gnome-shell-sass/_colors.scss --- yaru-theme-19.04.2/gnome-shell/upstream/gnome-shell-sass/_colors.scss 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/upstream/gnome-shell-sass/_colors.scss 2019-05-24 08:36:47.000000000 +0000 @@ -16,7 +16,7 @@ $top_hilight: $borders_edge; $warning_color: #f57900; -$error_color: #cc0000; +$error_color: #ff8080; $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%)); $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%)); diff -Nru yaru-theme-19.04.2/gnome-shell/upstream/gnome-shell-sass/_common.scss yaru-theme-19.04.3/gnome-shell/upstream/gnome-shell-sass/_common.scss --- yaru-theme-19.04.2/gnome-shell/upstream/gnome-shell-sass/_common.scss 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/upstream/gnome-shell-sass/_common.scss 2019-05-24 08:36:47.000000000 +0000 @@ -157,18 +157,13 @@ /* Switches */ .toggle-switch { - width: 65px; + width: 46px; height: 22px; background-size: contain; + background-image: url("resource:///org/gnome/shell/theme/toggle-off-intl.svg"); + &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-intl.svg"); } } - @each $v in us, intl { - .toggle-switch-#{$v} { - background-image: url("resource:///org/gnome/shell/theme/toggle-off-#{$v}.svg"); - &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-#{$v}.svg"); } - } - } - /* links */ .shell-link { color: $link_color; @@ -392,7 +387,7 @@ .prompt-dialog-error-label { font-size: 10pt; - color: $error_color; + color: $warning_color; padding-bottom: 8px; } @@ -1031,6 +1026,11 @@ -st-icon-style: symbolic; } + .message-icon-bin > .fallback-window-icon { + width: 1.09em; + height: 1.09em; + } + .message-secondary-bin { padding: 0 0.82em;; } @@ -1137,8 +1137,14 @@ .ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position +// Rubberband for select-area screenshots +.select-area-rubberband { + background-color: transparentize($selected_bg_color,0.7); + border: 1px solid $selected_bg_color; +} + // not really top bar only -.popup-menu-arrow { width: 16px; height: 16px; } +.popup-menu-arrow { icon-size: 1.09em; } .popup-menu-icon { icon-size: 1.09em; } //close buttons @@ -1448,13 +1454,13 @@ height: 12px; background-color: transparent; border: 2px solid rgba(255, 255, 255, 0.4); - border-radius:12px; + border-radius: 12px; } &:hover .page-indicator-icon { border-color: white; } - &:active .page-indicator-icon { border: none; margin: 2px; background-color:#fff; } + &:active .page-indicator-icon { border: none; margin: 2px; background-color: white; } &:checked .page-indicator-icon, - &:checked:active { background-color: #fff;} + &:checked:active .page-indicator-icon { background-color: white;} } .no-frequent-applications-label { @extend %status_text; } diff -Nru yaru-theme-19.04.2/gnome-shell/upstream/toggle-off-intl.svg yaru-theme-19.04.3/gnome-shell/upstream/toggle-off-intl.svg --- yaru-theme-19.04.2/gnome-shell/upstream/toggle-off-intl.svg 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/upstream/toggle-off-intl.svg 2019-05-24 08:36:47.000000000 +0000 @@ -10,124 +10,62 @@ 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="65" + width="46" height="22" - id="svg2857" + viewBox="0 0 46 22" version="1.1" - inkscape:version="0.48.5 r10040" - sodipodi:docname="toggle-off-us.svg"> + id="svg2751" + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="toggle-off-intl.svg"> - - + id="defs2745"> - + id="linearGradient3329"> + id="stop3325" /> + id="stop3327" /> - - - - - - - + gradientTransform="translate(-42.760724)" /> + id="grid3298" /> + id="metadata2748"> @@ -142,68 +80,24 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-444.64286,-781.36218)"> - - - - - - - - - - - - - + transform="translate(0,-291.17916)"> + + diff -Nru yaru-theme-19.04.2/gnome-shell/upstream/toggle-off-us.svg yaru-theme-19.04.3/gnome-shell/upstream/toggle-off-us.svg --- yaru-theme-19.04.2/gnome-shell/upstream/toggle-off-us.svg 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/upstream/toggle-off-us.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - OFF - - - diff -Nru yaru-theme-19.04.2/gnome-shell/upstream/toggle-on-intl.svg yaru-theme-19.04.3/gnome-shell/upstream/toggle-on-intl.svg --- yaru-theme-19.04.2/gnome-shell/upstream/toggle-on-intl.svg 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/upstream/toggle-on-intl.svg 2019-05-24 08:36:47.000000000 +0000 @@ -10,117 +10,69 @@ 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="65" + width="46" height="22" - id="svg2857" + viewBox="0 0 46 22" version="1.1" - inkscape:version="0.91 r13725" + id="svg2751" + inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="toggle-on-intl.svg"> - - + id="defs2745"> - + id="linearGradient3329"> + id="stop3325" /> + id="stop3327" /> - - - - - + gradientTransform="translate(-19)" /> + id="grid3298" /> + id="metadata2748"> image/svg+xml - + @@ -128,65 +80,24 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-444.64286,-781.36218)"> - - - - - - - - - - - - - + transform="translate(0,-291.17916)"> + + diff -Nru yaru-theme-19.04.2/gnome-shell/upstream/toggle-on-us.svg yaru-theme-19.04.3/gnome-shell/upstream/toggle-on-us.svg --- yaru-theme-19.04.2/gnome-shell/upstream/toggle-on-us.svg 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gnome-shell/upstream/toggle-on-us.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - ON - - - diff -Nru yaru-theme-19.04.2/gtk/src/light/gtk-3.20/_common.scss yaru-theme-19.04.3/gtk/src/light/gtk-3.20/_common.scss --- yaru-theme-19.04.2/gtk/src/light/gtk-3.20/_common.scss 2019-03-18 16:50:36.000000000 +0000 +++ yaru-theme-19.04.3/gtk/src/light/gtk-3.20/_common.scss 2019-05-24 08:36:47.000000000 +0000 @@ -3729,7 +3729,7 @@ //vbox and hbox separators separator { background: transparentize($borders_color, 0.7); - min-width: 1px; + min-width: 0px; min-height: 1px; }