diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-06 21:47:47 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-06 21:47:47 +0000 |
| commit | 2415c02bbdcfd0671bac83b1fe916e61417b397e (patch) | |
| tree | 0eb135c39eab22b1d412cb66c94eba6b8d0a70c0 | |
| parent | e25cb8b907f96589ad36a8a9e48cf6dde1e68da0 (diff) | |
| parent | efe21869fbe64a531a270f941701f97200510c25 (diff) | |
| download | gtk+-2415c02bbdcfd0671bac83b1fe916e61417b397e.tar.gz | |
Merge branch 'wip/exalm/polish' into 'master'
Random polish
See merge request GNOME/gtk!1850
| -rw-r--r-- | demos/widget-factory/widget-factory.ui | 5 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 35 | ||||
| -rw-r--r-- | gtk/ui/gtkvideo.ui | 1 |
3 files changed, 26 insertions, 15 deletions
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index d9b2a20c4f..f3321e1f6f 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -1779,6 +1779,10 @@ microphone-sensitivity-medium-symbolic</property> <property name="hexpand">1</property> <property name="halign">end</property> <property name="valign">center</property> + <property name="margin-top">6</property> + <property name="margin-bottom">6</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> </object> </child> </object> @@ -1796,7 +1800,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="halign">start</property> <property name="valign">center</property> <property name="margin-start">6</property> - <property name="margin-start">6</property> <property name="margin-end">6</property> <property name="margin-top">6</property> <property name="margin-bottom">6</property> diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 6b5d9f5c10..829cd31390 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1221,6 +1221,8 @@ spinbutton { padding: 1px 2px; } } + + font-feature-settings: "tnum"; } @@ -1357,15 +1359,11 @@ windowcontrols { @extend %button_basic_flat; - &:not(.menu) { - border-radius: 9999px; - padding: 6px; - margin: 0 2px; - min-width: 0; - min-height: 0; - } - - &:backdrop { -gtk-icon-shadow: none; } + border-radius: 9999px; + padding: 6px; + margin: 0 2px; + min-width: 0; + min-height: 0; } } @@ -1828,13 +1826,15 @@ popover.background { > arrow, > contents { + $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1)); + background-color: $popover_bg_color; - border: 1px solid $borders_color; + background-clip: padding-box; + border: 1px solid $_popover_border; box-shadow: 0 1px 2px transparentize(black, 0.7); &:backdrop { background-color: $backdrop_bg_color; - border-color: $backdrop_borders_color; box-shadow: none; } } @@ -2741,7 +2741,10 @@ scale { } } - > value { color: gtkalpha(currentColor, 0.55); } + > value { + color: gtkalpha(currentColor, 0.55); + font-feature-settings: "tnum"; + } &.horizontal { > marks { @@ -3025,6 +3028,7 @@ progressbar { // FIXME: insensitive state missing and some other state should be set probably font-size: smaller; color: transparentize($fg_color, 0.6); + font-feature-settings: "tnum"; &:backdrop { box-shadow: none; @@ -4251,8 +4255,11 @@ stackswitcher.circular { /* Drapshadow for large icons */ .icon-dropshadow { - -gtk-icon-shadow: 0 2px 12px rgba(0,0,0,0.2), - 0 1px 2px rgba(0,0,0,0.7); + -gtk-icon-shadow: 0 1px 12px rgba(0,0,0,0.05), + 0 -1px rgba(0,0,0,0.05), + 1px 0 rgba(0,0,0,0.1), + 0 1px rgba(0,0,0,0.3), + -1px 0 rgba(0,0,0,0.1); } /********* diff --git a/gtk/ui/gtkvideo.ui b/gtk/ui/gtkvideo.ui index 2b245b40d1..25351250d8 100644 --- a/gtk/ui/gtkvideo.ui +++ b/gtk/ui/gtkvideo.ui @@ -24,6 +24,7 @@ <child type="overlay"> <object class="GtkRevealer" id="controls_revealer"> <property name="valign">end</property> + <property name="transition-type">slide-up</property> <child> <object class="GtkMediaControls" id="controls"> <style> |