From b9a304cf6f6995d6b8582c9381da1505ed5ff4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Mon, 3 Oct 2016 09:31:44 +0200 Subject: [PATCH] testgtk: fix css --- tests/testgtk.c | 3 ++- tests/testgtk.css | 16 +++++++--------- tests/testgtk2.css | 7 ++++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/testgtk.c b/tests/testgtk.c index dc878ad028..4155cfb889 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -9443,7 +9443,8 @@ main (int argc, char *argv[]) gtk_css_provider_load_from_data (memory_provider, "#testgtk-version-label {\n" " color: #f00;\n" - " font: Sans 18;\n" + " font-family: Sans;\n" + " font-size: 18px;\n" "}", -1, NULL); gtk_style_context_add_provider_for_screen (screen, GTK_STYLE_PROVIDER (memory_provider), diff --git a/tests/testgtk.css b/tests/testgtk.css index f5e8694f12..3c5002ff05 100644 --- a/tests/testgtk.css +++ b/tests/testgtk.css @@ -7,9 +7,6 @@ } * { - -GtkButton-child-displacement-x: 1; - -GtkButton-child-displacement-y: 1; - -GtkToolbar-space-size: 10; -GtkToolbar-space-style: line; -GtkToolbar-button-relief: none; @@ -18,25 +15,26 @@ -GtkArrow-arrow-scaling: 1.0; -GtkEntry-invisible-char: 10046; - font: Sans 12; + font-family: Sans; + font-size: 12px; -Gtest-foo: 47; -Gtest-bar: 47; } -GtkLabel:selected { +label:selected { background-color: gray; } -GtkLabel:prelight { +label:hover { background-color: mix (#a0a0a0, rgb (75%, 200, 0%), 0.9); } /* override testgtk2, introduce the green color in the button list */ -#main_window GtkScrolledWindow GtkButton:prelight { +#main_window scrolledwindow button:hover { background-color: rgb (0%, 75%, 0); } -GtkEntry { - gtk-key-bindings: entry-bindings; +entry { + -gtk-key-bindings: entry-bindings; } diff --git a/tests/testgtk2.css b/tests/testgtk2.css index a51ec2a100..49e6c093e1 100644 --- a/tests/testgtk2.css +++ b/tests/testgtk2.css @@ -1,9 +1,10 @@ /* this file gets included from testgtk.css */ -#main_window GtkButton { - font: Monospace 10; +#main_window button { + font-family: Monospace; + font-size: 10px; } -#main_window GtkButton:hover { +#main_window button:hover { background-color: rgba(0%, 0%, 75%, 0.1); }