Hello community, here is the log from the commit of package plata-theme for openSUSE:Factory checked in at 2019-01-28 20:48:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plata-theme (Old) and /work/SRC/openSUSE:Factory/.plata-theme.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plata-theme" Mon Jan 28 20:48:27 2019 rev:7 rq:668819 version:0.5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/plata-theme/plata-theme.changes 2019-01-21 11:07:52.986696239 +0100 +++ /work/SRC/openSUSE:Factory/.plata-theme.new.28833/plata-theme.changes 2019-01-28 20:49:28.325840170 +0100 @@ -1,0 +2,27 @@ +Sat Jan 26 15:01:22 UTC 2019 - Matthias Eliasson <matthias.elias...@gmail.com> + +- Add package source verification + +------------------------------------------------------------------- +Sat Jan 26 14:23:37 UTC 2019 - Matthias Eliasson <matthias.elias...@gmail.com> + +- Update to version 0.5.7 + * Moved GtkListBoxRow root padding to child padding in case .expander class was added (Gtk+ 4.0). + * Applied IbusEmojier styling (Gtk+ 4.0). + * Masked unneeded L/R borders on the Album-art images placed in Lollypop GtkHeaderBar (Gtk+ 3.2x/4.0). + * Decreased GtkSwitch ink reaction alpha value from 0.2 to 0.12 (Gtk+ 3.2x/4.0). + * Converted SSD titlebutton top/bottom margins to its parent container padding (Gtk+ 3.2x/4.0). + + This is just for damned FF's weird CSD-mode titlebuttons. + * Removed focus-outline effect from various sidebar widget's GtkListBoxRow (Gtk+ 3.2x/4.0). +- Changes in version 0.5.6 + * Dropped outdated FF CSD-mode titlebutton styling (Gtk+ 3.24/4.0). + * Added new 'placeholder' node styling for GtkEntry (Gtk+ 4.0). + * Made GtkLevelBar complete-flat style (Gtk+ 3.2x/4.0). + * Re-designed Raven MPRIS card widget styling (Gtk+ 3.2x/4.0). + * Stopped exposing drop-shadows behind the keycaps in GtkTooltip (Gtk+ 3.2x/4.0). + * Set min-height for Inkscape's 2nd-row 'aux-toolbar's GtkToolBar (Gtk+ 3.2x/4.0). + * Introduced Ephy's incognito-mode GtkHeaderBar coloring (Gtk+ 3.24/4.0). + * Fixed some weird appearances in Nautilus 3.30.x's pathbar buttons (Gtk+ 3.24/4.0). + * Fixed missing 'checked and hovered' state background highlighting in mixed-variant's GtkHeaderBar buttons (Gtk+ 3.2x/4.0). + +------------------------------------------------------------------- Old: ---- plata-theme-0.5.5.tar.gz New: ---- plata-theme-0.5.7.tar.gz plata-theme-0.5.7.tar.gz.asc plata-theme.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plata-theme.spec ++++++ --- /var/tmp/diff_new_pack.h8OwH2/_old 2019-01-28 20:49:29.921838487 +0100 +++ /var/tmp/diff_new_pack.h8OwH2/_new 2019-01-28 20:49:29.921838487 +0100 @@ -17,17 +17,20 @@ %define _name plata +%define asc_link_uid 0f1a9a925cbeb11e6decc0a4136f26a3 %define _theme Plata %define gtk3_min_version 3.20.0 %define gtk2_min_version 2.24.30 Name: plata-theme -Version: 0.5.5 +Version: 0.5.7 Release: 0 Summary: A Gtk+ theme based on Material Design Refresh License: GPL-2.0-only AND CC-BY-SA-4.0 Group: System/GUI/Other URL: https://gitlab.com/tista500/plata-theme -Source: https://gitlab.com/tista500/plata-theme/-/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://gitlab.com/tista500/plata-theme/-/archive/%{version}/%{name}-%{version}.tar.gz +Source1: https://gitlab.com/tista500/plata-theme/uploads/%{asc_link_uid}/%{name}-%{version}.tar.gz.asc +Source2: %{name}.keyring BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes ++++++ plata-theme-0.5.5.tar.gz -> plata-theme-0.5.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plata-theme-0.5.5/configure.ac new/plata-theme-0.5.7/configure.ac --- old/plata-theme-0.5.5/configure.ac 2019-01-18 09:23:35.000000000 +0100 +++ new/plata-theme-0.5.7/configure.ac 2019-01-26 10:09:56.000000000 +0100 @@ -1,6 +1,6 @@ m4_define([plata_maj_ver], [0]) m4_define([plata_mnr_ver], [5]) -m4_define([plata_mcr_ver], [5]) +m4_define([plata_mcr_ver], [7]) m4_define([plata_version], [plata_maj_ver.plata_mnr_ver.plata_mcr_ver]) m4_define([plata_git_url], [https://gitlab.com/tista500/plata-theme]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plata-theme-0.5.5/src/gtk/asset/assets-gtk3.svg.in new/plata-theme-0.5.7/src/gtk/asset/assets-gtk3.svg.in --- old/plata-theme-0.5.5/src/gtk/asset/assets-gtk3.svg.in 2019-01-18 09:23:35.000000000 +0100 +++ new/plata-theme-0.5.7/src/gtk/asset/assets-gtk3.svg.in 2019-01-26 10:09:56.000000000 +0100 @@ -495,9 +495,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="10.00916" - inkscape:cx="194.36259" - inkscape:cy="98.238053" + inkscape:zoom="5.00458" + inkscape:cx="164.09032" + inkscape:cy="417.9452" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -1460,7 +1460,7 @@ style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.92582011;stroke-opacity:0" /> <circle r="14" - style="fill:#111111;fill-opacity:0.2;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#111111;fill-opacity:0.12;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path3757-6-49-6-9" cx="67" cy="587.36218" /> @@ -1498,7 +1498,7 @@ cy="552.36218" cx="83" id="path3757-6-49-6-9-6" - style="fill:#3F51B5;fill-opacity:0.2;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#3f51b5;fill-opacity:0.12;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" r="14" /> <circle transform="scale(-1,1)" @@ -1565,7 +1565,7 @@ style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.92582011;stroke-opacity:0" /> <circle r="14" - style="fill:#f5f5f5;fill-opacity:0.2;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#f5f5f5;fill-opacity:0.12;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path3757-6-49-6-9-3" cx="67" cy="587.36218" /> @@ -1599,7 +1599,7 @@ cy="588.36218" /> <circle r="14" - style="fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.12;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path3757-6-49-6-9-3-7" cx="67" cy="587.36218" /> @@ -1646,7 +1646,7 @@ cy="588.36218" /> <circle r="14" - style="fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.12;stroke:none;stroke-width:0.35012248;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path3757-6-49-6-9-3-7-6" cx="67" cy="587.36218" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plata-theme-0.5.5/src/gtk/sass/common/_3rd-party.scss new/plata-theme-0.5.7/src/gtk/sass/common/_3rd-party.scss --- old/plata-theme-0.5.5/src/gtk/sass/common/_3rd-party.scss 2019-01-18 09:23:35.000000000 +0100 +++ new/plata-theme-0.5.7/src/gtk/sass/common/_3rd-party.scss 2019-01-26 10:09:56.000000000 +0100 @@ -652,7 +652,6 @@ } scrolledwindow > .frame { // stacking raised-grid - // reserve L/R shadow region // FIXME: Do not set any L/R margins and borders padding: 0 $raven_box_spacing; @@ -676,47 +675,6 @@ border-radius: 0 0 $r_2 $r_2; } - > box.vertical > box.vertical:last-child { - // FIXME: we can't crop album-art images horizontally with any borders, - // paddings, and margins. And parent GtkBox does not sync to the size - // of album-art dynamically while transitioning images. so set specific - // depth-0 OSD materials for MPRIS. - border-radius: 0; // unset raised materials - background-color: transparent; - box-shadow: none; - - .raven-header, - .raven-background { - border-radius: 0; - @if $variant == mixed { - background-color: track($inv_dark_bg, $a_osd); - color: $inv_ter_fg; - } - @else { - background-color: track($dark_bg, $a_osd); - color: $ter_fg; - } - } - - button.flat.expander-button { - @if $variant == mixed { - @include button(flat-normal, $tc: $inv_ter_fg); - @include ink-reaction(normal, $fc: $inv_fg, $tr: ink-normal-dec); - &:hover { @include button(flat-hover, $tc: $inv_fg); } - &:active { - @include button(flat-active, $tc: $inv_fg); - @include ink-reaction(active-dec, - $fc: $inv_fg, $tr: ink-active-dec); - } - } - @else { - color: $ter_fg; - &:hover, - &:active { color: $fg; } - } - } - } - // audio app/device switcher box.audio-widget { // placehoder label @@ -805,19 +763,13 @@ &:dir(rtl) { margin-left: rem($baseline * 2); } } - button.flat.image-button.primary-control { // close button in MPRIS - min-width: $icon_size; - min-height: $icon_size; - padding: rem($entry_lr_space); - @include button(flat-normal, $tc: $dest_bg); - @include ink-reaction(normal, $fc: $dest_bg, $tr: ink-normal-dec); + button.flat.image-button.primary-control { // 'close' button in MPRIS + color: $ter_fg; &:hover { @include button(flat-hover, $tc: $dest_bg); } &:active { @include button(flat-active, $tc: $dest_bg); @include ink-reaction(active-dec, $fc: $dest_bg, $tr: ink-active-dec); } - &:disabled { @include button(flat-disabled, $tc: $dest_bg); } - &:checked { @include button(flat-checked, $tc: $dest_bg); } } calendar { @@ -861,8 +813,8 @@ margin-bottom: if($ref_weight < 1.0, calc((32px - 16px - (0.42rem - 0.1rem) * 2) / 2), calc((32px - 16px - (0.6rem - 0.1rem) * 2) / 2)); - &:dir(ltr) { margin-right: rem(2.7px + 4px); } - &:dir(rtl) { margin-left: rem(2.7px + 4px); } + &:dir(ltr) { margin-right: rem(($baseline * 2) + 4px); } + &:dir(rtl) { margin-left: rem(($baseline * 2) + 4px); } } // sub-list rows grouping @@ -873,8 +825,8 @@ > row.activatable { border-bottom: 1px solid $div_fg; &:last-child { border-bottom: none; } - &:dir(ltr) { padding: 2px rem(2.7px) 2px 8px; } - &:dir(rtl) { padding: 2px 8px 2px rem(2.7px); } + &:dir(ltr) { padding: 2px rem($baseline * 2) 2px 8px; } + &:dir(rtl) { padding: 2px 8px 2px rem($baseline * 2); } &:selected { background-color: track($sel_bg, $a_trk_2); @@ -889,21 +841,21 @@ } .raven-mpris { // MPRIS overlaid widget - border: none; - color: if($variant == mixed, $inv_fg, $fg); - background-color: if($variant == mixed, track($inv_dark_bg, $a_osd), - track($dark_bg, $a_osd)); + background-color: track($base, (1 - $a_trk_1)); + color: $fg; + box-shadow: inset 1px 0 $div_sld_fg, + inset -1px 0 $div_sld_fg, + inset 0 -1px $div_sld_fg; button.image-button { - margin: 0 rem(5.3px) $raven_box_spacing * 2; - padding: rem($entry_lr_space); - @if $variant == mixed { @extend %inv-action-area-button; } - @else { @extend %action-area-button; } + margin: 0 rem(5.3px) if($ref_weight < 1.0, $raven_box_spacing * 1.5, + $raven_box_spacing * 2); + @extend %action-area-button; } > box.vertical > box.horizontal > image { // header icons padding: rem(5.3px / 2) 0; - color: if($variant == mixed, $inv_ter_fg, $ter_fg); // tone down + color: $ter_fg; // tone down &:dir(ltr) { margin: 0 (4px + 1px) 0 -4px; } &:dir(rtl) { margin: 0 -4px 0 (4px + 1px); } } @@ -1047,7 +999,7 @@ } } - button.image-button { margin: rem(2.7px) rem(5.3px) rem(4px); } + button.image-button { margin: rem($baseline * 2) rem(5.3px) rem(4px); } } .alternative-label { // 'always expanded' option @@ -1102,14 +1054,14 @@ widget.keyboard-indicator > widget > box.horizontal { > widget > image { margin-top: rem(-0.7px, $sw: 1.0); - &:dir(ltr) { padding: 1.3px 0 0 3px; } - &:dir(rtl) { padding: 1.3px 3px 0 0; } + &:dir(ltr) { padding: $baseline 0 0 3px; } + &:dir(rtl) { padding: $baseline 3px 0 0; } } > stack > widget.keyboard-label > label { margin-top: rem(-0.7px, $sw: 1.0); - &:dir(ltr) { padding: 1.3px 3px rem(1.3px, $sw: 1.0) 0; } - &:dir(rtl) { padding: 1.3px 0 rem(1.3px, $sw: 1.0) 3px; } + &:dir(ltr) { padding: $baseline 3px rem($baseline, $sw: 1.0) 0; } + &:dir(rtl) { padding: $baseline 0 rem($baseline, $sw: 1.0) 3px; } } } } @@ -1314,10 +1266,6 @@ progressbar { // mimic level-bar min-height: 4px; padding: 2px; - border-radius: $r_2; - @if $variant == mixed { background-color: $inv_dark_bg; } - @else { background-color: $dark_bg; } - box-shadow: $z-depth-1; trough { background-color: $trk_out_fg; @@ -2143,6 +2091,17 @@ calc(12px + 0.5rem)); } +// Cover-art in headerbar +image.toolbar-cover-frame { // mask L/R edge borders + border-image: if($variant == mixed, image($inv_dark_bg) 0 1 / 0 1px stretch, + image($dark_bg) 0 1 / 0 1px stretch); + + &:backdrop { + border-image: if($variant == mixed, image($inv_bg) 0 1 / 0 1px stretch, + image($bg) 0 1 / 0 1px stretch); + } +} + // /*************************** // * Cinnamon-Control-Center * // ***************************/ @@ -2556,8 +2515,8 @@ label, entry { min-height: rem(13.3px); - padding-top: rem(1.3px); - padding-bottom: rem(1.3px); + padding-top: rem($baseline); + padding-bottom: rem($baseline); font-size: 90%; } @@ -2709,17 +2668,20 @@ } #MozillaGtkWidget.background { - headerbar.titlebar { // >= nightly 60.0a1(2018-02-02) - // FIXME: no backdrop state, no maximized state, bullshit... - padding: 0 if($ref_weight < 1.0, (28px - $icon_size * 1.25) / 2, - (28px - $icon_size * 1.5) / 2); - - &.default-decoration button.titlebutton { - @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); + @if $maj_ver == 3 { + @if $mnr_ver < 23 { + headerbar.titlebar { // legacy + padding: 0 if($ref_weight < 1.0, (28px - $icon_size * 1.25) / 2, + (28px - $icon_size * 1.5) / 2); + + &.default-decoration button.titlebutton { + @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); + } + } } } @@ -3362,13 +3324,14 @@ box#AuxToolbox { border-top: 1px solid $div_fg; - toolbar { border: none; } - - box#StyleSwatch { // keep the similar height vs GtkToolBar - margin: rem(-2.7px) 0; - - label { font-size: if($ref_weight < 1.0, 90%, 100%); } + toolbar { + @if $ref_weight < 1.0 { + min-height: rem($toolitem_size, $sw: 1.0) + $toolbar_padding * 2; + } + border: none; } + + box#StyleSwatch label { font-size: 90%; } // shrink labels } // left/right-side, vertical toolbars @@ -3510,7 +3473,7 @@ window.background:not(.solid-csd) > box.vertical > grid.horizontal { // add spacing for 'Ratio' label > label { - padding: 0 rem(5.3px, $sw: 1.0) rem(1.3px, $sw: 1.0); + padding: 0 rem(5.3px, $sw: 1.0) rem($baseline, $sw: 1.0); } } @@ -3698,7 +3661,9 @@ } label.tilix-terminal-title { - padding: rem(1.3px, $sw: 1.0) rem(2.7px) rem(2.7px, $sw: 1.0); + padding: rem($baseline, $sw: 1.0) + rem($baseline * 2) + rem($baseline * 2, $sw: 1.0); } } @@ -3707,7 +3672,7 @@ min-width: $icon_size; min-height: $icon_size; margin: 0; - padding: rem(2.7px, $sw: 1.0); + padding: rem($baseline * 2, $sw: 1.0); } } } @@ -4022,6 +3987,8 @@ &:dir(ltr) { @include radius(0 $r $r 0); } &:dir(rtl) { @include radius($r 0 0 $r); } + &, &:focus { outline-width: 0; } // unset focus outlines + &, &:hover { background-color: $trk_bg; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plata-theme-0.5.5/src/gtk/sass/common/_common.scss new/plata-theme-0.5.7/src/gtk/sass/common/_common.scss --- old/plata-theme-0.5.5/src/gtk/sass/common/_common.scss 2019-01-18 09:23:35.000000000 +0100 +++ new/plata-theme-0.5.7/src/gtk/sass/common/_common.scss 2019-01-26 10:09:56.000000000 +0100 @@ -346,6 +346,10 @@ } @if $maj_ver == 4 { + placeholder { @extend %dim_label; } + } + + @if $maj_ver == 4 { progress > trough > progress { @extend %entry_progress; } } @else { @@ -386,6 +390,10 @@ &:disabled { color: track(currentColor, $a_fg_dis); } } + @if $maj_ver == 4 { + &:focus > placeholder { opacity: 0; } // hide placeholders when focused + } + &:drop(active) { &, &:focus { box-shadow: inset 0 0 0 2px $drp_fg; } } @@ -598,7 +606,7 @@ &.entry-tag { // for libgd apps min-height: $icon_size; - margin: rem(2.7px); + margin: rem($baseline * 2); padding: 0 rem($entry_lr_space); @include radius($r, none); border: 0 none transparent; @@ -1420,10 +1428,13 @@ @include button(disabled, $c: $inv_base, $tc: $inv_fg); } - &:checked { @include button(checked, $tc: $sel_fg); } - &:checked:disabled { - @include button(checked-disabled, $c: $inv_base, - $tc: $inv_fg); + &:checked { + @include button(checked); + &:hover { @include button(checked-hover); } + &:disabled { + @include button(checked-disabled, $c: $inv_base, + $tc: $inv_fg); + } } } @@ -2136,8 +2147,8 @@ .titlebar { &.default-decoration { - min-height: (2px + 3px) + $titlebutton_small; - padding: 0 3px; + min-height: $titlebutton_small; + padding: 2px 3px 3px; border-radius: $r_2 $r_2 0 0; border-width: 1px 0 0; border-top-color: $div_top_fg; @@ -2186,8 +2197,8 @@ } } -headerbar { // selection-mode - &.selection-mode { +headerbar { + &.selection-mode { // selection-mode border-width: 1px 0; border-top-color: $div_top_sel_fg; background-color: $dark_sel_bg; @@ -2239,6 +2250,37 @@ } } } + + @if $maj_ver == 3 { // for Epiphany + @if $mnr_ver > 23 { + &.incognito-mode { @extend %incognito_headerbar_bg; } + } + } + @else { + &.incognito-mode { @extend %incognito_headerbar_bg; } + } +} + +%incognito_headerbar_bg { + border-top-color: if($variant == mixed, + mix(white, $inv_tooltip_bg, percentage($a_div_1)), + mix(white, $tooltip_bg, percentage($a_div_2))); + background-color: if($variant == mixed, $inv_tooltip_bg, $tooltip_bg); + &:backdrop { + border-top-color: if($variant == mixed, $inv_bg, $bg); + background-color: if($variant == mixed, $inv_bg, $bg); + } + + .tiled &, + .tiled-top &, + .tiled-bottom &, + .tiled-left &, + .tiled-right &, + .maximized &, + .fullscreen & { + border-top-color: if($variant == mixed, $inv_tooltip_bg, $tooltip_bg); + &:backdrop { border-top-color: if($variant == mixed, $inv_bg, $bg); } + } } headerbar { @@ -2458,26 +2500,65 @@ // * Pathbars * // ************/ +%pathbar_button_shape { + @include radius(0); // optimize radius and widths + &:dir(ltr) { border-right-width: 0; } + &:dir(rtl) { border-left-width: 0; } + &:first-child { + &:dir(ltr) { @include radius($r-2 0 0 $r-2); } + &:dir(rtl) { @include radius(0 $r-2 $r-2 0); } + } + &:last-child { + &:dir(ltr) { + @include radius(0 $r-2 $r-2 0); + border-right-width: 1px; + } + &:dir(rtl) { + @include radius($r-2 0 0 $r-2); + border-left-width: 1px; + } + } +} + +%slashed_nautilus_pathbar { + .linked.path-bar, + .path-bar { + button { + margin-left: rem($baseline * 2, $sw: 1.0); + margin-right: rem($baseline * 2, $sw: 1.0); + // enforce switching to flat-style + &:not(:checked) { + border-color: transparent; + background-color: transparent; + &:hover, + &:active { + background-color: track(if($variant == mixed, $inv_fg, $fg), + $a_trk_1); + } + } + } + + // FIXME: these compensators can reserve enough wide 'tail' margins + // at the last button node for preventing ugly button node truncations. + box:not(:only-child):last-child button { + &:dir(ltr) { margin-right: $icon_size * 1.5; } + &:dir(rtl) { margin-left: $icon_size * 1.5; } + } + } +} + .linked.path-bar, .path-bar { button { - @include radius(0); // optimize radius and widths - &:dir(ltr) { border-right-width: 0; } - &:dir(rtl) { border-left-width: 0; } - &:first-child { - &:dir(ltr) { @include radius($r-2 0 0 $r-2); } - &:dir(rtl) { @include radius(0 $r-2 $r-2 0); } - } - &:last-child { - &:dir(ltr) { - @include radius(0 $r-2 $r-2 0); - border-right-width: 1px; - } - &:dir(rtl) { - @include radius($r-2 0 0 $r-2); - border-left-width: 1px; + @if $maj_ver == 3 { + @if $mnr_ver < 23 { @extend %pathbar_button_shape; } + @else { // exclude Nautilus's specific pathbar box + *:not(.path-bar-box) & { @extend %pathbar_button_shape; } } } + @else { + *:not(.path-bar-box) & { @extend %pathbar_button_shape; } + } @at-root %pathbar_button, &, @@ -2504,6 +2585,15 @@ } } +@if $maj_ver == 3 { // Nautilus >= 3.30 + @if $mnr_ver > 23 { + headerbar box.path-bar-box { @extend %slashed_nautilus_pathbar; } + } +} +@else { + headerbar box.path-bar-box { @extend %slashed_nautilus_pathbar; } +} + // /************** // * Tree Views * // **************/ @@ -2888,7 +2978,7 @@ } @if $maj_ver == 3 { - @if $mnr_ver == 24 { + @if $mnr_ver > 23 { &Emojier { &WhiteLabel, &GoldLabel, @@ -2896,6 +2986,13 @@ } } } + @else { + &Emojier { + &WhiteLabel, + &GoldLabel, + &SelectedLabel { padding: $toolbar_padding; } + } + } } // /************ @@ -3700,7 +3797,7 @@ padding: 0 rem($menuitem_padding, $sw: 1.0); @include transition(std); - label { padding-bottom: rem(1.3px, $sw: 1.0); } + label { padding-bottom: rem($baseline, $sw: 1.0); } } color: $sec_fg; @@ -4218,51 +4315,31 @@ // *************/ levelbar { - box-shadow: $z-depth-1; // needs to be set here to avoid clipping - - block { - @if $maj_ver == 3 { - min-width: $progress_size * 9; - min-height: $progress_size; - } - @else { - min-height: $progress_size; - } - } - &.vertical block { - @if $maj_ver == 3 { - min-width: $progress_size; - min-height: $progress_size * 9; - } - @else { - min-width: $progress_size; + &.horizontal { + block { + @if $maj_ver == 3 { + min-width: $progress_size * 9; + min-height: $progress_size; + } + @else { min-height: $progress_size; } } - } - trough { - padding: $progress_size / 2; - @include radius($r_2, none); - box-shadow: $z-depth-1; - &:disabled { box-shadow: none; } + trough { padding: ($progress_size / 2) 1px; } - &.horizontal { - padding-left: 1px; - padding-right: 1px; - } - &.vertical { - padding-top: 1px; - padding-bottom: 1px; - } + &.discrete block { margin: 0 1px; } } + &.vertical { + block { + @if $maj_ver == 3 { + min-width: $progress_size; + min-height: $progress_size * 9; + } + @else { min-width: $progress_size; } + } - &.horizontal.discrete block { - margin-left: 1px; - margin-right: 1px; - } + trough { padding: 1px ($progress_size / 2); } - &.vertical.discrete block { - margin-top: 1px; - margin-bottom: 1px; + &.discrete block { margin: 1px 0; } } block { @@ -4379,7 +4456,15 @@ background-color: $base; } -row { padding: 2px rem($menuitem_padding); } +row { + @if $maj_ver == 3 { padding: 2px rem($menuitem_padding); } + @else { // exclude expander class + &:not(.expander) { padding: 2px rem($menuitem_padding); } + + // move root padding to its childs + &.expander .row-header { padding: 2px rem($menuitem_padding); } + } +} %activatable_row, row.activatable { @@ -4805,6 +4890,8 @@ &:dir(ltr) { @include radius(0 $r $r 0); } &:dir(rtl) { @include radius($r 0 0 $r); } + &, &:focus { outline-width: 0; } // unset focus outlines + &, &:hover { background-color: $trk_bg; color: $sel_label; @@ -4895,7 +4982,7 @@ } label.sidebar-label { - padding-bottom: rem(1.3px, $sw: 1.0); + padding-bottom: rem($baseline, $sw: 1.0); &:dir(ltr) { padding-right: rem($pathbar_min_size * 1.5, $sw: 1.0); } &:dir(rtl) { padding-left: rem($pathbar_min_size * 1.5, $sw: 1.0); } } @@ -5531,9 +5618,9 @@ // specific button styling for Mutter's SSDs, Metacity's CSDs and XWayland %ssd_button { - min-height: $titlebutton_small; min-width: $titlebutton_small; - margin: 2px 0 3px; + min-height: $titlebutton_small; + margin: 0; // reset outer margins padding: 0; @include radius($r, none); @if $variant == light { @extend %flat_button; } @@ -5721,6 +5808,7 @@ tooltip.background & { background-color: $sggt_bg; color: $sel_fg; + box-shadow: none; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plata-theme-0.5.5/src/gtk/sass/common/_misc.scss new/plata-theme-0.5.7/src/gtk/sass/common/_misc.scss --- old/plata-theme-0.5.5/src/gtk/sass/common/_misc.scss 2019-01-18 09:23:35.000000000 +0100 +++ new/plata-theme-0.5.7/src/gtk/sass/common/_misc.scss 2019-01-26 10:09:56.000000000 +0100 @@ -445,9 +445,9 @@ @include transition(reset); label { - padding: rem(2.7px) + padding: rem($baseline * 2) rem($entry_lr_space) - rem(2.7px + $baseline); + rem($baseline * 3); font-size: 110%; } @@ -607,63 +607,6 @@ } } -@if $maj_ver == 3 { - @if $mnr_ver > 23 { - headerbar box.path-bar-box { @extend %slashed_pathbar; } - } -} -@else { - headerbar box.path-bar-box { @extend %slashed_pathbar; } -} - -%slashed_pathbar { - // enforce switching to flat-style - .path-bar { - &, &.linked { - button { - margin-left: rem($baseline * 2, $sw: 1.0); - margin-right: rem($baseline * 2, $sw: 1.0); - @include radius($r_2); // for >= 3.30.4 - border-color: transparent; - background-color: transparent; - } - - // FIXME: these compensators can reserve enough wide 'tail' margins - // at the last button node for preventing ugly button node truncations. - box:not(:only-child):last-child button { - &:dir(ltr) { margin-right: $icon_size * 1.5; } - &:dir(rtl) { margin-left: $icon_size * 1.5; } - } - } - } - - .path-bar button:not(:checked) { - &:hover, - &:active { - background-color: track(if($variant == mixed, $inv_fg, $fg), $a_trk_1); - } - } - - .path-bar { // enforce checked state styling - @if $variant == mixed { - &, &.linked { // specificity bump - button:checked { - &, &.flat { - @include button(checked); - &:hover { @include button(checked-hover); } - } - } - } - } - @else { - button:checked { - @include button(checked); - &:hover { @include button(checked-hover); } - } - } - } -} - .disk-space-display { border: 0 none transparent; @@ -1448,7 +1391,7 @@ label { padding: rem($menu_padding); } separator.vertical { - margin: 0 rem(2.7px); // expand vertically + margin: 0 rem($baseline * 2); // expand vertically background-color: $div_fg; } @@ -1962,7 +1905,6 @@ row.activatable.category { // use side-bar styling // paddings in row were hard-coded with crazy large values... - // padding: rem(2.7px) rem(8px) rem(4px); @extend %sidebar_row_template; > label { @@ -2330,6 +2272,8 @@ &:dir(ltr) { @include radius(0 $r $r 0); } &:dir(rtl) { @include radius($r 0 0 $r); } + &, &:focus { outline-width: 0; } // unset focus outlines + &, &:hover { background-color: $trk_bg; color: $sel_label; @@ -2471,6 +2415,8 @@ &:dir(ltr) { @include radius(0 $r $r 0); } &:dir(rtl) { @include radius($r 0 0 $r); } + &, &:focus { outline-width: 0; } // unset focus outlines + &, &:hover { background-color: $trk_bg; color: $sel_label; @@ -2740,6 +2686,8 @@ padding: 0; color: $sec_fg; + &, &:focus { outline-width: 0; } // unset focus outlines + > label.sidebar { color: $sec_fg; font-weight: 500; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plata-theme-0.5.5/src/shell/sass/gnome-shell/_common.scss new/plata-theme-0.5.7/src/shell/sass/gnome-shell/_common.scss --- old/plata-theme-0.5.5/src/shell/sass/gnome-shell/_common.scss 2019-01-18 09:23:35.000000000 +0100 +++ new/plata-theme-0.5.7/src/shell/sass/gnome-shell/_common.scss 2019-01-26 10:09:56.000000000 +0100 @@ -830,7 +830,7 @@ @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 + padding-top: $baseline; // not need to scale color: $sel_label; text-align: right; font-family: $font-family-for-ornament;
