AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'matthiasc/for-master'

Browse Source 
# Conflicts:
#   .gitlab-ci/test-msys2.sh
This commit is contained in:
Matthias Clasen 2020-10-01 13:56:37 +00:00
commit cbe3de9ce7
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/test-msys2.sh
View File

@ -60,14 +60,12 @@ pkg-config --modversion pango
ccache --zero-stats
ccache --show-stats
export CCACHE_DISABLE=true
# FIXME: introspection disabled for now because of
# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/340
meson \
-Dx11-backend=false \
-Dwayland-backend=false \
-Dwin32-backend=true \
-Dvulkan=disabled \
-Dintrospection=disabled \
-Dintrospection=enabled \
-Dgtk:werror=true \
_build
unset CCACHE_DISABLE

66
gtk/theme/Adwaita/_common.scss
View File

@ -1343,6 +1343,45 @@ searchbar > revealer > box {
}
}
/**************
* GtkInfoBar *
**************/
infobar {
> revealer > box {
padding: 8px;
border-spacing: 12px;
}
&.action:hover > revealer > box {
background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
desaturate(darken(invert($selected_bg_color), 42%), 70%));
}
&.info,
&.question,
&.warning,
&.error {
> revealer > box {
border-bottom: 1px solid lighten($borders_color, 5%);
background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%),
desaturate(darken(invert($selected_bg_color), 40%), 70%));
}
}
}
//close button for info and searchbar (#3215)
infobar .close,
searchbar .close {
@include button(undecorated);
min-width: 16px;
min-height: 16px;
padding: 4px;
border-radius: 50%;
&:hover { @include button(hover); }
}
/*****************
* Title buttons *
@ -3622,33 +3661,6 @@ video {
background: black;
}
/**************
* GtkInfoBar *
**************/
infobar {
> revealer > box {
padding: 8px;
border-spacing: 12px;
}
&.action:hover > revealer > box {
background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%),
desaturate(darken(invert($selected_bg_color), 42%), 70%));
}
&.info,
&.question,
&.warning,
&.error {
> revealer > box {
border-bottom: 1px solid lighten($borders_color, 5%);
background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%),
desaturate(darken(invert($selected_bg_color), 40%), 70%));
}
}
}
/************
* Tooltips *
************/