Hello community, here is the log from the commit of package adapta-gtk-theme for openSUSE:Factory checked in at 2018-05-19 15:43:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/adapta-gtk-theme (Old) and /work/SRC/openSUSE:Factory/.adapta-gtk-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adapta-gtk-theme" Sat May 19 15:43:34 2018 rev:22 rq:610520 version:3.93.1.16 Changes: -------- --- /work/SRC/openSUSE:Factory/adapta-gtk-theme/adapta-gtk-theme.changes 2018-05-08 13:39:18.425293051 +0200 +++ /work/SRC/openSUSE:Factory/.adapta-gtk-theme.new/adapta-gtk-theme.changes 2018-05-19 15:43:39.544009207 +0200 @@ -1,0 +2,15 @@ +Fri May 18 19:04:07 UTC 2018 - [email protected] + +- Update to 3.93.1.16 + * Reverted button radius to 2px in GtkEmojiPicker (Gtk+ 3.22/4.0). + * Enforced resetting GtkLabel bottom margins in Gnome-Tweaks GtkHeaderBars (Gtk+ 3.22/4.0). +- Changes in 3.93.1.14 + * Reverted some missing properties caused unwanted indentations in PopupMenu (Gnome-Shell 3.24/3.26). + * Added an ugly workaround for weird X-align of WindowCaption in Wayland session (Gnome-Shell 3.26). +- Changes in 3.93.1.12 + * Cleaned up Budgie IconTasklistApplet styling for >= v10.4-70-g15c960cc (Gtk+ 3.2x/4.0). + * Introduced new CSD-titlebutton rendering method for Fxxkin'Fox Quantum (Gtk+ 3.2x/4.0). +- Changes in 3.93.1.7 + * Prepared for upcoming Budgie's TabSwitcher window layout (Gtk+ 3.2x/4.0). + +------------------------------------------------------------------- Old: ---- adapta-gtk-theme-3.93.1.4.tar.gz New: ---- adapta-gtk-theme-3.93.1.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adapta-gtk-theme.spec ++++++ --- /var/tmp/diff_new_pack.6kGQI7/_old 2018-05-19 15:43:40.291981841 +0200 +++ /var/tmp/diff_new_pack.6kGQI7/_new 2018-05-19 15:43:40.295981695 +0200 @@ -21,7 +21,7 @@ %define gtk3_min_version 3.20.0 %define gtk2_min_version 2.24.30 Name: adapta-gtk-theme -Version: 3.93.1.4 +Version: 3.93.1.16 Release: 0 Summary: An adaptive Gtk+ theme based on Material Design Guidelines License: GPL-2.0-only AND CC-BY-SA-4.0 ++++++ adapta-gtk-theme-3.93.1.4.tar.gz -> adapta-gtk-theme-3.93.1.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/README.md new/adapta-gtk-theme-3.93.1.16/README.md --- old/adapta-gtk-theme-3.93.1.4/README.md 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/README.md 2018-05-13 09:13:34.000000000 +0200 @@ -29,7 +29,7 @@ > **Note:** > > * Roboto is very nice with Adapta, but in some locales, it causes Tofu. -> * NotoSans may work well in vairous locales, but NotoSans lacks 500 (Medium) weight. So elements defined with 500 will be drawn with 400 automatically. +> * NotoSans may work well in various locales, but NotoSans lacks 500 (Medium) weight. So elements defined with 500 will be drawn with 400 automatically. > * NotoSans CJK supports 500 weight. > * NotoSans is used as the 'password chars **U+25CF**' only in Gnome-Shell >= > 3.26. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.20/_3rd-party.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.20/_3rd-party.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.20/_3rd-party.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.20/_3rd-party.scss 2018-05-13 09:13:34.000000000 +0200 @@ -118,6 +118,7 @@ } // icon tasklist styling +%icon_tasklist_droptarget, box.pinned { // drop-target &:drop(active) { border: none; @@ -224,10 +225,7 @@ // upcoming icon tasklist widget.icon-tasklist { > box:drop(active) { // drop-target - border: none; - border-radius: 0; - background-color: gtkopacity($drop_target_color, 0.2); - box-shadow: inset 0 0 0 1px $drop_target_color; + @extend %icon_tasklist_droptarget; } } @@ -237,15 +235,9 @@ background-image 0.4s $slope_slow, box-shadow 0s $slope_slow; // exclude box-shadows - widget.icon { opacity: 0.87; } - &:hover, &:checked, - &.running { - box-shadow: none; // unset before drawing indicators - - widget.icon { opacity: 1.0; } - } + &.running { box-shadow: none; } // unset before drawing indicators &:active { box-shadow: none; @@ -253,8 +245,6 @@ background-color 0.4s $slope_slow, background-image 0s $slope_slow, box-shadow 0s $slope_slow; - - widget.icon { opacity: 1.0; } } } @@ -1275,9 +1265,7 @@ } // alt-tab apps switcher styling -$min_child_width: 60px; -$min_spacing: 6px; -$max_childs: 8; +$child_margin: 2px; window.budgie-switcher-window { border-radius: 2px; @@ -1285,27 +1273,23 @@ // draw actual backgrounds and shadows .drop-shadow { - margin: 8px 8px 16px; // reserve area for shadows + margin: 16px 24px 32px; // reserve area for shadows border-radius: 2px; background-color: gtkopacity($inverted_dark_color, 0.9); box-shadow: $z-depth-4; // raise to level-4 label.budgie-switcher-title { // bottom label for app titles - // default max_children_per_line = 8 - // keep the minimum width defined by tabswitcher.ui - min-width: ($min_child_width + $min_spacing) * $max_childs - + $min_spacing * ($max_childs - 1); // prepare for tall and dense fonts min-height: 13.3px * 2; // use non-scaling unit - color: $inverted_accent_label_color; + color: $inverted_fg_color; font-weight: 500; - &:dir(ltr) { padding: 0 0 0 6px; } - &:dir(rtl) { padding: 0 6px 0 0; } + &:dir(ltr) { padding: 0 0 0 ($child_margin * 2); } + &:dir(rtl) { padding: 0 ($child_margin * 2) 0 0; } } } flowboxchild { // icon-tiles - margin: $min_spacing / 2; + margin: $child_margin; border-radius: 2px; -gtk-outline-radius: 2px; color: $inverted_secondary_accent_label_color; @@ -2823,28 +2807,80 @@ padding: if($ref_weight < 1.0, 0 4px, 0 7px); } -$compact_tab_height: 28px; +%browser_csd_titlebutton { + // define global titlebutton class sizing + margin: 0; // unset margins + padding: 0; + background-position: center center; + background-repeat: no-repeat; + color: transparent; // hide stock icons + + @each $_class, $_suffix1 in ('close', '-close'), + ('minimize', '-minimize'), + ('maximize', '-maximize') { + @each $_pseudo, $_suffix2 in ('', ''), + (':hover', '-active'), + (':active', '-active'), + (':backdrop', '-backdrop') { + &.#{$_class}#{$_pseudo} { + background-image: + -gtk-scaled( + url("assets/window#{$_suffix1}#{$_suffix2}.png"), + url("assets/window#{$_suffix1}#{$_suffix2}@2.png")); + } + } + } -window#MozillaGtkWidget.background { - &, - decoration, - headerbar.titlebar { border-radius: 0; } // unset roundness + &.close { + &:hover { background-color: $destructive_color; } + &:active { background-color: $selected_bg_color; } + &:backdrop:hover { + background-color: gtkopacity($destructive_color, 0.4); + } + } + + &:not(.close) { + &:hover { background-color: gtkopacity($inverted_fg_color, 0.12); } + &:active { background-color: gtkopacity($inverted_fg_color, 0.25); } + &:backdrop:hover { + background-color: gtkopacity($inverted_fg_color, 0.12 * 0.4); + } + } +} + +%browser_maxd_csd_titlebutton { + @each $_pseudo, $_suffix2 in ('', ''), + (':hover', '-active'), + (':active', '-active'), + (':backdrop', '-backdrop') { + &#{$_pseudo} { + background-image: + -gtk-scaled(url("assets/window-unmaximize#{$_suffix2}.png"), + url("assets/window-unmaximize#{$_suffix2}@2.png")); + } + } } #MozillaGtkWidget.background { headerbar.titlebar { // >= nightly 60.0a1(2018-02-02) // FIXME: no backdrop state, no maximized state, bullshit... - - padding: if($ref_weight < 1.0, 0 3px, 2px 3px); - border-radius: 2px 2px 0 0; + padding: 0 if($ref_weight < 1.0, (28px - $icon_size * 1.25) / 2, + (28px - $icon_size * 1.5) / 2); border-top: 1px solid $top_edge_borders_color; &.default-decoration button.titlebutton { - // compute proper T/B magins - margin: ($compact_tab_height - $titlebutton_small) / 2 0; + @extend %browser_csd_titlebutton; + min-width: if($ref_weight < 1.0, $icon_size * 1.25, + $icon_size * 1.5); + min-height: if($ref_weight < 1.0, $icon_size * 1.25, + $icon_size * 1.5); } } + // &.maximized headerbar.titlebar.default-decoration { + // button.titlebutton.maximize { @extend %browser_maxd_csd_titlebutton; } + // } + // blend with weird toolbar backgrounds background-color: if($variant == light, $base_color, rgb(4, 18, 25)); @@ -3923,59 +3959,15 @@ // from nav_button_provider_gtk3.cc (> 62.0.3202?) button.titlebutton { // title-buttons - // define global titlebutton class sizing + @extend %browser_csd_titlebutton; min-width: $icon_size; // > 16px causes image blurring min-height: $icon_size; - margin: 0; // unset margins - padding: 0; - color: transparent; // hide stock icons - - @each $_class, $_suffix1 in ('close', '-close'), - ('minimize', '-minimize'), - ('maximize', '-maximize') { - @each $_pseudo, $_suffix2 in ('', ''), - (':hover', '-active'), - (':active', '-active'), - (':backdrop', '-backdrop') { - &.#{$_class}#{$_pseudo} { - background-image: - -gtk-scaled( - url("assets/window#{$_suffix1}#{$_suffix2}.png"), - url("assets/window#{$_suffix1}#{$_suffix2}@2.png")); - } - } - } - - &.close { - &:hover { background-color: $destructive_color; } - &:active { background-color: $selected_bg_color; } - &:backdrop:hover { - background-color: gtkopacity($destructive_color, 0.4); - } - } - - &:not(.close) { - &:hover { background-color: gtkopacity($inverted_fg_color, 0.12); } - &:active { background-color: gtkopacity($inverted_fg_color, 0.25); } - &:backdrop:hover { - background-color: gtkopacity($inverted_fg_color, 0.12 * 0.4); - } - } } } // for unmaximize(restore) titlebutton &.maximized headerbar.titlebar button.titlebutton.maximize { - @each $_pseudo, $_suffix2 in ('', ''), - (':hover', '-active'), - (':active', '-active'), - (':backdrop', '-backdrop') { - &#{$_pseudo} { - background-image: - -gtk-scaled(url("assets/window-unmaximize#{$_suffix2}.png"), - url("assets/window-unmaximize#{$_suffix2}@2.png")); - } - } + @extend %browser_maxd_csd_titlebutton; } // FIXME: not for actual button widgets but for toolbar's separators diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.22/_3rd-party.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.22/_3rd-party.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.22/_3rd-party.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.22/_3rd-party.scss 2018-05-13 09:13:34.000000000 +0200 @@ -118,6 +118,7 @@ } // icon tasklist styling +%icon_tasklist_droptarget, box.pinned { // drop-target &:drop(active) { border: none; @@ -224,10 +225,7 @@ // upcoming icon tasklist widget.icon-tasklist { > box:drop(active) { // drop-target - border: none; - border-radius: 0; - background-color: gtkopacity($drop_target_color, 0.2); - box-shadow: inset 0 0 0 1px $drop_target_color; + @extend %icon_tasklist_droptarget; } } @@ -237,15 +235,9 @@ background-image 0.4s $slope_slow, box-shadow 0s $slope_slow; // exclude box-shadows - widget.icon { opacity: 0.87; } - &:hover, &:checked, - &.running { - box-shadow: none; // unset before drawing indicators - - widget.icon { opacity: 1.0; } - } + &.running { box-shadow: none; } // unset before drawing indicators &:active { box-shadow: none; @@ -253,8 +245,6 @@ background-color 0.4s $slope_slow, background-image 0s $slope_slow, box-shadow 0s $slope_slow; - - widget.icon { opacity: 1.0; } } } @@ -1308,9 +1298,7 @@ } // alt-tab apps switcher styling -$min_child_width: 60px; -$min_spacing: 6px; -$max_childs: 8; +$child_margin: 2px; window.budgie-switcher-window { border-radius: 2px; @@ -1318,27 +1306,23 @@ // draw actual backgrounds and shadows .drop-shadow { - margin: 8px 8px 16px; // reserve area for shadows + margin: 16px 24px 32px; // reserve area for shadows border-radius: 2px; background-color: gtkopacity($inverted_dark_color, 0.9); box-shadow: $z-depth-4; // raise to level-4 label.budgie-switcher-title { // bottom label for app titles - // default max_children_per_line = 8 - // keep the minimum width defined by tabswitcher.ui - min-width: ($min_child_width + $min_spacing) * $max_childs - + $min_spacing * ($max_childs - 1); // prepare for tall and dense fonts min-height: 13.3px * 2; // use non-scaling unit - color: $inverted_accent_label_color; + color: $inverted_fg_color; font-weight: 500; - &:dir(ltr) { padding: 0 0 0 6px; } - &:dir(rtl) { padding: 0 6px 0 0; } + &:dir(ltr) { padding: 0 0 0 ($child_margin * 2); } + &:dir(rtl) { padding: 0 ($child_margin * 2) 0 0; } } } flowboxchild { // icon-tiles - margin: $min_spacing / 2; + margin: $child_margin; border-radius: 2px; -gtk-outline-radius: 2px; color: $inverted_secondary_accent_label_color; @@ -2642,28 +2626,80 @@ padding: if($ref_weight < 1.0, 0 4px, 0 7px); } -$compact_tab_height: 28px; +%browser_csd_titlebutton { + // define global titlebutton class sizing + margin: 0; // unset margins + padding: 0; + background-position: center center; + background-repeat: no-repeat; + color: transparent; // hide stock icons + + @each $_class, $_suffix1 in ('close', '-close'), + ('minimize', '-minimize'), + ('maximize', '-maximize') { + @each $_pseudo, $_suffix2 in ('', ''), + (':hover', '-active'), + (':active', '-active'), + (':backdrop', '-backdrop') { + &.#{$_class}#{$_pseudo} { + background-image: + -gtk-scaled( + url("assets/window#{$_suffix1}#{$_suffix2}.png"), + url("assets/window#{$_suffix1}#{$_suffix2}@2.png")); + } + } + } -window#MozillaGtkWidget.background { - &, - decoration, - headerbar.titlebar { border-radius: 0; } // unset roundness + &.close { + &:hover { background-color: $destructive_color; } + &:active { background-color: $selected_bg_color; } + &:backdrop:hover { + background-color: gtkopacity($destructive_color, 0.4); + } + } + + &:not(.close) { + &:hover { background-color: gtkopacity($inverted_fg_color, 0.12); } + &:active { background-color: gtkopacity($inverted_fg_color, 0.25); } + &:backdrop:hover { + background-color: gtkopacity($inverted_fg_color, 0.12 * 0.4); + } + } +} + +%browser_maxd_csd_titlebutton { + @each $_pseudo, $_suffix2 in ('', ''), + (':hover', '-active'), + (':active', '-active'), + (':backdrop', '-backdrop') { + &#{$_pseudo} { + background-image: + -gtk-scaled(url("assets/window-unmaximize#{$_suffix2}.png"), + url("assets/window-unmaximize#{$_suffix2}@2.png")); + } + } } #MozillaGtkWidget.background { headerbar.titlebar { // >= nightly 60.0a1(2018-02-02) // FIXME: no backdrop state, no maximized state, bullshit... - - padding: if($ref_weight < 1.0, 0 3px, 2px 3px); - border-radius: 2px 2px 0 0; + padding: 0 if($ref_weight < 1.0, (28px - $icon_size * 1.25) / 2, + (28px - $icon_size * 1.5) / 2); border-top: 1px solid $top_edge_borders_color; &.default-decoration button.titlebutton { - // compute proper T/B magins - margin: ($compact_tab_height - $titlebutton_small) / 2 0; + @extend %browser_csd_titlebutton; + min-width: if($ref_weight < 1.0, $icon_size * 1.25, + $icon_size * 1.5); + min-height: if($ref_weight < 1.0, $icon_size * 1.25, + $icon_size * 1.5); } } + // &.maximized headerbar.titlebar.default-decoration { + // button.titlebutton.maximize { @extend %browser_maxd_csd_titlebutton; } + // } + // blend with weird toolbar backgrounds background-color: if($variant == light, $base_color, rgb(4, 18, 25)); @@ -3672,59 +3708,15 @@ // from nav_button_provider_gtk3.cc (> 62.0.3202?) button.titlebutton { // title-buttons - // define global titlebutton class sizing + @extend %browser_csd_titlebutton; min-width: $icon_size; // > 16px causes image blurring min-height: $icon_size; - margin: 0; // unset margins - padding: 0; - color: transparent; // hide stock icons - - @each $_class, $_suffix1 in ('close', '-close'), - ('minimize', '-minimize'), - ('maximize', '-maximize') { - @each $_pseudo, $_suffix2 in ('', ''), - (':hover', '-active'), - (':active', '-active'), - (':backdrop', '-backdrop') { - &.#{$_class}#{$_pseudo} { - background-image: - -gtk-scaled( - url("assets/window#{$_suffix1}#{$_suffix2}.png"), - url("assets/window#{$_suffix1}#{$_suffix2}@2.png")); - } - } - } - - &.close { - &:hover { background-color: $destructive_color; } - &:active { background-color: $selected_bg_color; } - &:backdrop:hover { - background-color: gtkopacity($destructive_color, 0.4); - } - } - - &:not(.close) { - &:hover { background-color: gtkopacity($inverted_fg_color, 0.12); } - &:active { background-color: gtkopacity($inverted_fg_color, 0.25); } - &:backdrop:hover { - background-color: gtkopacity($inverted_fg_color, 0.12 * 0.4); - } - } } } // for unmaximize(restore) titlebutton &.maximized headerbar.titlebar button.titlebutton.maximize { - @each $_pseudo, $_suffix2 in ('', ''), - (':hover', '-active'), - (':active', '-active'), - (':backdrop', '-backdrop') { - &#{$_pseudo} { - background-image: - -gtk-scaled(url("assets/window-unmaximize#{$_suffix2}.png"), - url("assets/window-unmaximize#{$_suffix2}@2.png")); - } - } + @extend %browser_maxd_csd_titlebutton; } // FIXME: not for actual button widgets but for toolbar's separators diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.22/_common.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.22/_common.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.22/_common.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.22/_common.scss 2018-05-13 09:13:34.000000000 +0200 @@ -6493,8 +6493,8 @@ min-width: rem($widget_size - 4px, $sw: 1.0); margin: 2px 0 0; padding: 0; - border-radius: 100px; - -gtk-outline-radius: 100px; + border-radius: 2px; + -gtk-outline-radius: 2px; label { padding: 0; // unset padding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.22/_misc.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.22/_misc.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/3.22/_misc.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/3.22/_misc.scss 2018-05-13 09:13:34.000000000 +0200 @@ -270,6 +270,14 @@ } } +headerbar.titlebar.tweak-titlebar { + &-left, + &-right { + // re-define bottom margin + > .title { margin: 0 0 rem(1.3px, $sw: 1.0); } + } +} + // /******************* // * Gnome-Flashback * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/4.0/_3rd-party.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/4.0/_3rd-party.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/4.0/_3rd-party.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/4.0/_3rd-party.scss 2018-05-13 09:13:34.000000000 +0200 @@ -118,6 +118,7 @@ } // icon tasklist styling +%icon_tasklist_droptarget, box.pinned { // drop-target &:drop(active) { border: none; @@ -224,10 +225,7 @@ // upcoming icon tasklist widget.icon-tasklist { > box:drop(active) { // drop-target - border: none; - border-radius: 0; - background-color: gtkopacity($drop_target_color, 0.2); - box-shadow: inset 0 0 0 1px $drop_target_color; + @extend %icon_tasklist_droptarget; } } @@ -237,15 +235,9 @@ background-image 0.4s $slope_slow, box-shadow 0s $slope_slow; // exclude box-shadows - widget.icon { opacity: 0.87; } - &:hover, &:checked, - &.running { - box-shadow: none; // unset before drawing indicators - - widget.icon { opacity: 1.0; } - } + &.running { box-shadow: none; } // unset before drawing indicators &:active { box-shadow: none; @@ -253,8 +245,6 @@ background-color 0.4s $slope_slow, background-image 0s $slope_slow, box-shadow 0s $slope_slow; - - widget.icon { opacity: 1.0; } } } @@ -1296,9 +1286,7 @@ } // alt-tab apps switcher styling -$min_child_width: 60px; -$min_spacing: 6px; -$max_childs: 8; +$child_margin: 2px; window.budgie-switcher-window { border-radius: 2px; @@ -1306,27 +1294,23 @@ // draw actual backgrounds and shadows .drop-shadow { - margin: 8px 8px 16px; // reserve area for shadows + margin: 16px 24px 32px; // reserve area for shadows border-radius: 2px; background-color: gtkopacity($inverted_dark_color, 0.9); box-shadow: $z-depth-4; // raise to level-4 label.budgie-switcher-title { // bottom label for app titles - // default max_children_per_line = 8 - // keep the minimum width defined by tabswitcher.ui - min-width: ($min_child_width + $min_spacing) * $max_childs - + $min_spacing * ($max_childs - 1); // prepare for tall and dense fonts min-height: 13.3px * 2; // use non-scaling unit - color: $inverted_accent_label_color; + color: $inverted_fg_color; font-weight: 500; - &:dir(ltr) { padding: 0 0 0 6px; } - &:dir(rtl) { padding: 0 6px 0 0; } + &:dir(ltr) { padding: 0 0 0 ($child_margin * 2); } + &:dir(rtl) { padding: 0 ($child_margin * 2) 0 0; } } } flowboxchild { // icon-tiles - margin: $min_spacing / 2; + margin: $child_margin; border-radius: 2px; -gtk-outline-radius: 2px; color: $inverted_secondary_accent_label_color; @@ -2620,28 +2604,80 @@ padding: if($ref_weight < 1.0, 0 4px, 0 7px); } -$compact_tab_height: 28px; +%browser_csd_titlebutton { + // define global titlebutton class sizing + margin: 0; // unset margins + padding: 0; + background-position: center center; + background-repeat: no-repeat; + color: transparent; // hide stock icons + + @each $_class, $_suffix1 in ('close', '-close'), + ('minimize', '-minimize'), + ('maximize', '-maximize') { + @each $_pseudo, $_suffix2 in ('', ''), + (':hover', '-active'), + (':active', '-active'), + (':backdrop', '-backdrop') { + &.#{$_class}#{$_pseudo} { + background-image: + -gtk-scaled( + url("assets/window#{$_suffix1}#{$_suffix2}.png"), + url("assets/window#{$_suffix1}#{$_suffix2}@2.png")); + } + } + } -window#MozillaGtkWidget.background { - &, - decoration, - headerbar.titlebar { border-radius: 0; } // unset roundness + &.close { + &:hover { background-color: $destructive_color; } + &:active { background-color: $selected_bg_color; } + &:backdrop:hover { + background-color: gtkopacity($destructive_color, 0.4); + } + } + + &:not(.close) { + &:hover { background-color: gtkopacity($inverted_fg_color, 0.12); } + &:active { background-color: gtkopacity($inverted_fg_color, 0.25); } + &:backdrop:hover { + background-color: gtkopacity($inverted_fg_color, 0.12 * 0.4); + } + } +} + +%browser_maxd_csd_titlebutton { + @each $_pseudo, $_suffix2 in ('', ''), + (':hover', '-active'), + (':active', '-active'), + (':backdrop', '-backdrop') { + &#{$_pseudo} { + background-image: + -gtk-scaled(url("assets/window-unmaximize#{$_suffix2}.png"), + url("assets/window-unmaximize#{$_suffix2}@2.png")); + } + } } #MozillaGtkWidget.background { headerbar.titlebar { // >= nightly 60.0a1(2018-02-02) // FIXME: no backdrop state, no maximized state, bullshit... - - padding: if($ref_weight < 1.0, 0 3px, 2px 3px); - border-radius: 2px 2px 0 0; + padding: 0 if($ref_weight < 1.0, (28px - $icon_size * 1.25) / 2, + (28px - $icon_size * 1.5) / 2); border-top: 1px solid $top_edge_borders_color; &.default-decoration button.titlebutton { - // compute proper T/B magins - margin: ($compact_tab_height - $titlebutton_small) / 2 0; + @extend %browser_csd_titlebutton; + min-width: if($ref_weight < 1.0, $icon_size * 1.25, + $icon_size * 1.5); + min-height: if($ref_weight < 1.0, $icon_size * 1.25, + $icon_size * 1.5); } } + // &.maximized headerbar.titlebar.default-decoration { + // button.titlebutton.maximize { @extend %browser_maxd_csd_titlebutton; } + // } + // blend with weird toolbar backgrounds background-color: if($variant == light, $base_color, rgb(4, 18, 25)); @@ -3648,59 +3684,15 @@ // from nav_button_provider_gtk3.cc (> 62.0.3202?) button.titlebutton { // title-buttons - // define global titlebutton class sizing + @extend %browser_csd_titlebutton; min-width: $icon_size; // > 16px causes image blurring min-height: $icon_size; - margin: 0; // unset margins - padding: 0; - color: transparent; // hide stock icons - - @each $_class, $_suffix1 in ('close', '-close'), - ('minimize', '-minimize'), - ('maximize', '-maximize') { - @each $_pseudo, $_suffix2 in ('', ''), - (':hover', '-active'), - (':active', '-active'), - (':backdrop', '-backdrop') { - &.#{$_class}#{$_pseudo} { - background-image: - -gtk-scaled( - url("assets/window#{$_suffix1}#{$_suffix2}.png"), - url("assets/window#{$_suffix1}#{$_suffix2}@2.png")); - } - } - } - - &.close { - &:hover { background-color: $destructive_color; } - &:active { background-color: $selected_bg_color; } - &:backdrop:hover { - background-color: gtkopacity($destructive_color, 0.4); - } - } - - &:not(.close) { - &:hover { background-color: gtkopacity($inverted_fg_color, 0.12); } - &:active { background-color: gtkopacity($inverted_fg_color, 0.25); } - &:backdrop:hover { - background-color: gtkopacity($inverted_fg_color, 0.12 * 0.4); - } - } } } // for unmaximize(restore) titlebutton &.maximized headerbar.titlebar button.titlebutton.maximize { - @each $_pseudo, $_suffix2 in ('', ''), - (':hover', '-active'), - (':active', '-active'), - (':backdrop', '-backdrop') { - &#{$_pseudo} { - background-image: - -gtk-scaled(url("assets/window-unmaximize#{$_suffix2}.png"), - url("assets/window-unmaximize#{$_suffix2}@2.png")); - } - } + @extend %browser_maxd_csd_titlebutton; } // FIXME: not for actual button widgets but for toolbar's separators diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/4.0/_common.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/4.0/_common.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/4.0/_common.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/4.0/_common.scss 2018-05-13 09:13:34.000000000 +0200 @@ -6432,8 +6432,8 @@ min-width: rem($widget_size - 4px, $sw: 1.0); margin: 2px 0 0; padding: 0; - border-radius: 100px; - -gtk-outline-radius: 100px; + border-radius: 2px; + -gtk-outline-radius: 2px; label { padding: 0; // unset padding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/gtk/sass/4.0/_misc.scss new/adapta-gtk-theme-3.93.1.16/gtk/sass/4.0/_misc.scss --- old/adapta-gtk-theme-3.93.1.4/gtk/sass/4.0/_misc.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/gtk/sass/4.0/_misc.scss 2018-05-13 09:13:34.000000000 +0200 @@ -269,6 +269,14 @@ } } +headerbar.titlebar.tweak-titlebar { + &-left, + &-right { + // re-define bottom margin + > .title { margin: 0 0 rem(1.3px, $sw: 1.0); } + } +} + // /******************* // * Gnome-Flashback * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/shell/sass/gnome-shell/3.24/_common.scss new/adapta-gtk-theme-3.93.1.16/shell/sass/gnome-shell/3.24/_common.scss --- old/adapta-gtk-theme-3.93.1.4/shell/sass/gnome-shell/3.24/_common.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/shell/sass/gnome-shell/3.24/_common.scss 2018-05-13 09:13:34.000000000 +0200 @@ -715,9 +715,11 @@ &-ornament { @include fontscaling($ref_size * 1.1); + width: 1.1em; // protect the region height: 0; // trick for minimum separator-menu-item height padding-top: 1.3px; // not need to scale color: $selected_bg_color; + text-align: right; font-family: $font-family-for-ornament; font-weight: 700; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adapta-gtk-theme-3.93.1.4/shell/sass/gnome-shell/3.26/_common.scss new/adapta-gtk-theme-3.93.1.16/shell/sass/gnome-shell/3.26/_common.scss --- old/adapta-gtk-theme-3.93.1.4/shell/sass/gnome-shell/3.26/_common.scss 2018-04-30 23:47:11.000000000 +0200 +++ new/adapta-gtk-theme-3.93.1.16/shell/sass/gnome-shell/3.26/_common.scss 2018-05-13 09:13:34.000000000 +0200 @@ -768,9 +768,11 @@ &-ornament { @include fontscaling($ref_size * 1.1); + width: 1.1em; // protect the region height: 0; // trick for minimum separator-menu-item height padding-top: 1.3px; // not need to scale color: $selected_bg_color; + text-align: right; font-family: $font-family-for-ornament; font-weight: 700; } @@ -1931,12 +1933,18 @@ } .window-caption { // hovered tooltips + max-width: 75em; // set horizontal limit for damned looong web page titles padding: if($eta == false, 0.6em 1.2em 0.7em, 0.4em 0.9em 0.5em); border-radius: 100px; border-top: 1px solid $borders_highlight; color: $osd_fg_color; background-color: $panel_bg_color; box-shadow: $z-depth-3; + // FIXME: Still label width computing is quite weird in Wayland session + // (brings unwatened larger L/R padding than we set) though, at least + // we should align StLabel in the center of finalized widget width + // as possible as we can... + text-align: center; // enforce label centering for Wayland session } // Search entry
