AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-popover-styles' into 'master'

Browse Source 
Fix popover styles (GTK 4)

Closes #2061

See merge request GNOME/gtk!1079
This commit is contained in:
Timm Bäder 2019-10-16 07:42:45 +00:00
commit d36d7d93e6
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/node-editor/node-editor-application.c
View File

@ -26,9 +26,9 @@
static const char *css = static const char *css =
"textview.editor {" "textview.editor {"
" color: rgb(192, 197, 206);" " color: rgb(192, 197, 206);"
" caret-color: white;" " caret-color: currentColor;"
"}" "}"
"textview.editor text {" "textview.editor > text {"
" background-color: rgb(43, 48, 59);" " background-color: rgb(43, 48, 59);"
"}" "}"
; ;

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

@ -2179,59 +2179,55 @@ menuitem {
popover.background { popover.background {
background-color: transparent; background-color: transparent;
padding: 0px; font: initial; // Decouple the font of popovers from their entry/textview
}
popover.menu>arrow, > arrow,
popover>arrow { > contents {
background-color: $popover_bg_color; background-color: $popover_bg_color;
border: 1px solid $borders_color;
}
popover>contents {
padding: 8px;
background-color: $popover_bg_color;
border: 1px solid $borders_color;
margin: 0px;
}
popover.background>contents {
background-color: $popover_bg_color;
box-shadow: 0 1px 2px transparentize(black, 0.7);
.csd &, & {
border: 1px solid $borders_color; border: 1px solid $borders_color;
box-shadow: 0 1px 2px transparentize(black, 0.7);
&:backdrop {
background-color: $backdrop_bg_color;
border-color: $backdrop_borders_color;
box-shadow: none;
}
}
> contents {
padding: 8px;
border-radius: $popover_radius; border-radius: $popover_radius;
> list,
> .view,
> toolbar {
border-style: none;
background-color: transparent;
}
separator { margin: 3px; }
list separator { margin: 0; }
} }
&:backdrop { .osd &,
background-color: $backdrop_bg_color; &.touch-selection,
box-shadow: none; &.magnifier {
}
> list,
> .view,
> toolbar {
border-style: none;
background-color: transparent; background-color: transparent;
}
.csd &, & { > arrow,
&.touch-selection, > contents {
&.magnifier {
@extend %osd; @extend %osd;
border: 1px solid transparentize(white, 0.9); border: 1px solid transparentize(white, 0.9);
box-shadow: none;
button { @extend %osd_button };
} }
&.osd { @extend %osd; }
} }
separator { margin: 3px; } &.touch-selection,
&.magnifier {
list separator { margin: 0px; } button { @extend %osd_button; }
}
} }