From 6b5baefd75a5ba72217bbf41ec7a147f021a8d50 Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Thu, 9 Jun 2022 22:42:45 +0400 Subject: [PATCH] theme: Port .boxed-list style from libadwaita Consistently use it for boxed lists in inspector and gtk-demo. Fixes issues like https://gitlab.gnome.org/GNOME/gtk/-/issues/3145 --- demos/gtk-demo/listbox_controls.ui | 398 +++++----- gtk/gtklistbox.c | 5 +- gtk/inspector/clipboard.ui | 157 ++-- gtk/inspector/general.c | 6 +- gtk/inspector/general.ui | 1128 ++++++++++++++-------------- gtk/inspector/misc-info.ui | 1071 ++++++++++++-------------- gtk/inspector/visual.ui | 1065 +++++++++++++------------- gtk/theme/Default/_common.scss | 32 + 8 files changed, 1877 insertions(+), 1985 deletions(-) diff --git a/demos/gtk-demo/listbox_controls.ui b/demos/gtk-demo/listbox_controls.ui index c2c8a1f1cf..ab4419e54d 100644 --- a/demos/gtk-demo/listbox_controls.ui +++ b/demos/gtk-demo/listbox_controls.ui @@ -30,90 +30,86 @@ - - - - none - 1 - - + + none + + + + - + + + + Switch + 0 + start + center + 1 + + - - - - Switch - 0 - start - center - 1 - - - - - end - center - - + + end + center + + + + - + + + + Check + 0 + start + center + 1 + + - - - - Check - 0 - start - center - 1 - - - - - end - center - 10 - 10 - 1 - - + + end + center + 10 + 10 + 1 + + + + - + + + + Click here! + 0 + start + center + 1 + + - - - - Click here! - 0 - start - center - 1 - - - - - object-select-symbolic - end - center - 10 - 10 - 0 - - + + object-select-symbolic + end + center + 10 + 10 + 0 @@ -134,146 +130,142 @@ - - - - - none - 1 - + + + none + - - - 0 - - - - - Scale - 0 - start - center - 1 - - - - - end - center - 0 - 150 - - - 100 - 50 - 1 - 10 - - - - - - - - + + + 0 + + + + + Scale + 0 + start + center + 1 + + + + + end + center + 0 + 150 + + + 100 + 50 + 1 + 10 + + + + + + + + - - - 0 - - - - - Spinbutton - 0 - start - center - 1 - - - - - end - center - - - 100 - 50 - 1 - 10 - - - - - - - - - - - 0 - - - - - Dropdown - 0 - start - center - 1 - - - - - end - center - - - - Choice 1 - Choice 2 - Choice 3 - Choice 4 - - - - - - - - - + + + 0 + + + + + Spinbutton + 0 + start + center + 1 + + + + + end + center + + + 100 + 50 + 1 + 10 + + + + + + + + + + + 0 + + + + + Dropdown + 0 + start + center + 1 + + + + + end + center + + + + Choice 1 + Choice 2 + Choice 3 + Choice 4 + + + + + + + + + - - - 0 - - - - - Entry - 0 - start - center - 1 - - - - - end - center - Type here… - - - - - - + + + 0 + + + + + Entry + 0 + start + center + 1 + + + + + end + center + Type here… + + + + + + - - diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index 7a2888df01..b449051f1b 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -72,7 +72,7 @@ * # CSS nodes * * |[ - * list[.separators][.rich-list][.navigation-sidebar] + * list[.separators][.rich-list][.navigation-sidebar][.boxed-list] * ╰── row[.activatable] * ]| * @@ -81,6 +81,9 @@ * Each `GtkListBoxRow` uses a single CSS node named row. The row nodes get the * .activatable style class added when appropriate. * + * It may also carry the .boxed-list style class. In this case, the list will be + * automatically surrounded by a frame and have separators. + * * The main list node may also carry style classes to select * the style of [list presentation](section-list-widget.html#list-styles): * .rich-list, .navigation-sidebar or .data-table. diff --git a/gtk/inspector/clipboard.ui b/gtk/inspector/clipboard.ui index bc9647f0bf..d5a1f53b62 100644 --- a/gtk/inspector/clipboard.ui +++ b/gtk/inspector/clipboard.ui @@ -13,80 +13,74 @@ 60 10 - + + none + - - none - + + 0 - - 0 + + 40 - - 40 - - - Drag and hold here - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + Drag and hold here + start + baseline + 0.0 - - + + 1 + end + baseline + end + 1 + + + + + - + + none + - - none - + + 0 - - 0 + + 40 - - 40 - - - Clipboard - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + Clipboard + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 @@ -96,36 +90,33 @@ - + + none + - - none - + + 0 - - 0 + + 40 + + + Primary + start + baseline + 0.0 + + - - 40 - - - Primary - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 1 + end + baseline + end + 1 diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 569622108a..7593e278e6 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -97,7 +97,7 @@ struct _GtkInspectorGeneral GtkWidget *vk_device; GtkWidget *vk_api_version; GtkWidget *vk_driver_version; - GtkWidget *app_id_frame; + GtkWidget *app_id_box; GtkWidget *app_id; GtkWidget *resource_path; GtkWidget *prefix; @@ -185,7 +185,7 @@ init_app_id (GtkInspectorGeneral *gen) app = g_application_get_default (); if (!app) { - gtk_widget_set_visible (gen->app_id_frame, FALSE); + gtk_widget_set_visible (gen->app_id_box, FALSE); return; } @@ -1137,7 +1137,7 @@ gtk_inspector_general_class_init (GtkInspectorGeneralClass *klass) gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, vk_device); gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, vk_api_version); gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, vk_driver_version); - gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, app_id_frame); + gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, app_id_box); gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, app_id); gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, resource_path); gtk_widget_class_bind_template_child (widget_class, GtkInspectorGeneral, prefix); diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui index a75e532c3d..a313a9e22c 100644 --- a/gtk/inspector/general.ui +++ b/gtk/inspector/general.ui @@ -13,166 +13,163 @@ 60 10 - + + none center + - - none - + + 0 - - 0 - - - 40 - - - GTK Version - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + GTK Version + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 + + + + + 0 - - 0 - - - 40 - - - GDK Backend - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + GDK Backend + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 + + + + + 0 - - 0 - - - 40 - - - GSK Renderer - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + GSK Renderer + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 + + + + + 0 - - 0 - - - 40 - - - Pango Fontmap - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + Pango Fontmap + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 + + + + + 0 - - 0 - - - 40 - - - Media Backend - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + Media Backend + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 + + + + + 0 - - 0 - - - 40 - - - Input Method - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + Input Method + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 @@ -183,62 +180,59 @@ - + + none center + - - none - + + 0 - - 0 - - - 40 - - - Application ID - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + Application ID + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 + + + + + 0 - - 0 - - - 40 - - - Resource Path - start - baseline - 0.0 - - - - - 1 - end - baseline - 1 - - + + 40 + + + Resource Path + start + baseline + 0.0 + + + + + 1 + end + baseline + 1 @@ -249,199 +243,196 @@ - + + none center + - - none - + + 0 - - 0 - - - 40 - - - Prefix - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + Prefix + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - XDG_DATA_HOME - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + XDG_DATA_HOME + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - XDG_DATA_DIRS - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + XDG_DATA_DIRS + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - GTK_PATH - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + GTK_PATH + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - GTK_EXE_PREFIX - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + GTK_EXE_PREFIX + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - GTK_DATA_PREFIX - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + GTK_DATA_PREFIX + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - GSETTINGS_SCHEMA_DIR - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + GSETTINGS_SCHEMA_DIR + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 @@ -451,89 +442,86 @@ - + + none center + - - none - + + 0 - - 0 - - - 40 - - - Display - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + Display + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - RGBA Visual - start - baseline - 0.0 - - - - - end - baseline - object-select-symbolic - 1 - - + + 40 + + + RGBA Visual + start + baseline + 0.0 + + + + + end + baseline + object-select-symbolic + 1 + + + + + 0 - - 0 - - - 40 - - - Composited - start - baseline - 0.0 - - - - - end - baseline - object-select-symbolic - 1 - - + + 40 + + + Composited + start + baseline + 0.0 + + + + + end + baseline + object-select-symbolic + 1 @@ -543,100 +531,94 @@ - + + none center - - - none - - - + - + + none center + - - none - + + 0 - - 0 - - - 40 - - - GL Version - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + GL Version + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 + 0 - - 0 - 0 - - - 40 - - - 1 - end - baseline - end - 1 - - - + + 40 + + + 1 + end + baseline + end + 1 + + + + + + 0 - - 0 - - - 40 - - - GL Vendor - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + GL Vendor + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 @@ -646,91 +628,88 @@ - + + none center + - - none - + + 0 - - 0 - - - 40 - - - Vulkan Device - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + Vulkan Device + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - Vulkan API version - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + Vulkan API version + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 + + + + + 0 - - 0 - - - 40 - - - Vulkan driver version - start - baseline - 0.0 - - - - - 1 - end - baseline - end - 1 - - + + 40 + + + Vulkan driver version + start + baseline + 0.0 + + + + + 1 + end + baseline + end + 1 @@ -740,16 +719,13 @@ - + + none center - - - none - - - + @@ -785,14 +761,14 @@ - - - - - - - - + + + + + + + + diff --git a/gtk/inspector/misc-info.ui b/gtk/inspector/misc-info.ui index efe9bccce8..3a7696b7a4 100644 --- a/gtk/inspector/misc-info.ui +++ b/gtk/inspector/misc-info.ui @@ -12,696 +12,609 @@ 60 10 - + + none center + False + - - none + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Address - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - - + + 40 + + + Address + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Type - start - baseline - 0.0 - 1 - - - - - end - baseline - - + + 40 + + + Type + start + baseline + 0.0 + 1 + + + + + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Reference Count - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - - + + 40 + + + Reference Count + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - State - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - - + + 40 + + + State + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Direction - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - - + + 40 + + + Direction + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Buildable ID - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - - + + 40 + + + Buildable ID + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Mnemonic Label - start - baseline - 0.0 - 1 - - - - - 10 - end - - + + 40 + + + Mnemonic Label + start + baseline + 0.0 + 1 + + + + + 10 + end + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Request Mode - start - baseline - 0 - 1 - - - - - end - baseline - - + + 40 + + + Request Mode + start + baseline + 0 + 1 + + + + + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Measure map - start - baseline - 0 - 1 - - - - - Show - end - baseline - - - - - - - Expand - end - baseline - - - + + 40 + + + Measure map + start + baseline + 0 + 1 + + + + + Show + end + baseline + + + + + + + Expand + end + baseline + + + + + + 0 + - - 0 - - - - 10 - 10 - 10 - 10 - 40 + + 40 + + + + + + 0 + 1 - - - - - 0 - 1 - - - - - + + + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Allocation - start - baseline - 0 - 1 - - - - - end - baseline - - + + 40 + + + Allocation + start + baseline + 0 + 1 + + + + + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Baseline - start - baseline - 0 - 1 - - - - - end - baseline - - + + 40 + + + Baseline + start + baseline + 0 + 1 + + + + + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Surface - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - end - - - - - end - baseline - Properties - - - + + 40 + + + Surface + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + end + + + + + end + baseline + Properties + + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Renderer - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - end - - - - - end - baseline - Properties - - - + + 40 + + + Renderer + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + end + + + + + end + baseline + Properties + + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Frame Clock - start - baseline - 0.0 - 1 - - - - - 1 - end - baseline - end - - - - - end - baseline - Properties - - - + + 40 + + + Frame Clock + start + baseline + 0.0 + 1 + + + + + 1 + end + baseline + end + + + + + end + baseline + Properties + + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Tick Callback - start - baseline - 0 - 1 - - - - - end - baseline - object-select-symbolic - - + + 40 + + + Tick Callback + start + baseline + 0 + 1 + + + + + end + baseline + object-select-symbolic + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Frame Count - start - baseline - 0 - 1 - - - - - end - baseline - - + + 40 + + + Frame Count + start + baseline + 0 + 1 + + + + + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Frame Rate - start - baseline - 0 - 1 - - - - - end - baseline - - + + 40 + + + Frame Rate + start + baseline + 0 + 1 + + + + + end + baseline + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Mapped - start - baseline - 0 - 1 - - - - - end - baseline - object-select-symbolic - - + + 40 + + + Mapped + start + baseline + 0 + 1 + + + + + end + baseline + object-select-symbolic + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Realized - start - baseline - 0 - 1 - - - - - end - baseline - object-select-symbolic - - + + 40 + + + Realized + start + baseline + 0 + 1 + + + + + end + baseline + object-select-symbolic + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Is Toplevel - start - baseline - 0 - 1 - - - - - end - baseline - object-select-symbolic - - + + 40 + + + Is Toplevel + start + baseline + 0 + 1 + + + + + end + baseline + object-select-symbolic + + + + + 0 - - 0 - - - 10 - 10 - 10 - 10 - 40 - - - Child Visible - start - baseline - 0 - 1 - - - - - end - baseline - object-select-symbolic - - + + 40 + + + Child Visible + start + baseline + 0 + 1 + + + + + end + baseline + object-select-symbolic diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index e125449bab..310d8ce2d1 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -16,352 +16,349 @@ 60 10 - + + none center + - - none - + + 0 - - 0 + + 40 - - 40 - - - GTK Theme - start - baseline - 0.0 - - - - - end - baseline - 1 - - + + GTK Theme + start + baseline + 0.0 + + + + + end + baseline + 1 + + + + - + + 40 - - 40 - - - Dark Variant - start - baseline - 0.0 - - - - - end - center - 1 - - + + Dark Variant + start + baseline + 0.0 + + + + + end + center + 1 + + + + + 0 - - 0 + + 40 - - 40 - - - Cursor Theme - start - baseline - 0.0 - - - - - end - baseline - 1 - - + + Cursor Theme + start + baseline + 0.0 + + + + + end + baseline + 1 + + + + + 0 - - 0 + + 40 - - 40 - - - Cursor Size - start - baseline - 0.0 - - - - - end - baseline - 2 - 2 - - - 16 - 128 - 8 - 8 - - - 1 - 1 - - + + Cursor Size + start + baseline + 0.0 + + + + + end + baseline + 2 + 2 + + + 16 + 128 + 8 + 8 + + + 1 + 1 + + + + + 0 - - 0 + + 40 - - 40 - - - Icon Theme - start - baseline - 0.0 - - - - - end - baseline - 1 - - + + Icon Theme + start + baseline + 0.0 + + + + + end + baseline + 1 + + + + + 0 - - 0 + + 40 - - 40 - - - Font - start - baseline - 0.0 - - - - - end - baseline - 1 - - + + Font + start + baseline + 0.0 + + + + + end + baseline + 1 + + + + + 0 - - 0 + + 20 - - 20 - - - Font Scale - start - baseline - 0.0 - - - - - baseline - - - 0.5 - 2 - 0.01 - 0.01 - - - 0 - 1 - - - - - - - - end - baseline - 4 - 4 - number - - + + Font Scale + start + baseline + 0.0 + + + + + baseline + + + 0.5 + 2 + 0.01 + 0.01 + + + 0 + 1 + + + + + + + + end + baseline + 4 + 4 + number + + + + + 0 - - 0 + + 40 - - 40 - - - Text Direction - start - baseline - 0.0 - - - - - end - baseline - 1 - - - - - Left-to-Right - Right-to-Left - - - - - + + Text Direction + start + baseline + 0.0 + + + + + end + baseline + 1 + + + + + Left-to-Right + Right-to-Left + + + + + + + + 0 - - 0 + + 40 - - 40 - - - Window Scaling - start - baseline - 0.0 - - - - - end - baseline - - - 1 - 3 - 1 - 1 - - - 1 - 1 - - + + Window Scaling + start + baseline + 0.0 + + + + + end + baseline + + + 1 + 3 + 1 + 1 + + + 1 + 1 + + + + - + + 40 - - 40 - - - Animations - start - baseline - 0.0 - - - - - end - center - 1 - - + + Animations + start + baseline + 0.0 + + + + + end + center + 1 + + + + + 0 - - 0 + + 20 - - 20 - - - Slowdown - start - baseline - 0.0 - - - - - - - -3 - 3 - 1 - 1 - - - baseline - 0 - 1 - - - - - - - - end - baseline - 4 - 4 - number - - + + Slowdown + start + baseline + 0.0 + + + + + + + -3 + 3 + 1 + 1 + + + baseline + 0 + 1 + + + + + + + + end + baseline + 4 + 4 + number @@ -371,261 +368,257 @@ - + + none center + - - none - 1 - + - + + 40 - - 40 - - - Show fps overlay - start - baseline - 0.0 - - - - - end - center - 1 - - - + + Show fps overlay + start + baseline + 0.0 + + + + + end + center + 1 + + + + + - + + 40 - - 40 - - - Show Graphic Updates - start - baseline - 0.0 - - - - - end - center - 1 - - - + + Show Graphic Updates + start + baseline + 0.0 + + + + + end + center + 1 + + + + + - + + 40 - - 40 - - - Show Fallback Rendering - start - baseline - 0.0 - - - - - end - center - 1 - - - + + Show Fallback Rendering + start + baseline + 0.0 + + + + + end + center + 1 + + + + + - + + 40 - - 40 - - - Show Baselines - start - baseline - 0.0 - - - - - end - center - 1 - - - + + Show Baselines + start + baseline + 0.0 + + + + + end + center + 1 + + + + + - + + 40 - - 40 + + 6 - - 6 - - - Show Layout Borders - start - baseline - 0.0 - - - - - dialog-question-symbolic - - + + Show Layout Borders + start + baseline + 0.0 + + + + + dialog-question-symbolic + + + + + 10 + 10 + 10 + 10 + 4 + 4 + + + css-padding-color + + 0 + 0 + + + + + + css-border-color + + 0 + 1 + + + + + + css-margin-color + + 0 + 2 + + + + + + widget-margin-color + + 0 + 3 + + + + + + CSS Padding + 0 + + 1 + 0 + + + + + + CSS Border + 0 + + 1 + 1 + + + + + + CSS Margin + 0 + + 1 + 2 + + + - - 10 - 10 - 10 - 10 - 4 - 4 - - - css-padding-color - - 0 - 0 - - - - - - css-border-color - - 0 - 1 - - - - - - css-margin-color - - 0 - 2 - - - - - - widget-margin-color - - 0 - 3 - - - - - - CSS Padding - 0 - - 1 - 0 - - - - - - CSS Border - 0 - - 1 - 1 - - - - - - CSS Margin - 0 - - 1 - 2 - - - - - - Widget Margin - 0 - - 1 - 3 - - - + + Widget Margin + 0 + + 1 + 3 + - + - - - - - - end - center - 1 - + + + + end + center + 1 + + + + + + + - + + 40 - - 40 - - - Show Focus - start - baseline - 0.0 - - - - - end - center - 1 - - - + + Show Focus + start + baseline + 0.0 + + + + + end + center + 1 + @@ -635,35 +628,31 @@ - + + none center + - - none - 1 - + - + + 40 - - 40 - - - Simulate Touchscreen - start - baseline - 0.0 - - - - - end - center - 1 - - + + Simulate Touchscreen + start + baseline + 0.0 + + + + + end + center + 1 @@ -673,25 +662,21 @@ - + + none center + - - none - 1 - + - - - - Inspect Inspector - center - center - - - + + Inspect Inspector + center + center + @@ -741,10 +726,10 @@ - - - - + + + + diff --git a/gtk/theme/Default/_common.scss b/gtk/theme/Default/_common.scss index fd25bfc0d6..6e8aa4e503 100644 --- a/gtk/theme/Default/_common.scss +++ b/gtk/theme/Default/_common.scss @@ -3401,6 +3401,38 @@ columnview.complex { } } + +/********************************************************************** + * Boxed Lists * + * Lists inside a rounded frame. Can be used together with .rich-list * * + **********************************************************************/ + +.boxed-list { + border-radius: $window_radius; + border: 1px solid $borders_color; + + > row { + @include focus-ring($offset: -1px); + + border-bottom: 1px solid transparentize($borders_color, 0.5); + + &:backdrop { + border-bottom-color: transparentize($backdrop_borders_color, 0.5); + } + + &:first-child { + border-top-left-radius: $window_radius; + border-top-right-radius: $window_radius; + } + + &:last-child { + border-bottom-left-radius: $window_radius; + border-bottom-right-radius: $window_radius; + border-bottom: none; + } + } +} + /********************* * App Notifications * *********************/ -- 2.30.2