[gnome-builder] style: use window.workbench instead of workbench CSS name
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] style: use window.workbench instead of workbench CSS name
- Date: Thu, 3 Nov 2016 22:09:51 +0000 (UTC)
commit b810de3773fb9c214fa2bc91746157fa2ae1e3da
Author: Christian Hergert <chergert redhat com>
Date: Thu Nov 3 15:08:50 2016 -0700
style: use window.workbench instead of workbench CSS name
This allows us to reuse the styling from GTK+ master for various states.
data/keybindings/shared.css | 2 +-
data/keybindings/vim.css | 2 +-
data/theme/Adwaita-shared.css | 6 +++---
data/theme/Arc-shared.css | 6 +++---
data/theme/shared.css | 6 +++---
libide/workbench/ide-workbench.c | 1 -
libide/workbench/ide-workbench.ui | 5 ++++-
7 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/data/keybindings/shared.css b/data/keybindings/shared.css
index d4726a3..f54bd89 100644
--- a/data/keybindings/shared.css
+++ b/data/keybindings/shared.css
@@ -25,6 +25,6 @@ entry.gb-command-bar-entry {
-gtk-key-bindings: builder-command-bar-entry;
}
-workbench {
+window.workbench {
-gtk-key-bindings: builder-workbench-bindings;
}
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index f3945fa..4da8e08 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -2774,6 +2774,6 @@ list {
-gtk-key-bindings: builder-vim-list-box;
}
-workbench {
+window.workbench {
-gtk-key-bindings: builder-vim-workbench;
}
diff --git a/data/theme/Adwaita-shared.css b/data/theme/Adwaita-shared.css
index f55421b..cb61635 100644
--- a/data/theme/Adwaita-shared.css
+++ b/data/theme/Adwaita-shared.css
@@ -9,19 +9,19 @@
* stack. We were seeing black edges around the header bar, and
* improper radius on the headerbar.
*/
-workbench stack.titlebar {
+window.workbench stack.titlebar {
border-bottom: none;
border-radius: 6px 6px 0 0;
box-shadow: none;
padding: 0;
}
-workbench stack.titlebar headerbar {
+window.workbench stack.titlebar headerbar {
border-radius: 6px 6px 0 0;
margin: 0;
border-bottom: none;
box-shadow: 0 -1px 0 @borders inset;
}
-workbench stack.titlebar headerbar:backdrop {
+window.workbench stack.titlebar headerbar:backdrop {
box-shadow: 0 -1px 0 alpha(@borders, 0.6) inset;
}
diff --git a/data/theme/Arc-shared.css b/data/theme/Arc-shared.css
index 25a1e47..3f42cbc 100644
--- a/data/theme/Arc-shared.css
+++ b/data/theme/Arc-shared.css
@@ -122,14 +122,14 @@ layoutpane > box.vertical:first-child > box.horizontal {
/* Builder pane */
-workbench buildperspective list {
+window.workbench buildperspective list {
border-right: 1px solid @borders;
background-color: @theme_base_color;
}
-workbench buildperspective list row {
+window.workbench buildperspective list row {
padding: 10px;
border-bottom: 1px solid alpha(@borders, 0.50);
}
-workbench buildperspective list row:last-child {
+window.workbench buildperspective list row:last-child {
border-bottom: none;
}
diff --git a/data/theme/shared.css b/data/theme/shared.css
index 9aa81b3..cbb6d34 100644
--- a/data/theme/shared.css
+++ b/data/theme/shared.css
@@ -192,14 +192,14 @@ omnisearchdisplay omnisearchgroup omnisearchrow:selected {
* preferences perspective, including groups, rows,
* sidebar, etc.
*/
-workbench preferences preferencesgroup list row {
+window.workbench preferences preferencesgroup list row {
padding: 10px;
border-bottom: 1px solid alpha(@borders, 0.2);
}
-workbench preferences preferencesgroup list row:last-child {
+window.workbench preferences preferencesgroup list row:last-child {
border-bottom: none;
}
-workbench preferences preferencesgroup list entry {
+window.workbench preferences preferencesgroup list entry {
background: none;
min-height: 0px;
}
diff --git a/libide/workbench/ide-workbench.c b/libide/workbench/ide-workbench.c
index 7f8e93b..516733b 100644
--- a/libide/workbench/ide-workbench.c
+++ b/libide/workbench/ide-workbench.c
@@ -405,7 +405,6 @@ ide_workbench_class_init (IdeWorkbenchClass *klass)
G_TYPE_NONE,
1, IDE_TYPE_CONTEXT);
- gtk_widget_class_set_css_name (widget_class, "workbench");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/builder/ui/ide-workbench.ui");
gtk_widget_class_bind_template_child (widget_class, IdeWorkbench, header_bar);
gtk_widget_class_bind_template_child (widget_class, IdeWorkbench, header_size_group);
diff --git a/libide/workbench/ide-workbench.ui b/libide/workbench/ide-workbench.ui
index 41bc911..b7ec8e5 100644
--- a/libide/workbench/ide-workbench.ui
+++ b/libide/workbench/ide-workbench.ui
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.21 -->
+ <!-- interface-requires gtk+ 3.22 -->
<template class="IdeWorkbench" parent="GtkApplicationWindow">
+ <style>
+ <class name="workbench"/>
+ </style>
<child type="titlebar">
<object class="GtkStack" id="header_stack">
<property name="visible">true</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]