[dconf-editor] Rework CSS.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Rework CSS.
- Date: Sun, 26 Aug 2018 22:49:14 +0000 (UTC)
commit e9a03e3ee9c54bdda7d86115dba8e42b24bbc577
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Mon Aug 27 00:41:54 2018 +0200
Rework CSS.
That includes a hack by Sam Hewitt to use 1.1rem instead of 1rem;
that’s closer to the 16px that serves as a base for icons design.
editor/dconf-editor.css | 110 +++++++++++++++++++++------------------
editor/dconf-window.vala | 3 +-
editor/folder-list-box-row.ui | 1 +
editor/key-list-box-row.ui | 2 +
editor/modifications-revealer.ui | 3 ++
5 files changed, 68 insertions(+), 51 deletions(-)
---
diff --git a/editor/dconf-editor.css b/editor/dconf-editor.css
index 2883638..bff7b9e 100644
--- a/editor/dconf-editor.css
+++ b/editor/dconf-editor.css
@@ -90,73 +90,51 @@
.large-window.small-keys-list-rows .keys-list > row { border-radius:0;
-gtk-outline-radius:2px; /* gtk+
defaults */ }
-/* folder icon */
- .keys-list > row > .folder > grid {
- background-repeat:no-repeat;
- transition:background-position 0.3s,
- background-size 0.3s,
- padding-left 0.3s,
- padding-right 0.3s; /* warning: ltr/rtl */
- }
-
- .keys-list > row > .folder > grid {
background-image:-gtk-icontheme("folder-symbolic"); }
- .keys-list > row:active > .folder > grid {
background-image:-gtk-icontheme("folder-open-symbolic"); }
-
/* visual padding */
.keys-list:dir(ltr) > row > .key > grid { padding-left: 10px;
padding-right:20px; } /* looks cool */
.keys-list:dir(rtl) > row > .key > grid { padding-right:10px;
padding-left: 20px; }
- .keys-list > row > .key > grid { transition:padding-left
0.3s, padding-right 0.3s; }
-
- .keys-list:dir(ltr) > row > .folder > grid { background-position:
0.75rem center; }
- .keys-list:dir(rtl) > row > .folder > grid {
background-position:calc(100% - 0.75rem) center; }
.keys-list:dir(ltr) > row > .key > grid > :last-child { margin-left:
4em; }
.keys-list:dir(rtl) > row > .key > grid > :last-child {
margin-right:4em; }
-/* icon sizing */
- .keys-list > row > .folder > grid { background-size:1.5rem; }
- .small-keys-list-rows .keys-list > row > .folder > grid { background-size:1rem; }
-
/* technical padding: icon visual padding + icon size + some padding */
- .keys-list:dir(ltr) > row > .folder > grid,
- .keys-list:dir(ltr) > row > .key > grid { padding-left: 3rem; }
+ .keys-list > row > .managed > grid { transition:padding-left
0.3s,
+ padding-right
0.3s; /* warning: ltr/rtl */ }
- .small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid,
- .small-keys-list-rows .keys-list:dir(ltr) > row > .key > grid { padding-left: 2.25rem; }
+ .keys-list:dir(ltr) > row > .managed > grid { padding-left: 3rem; }
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .managed > grid { padding-left: 2.25rem; }
+ .keys-list:dir(rtl) > row > .managed > grid { padding-right: 3rem; }
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .manadeg > grid { padding-right: 2.25rem; }
- .keys-list:dir(rtl) > row > .folder > grid,
- .keys-list:dir(rtl) > row > .key > grid { padding-right: 3rem; }
- .small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid,
- .small-keys-list-rows .keys-list:dir(rtl) > row > .key > grid { padding-right: 2.25rem; }
+/* grid spacing and padding-end */
+ .keys-list:dir(ltr) > row > .managed > grid > label { padding-right:
0.5em; }
+ .keys-list:dir(rtl) > row > .managed > grid > label { padding-left:
0.5em; }
/* technical labels placing */
- .keys-list > row label.key-name {
transition:min-width 0.3s; }
- .keys-list > row > .key > grid label.key-name { min-width:
222px; }
- .keys-list > row > .folder > grid label.key-name {
min-width:calc(222px + 10px - 3rem); }
- .small-keys-list-rows .keys-list > row > .folder > grid label.key-name {
min-width:calc(222px + 10px - 2.25rem); }
+ .keys-list > row label.key-name {
transition:min-width 0.3s,
+
font-size 0.3s; }
-.large-window .keys-list > row > .key > grid label.key-name { min-width:
250px; }
-.large-window .keys-list > row > .folder > grid label.key-name {
min-width:calc(250px + 10px - 3rem); }
-.large-window.small-keys-list-rows .keys-list > row > .folder > grid label.key-name {
min-width:calc(250px + 10px - 2.25rem); }
+ .keys-list > row > .managed > grid > label.key-name { min-width:
222px; }
+.large-window .keys-list > row > .managed > grid > label.key-name { min-width:
250px; }
-/* grid spacing and padding-end */
- .keys-list:dir(ltr) > row grid > label { padding-right: 0.5em; }
- .keys-list:dir(rtl) > row grid > label { padding-left: 0.5em; }
+/* icons place */
+ .keys-list > row > .managed {
background-repeat:no-repeat;
+ transition:background-size
0.3s,
+
background-position 0.3s; }
+
+ .keys-list > row > .managed { background-size:1.5rem; }
/* ~22px usually */
+ .keys-list:dir(ltr) > row > .managed { background-position:
0.75rem center; }
+ .keys-list:dir(rtl) > row > .managed {
background-position:calc(100% - 0.75rem) center; }
-/* key icons */
+ .small-keys-list-rows .keys-list > row > .managed { background-size:1.1rem; }
/* ~16px usually, base size */
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .managed { background-position:
0.55rem center; }
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .managed {
background-position:calc(100% - 0.55rem) center; }
- .keys-list > row > .key { transition:background-position
0.3s,
- background-size
0.3s;
- background-repeat:no-repeat;
- background-size:1.5rem; }
- .small-keys-list-rows .keys-list > row > .key { background-size:1rem; }
+/* icon choice */
- .keys-list:dir(ltr) > row > .key { background-position:
0.75rem center; }
- .keys-list:dir(rtl) > row > .key { background-position:calc(100%
- 0.75rem) center; }
- .small-keys-list-rows .keys-list:dir(ltr) > row > .key { background-position:
0.75rem center; }
- .small-keys-list-rows .keys-list:dir(rtl) > row > .key { background-position:calc(100%
- 0.75rem) center; }
+.keys-list > row > .folder {
background-image:-gtk-icontheme("folder-symbolic"); }
+.keys-list > row:active > .folder {
background-image:-gtk-icontheme("folder-open-symbolic"); }
-/* icons */
.keys-list > row > .key.delayed,
.keys-list > row > .dconf-key.key.delayed,
.keys-list > row > .edited.gsettings-key.key.delayed {
background-image:-gtk-icontheme("document-open-recent-symbolic"); }
@@ -175,6 +153,8 @@
.keys-list > row > .erase.dconf-key.key.delayed {
background-image:-gtk-icontheme("user-trash-symbolic"); }
.keys-list > row > .erase.dconf-key.key {
background-image:-gtk-icontheme("action-unavailable-symbolic"); }
+/* text styling */
+
.keys-list > row > .erase.dconf-key.key:not(.delayed) label.key-value { font-style:italic; }
.keys-list > row > :not(.erase).dconf-key.key label.key-name,
@@ -274,7 +254,37 @@
* * lists headers
\*/
-.header-label { margin:0.45em 0.75em 0.2em; font-weight:bold; }
+.bookmarks > grid > scrolledwindow > viewport > list > row > grid > button,
+.bookmarks > grid > scrolledwindow > viewport > list > row > grid > label,
+.delayed-settings-popover list > row > grid > label,
+.delayed-settings-popover list > row > grid > grid > label,
+.modifications-revealer button,
+.titlebar > box.pathbar > button,
+.titlebar > box.pathbar > label {
+ transition:all 0 ease;
+}
+
+.key-summary,
+.key-value,
+.background label {
+ transition:min-height 0.3s,
+ font-size 0.3s,
+ padding 0.3s,
+ margin 0.3s;
+}
+.bookmarks > grid > scrolledwindow > viewport > list > row {
+ transition:min-height 0.3s,
+ font-size 0.3s,
+ padding 0.3s,
+ margin 0.3s;
+}
+
+.header-label {
+ margin:0.45em 0.75em 0.2em;
+ font-weight:bold;
+ transition:font-size 0.3s,
+ margin 0.3s;
+}
/*\
* * properties list
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 5c45301..2984479 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -87,9 +87,10 @@ private class DConfWindow : ApplicationWindow
if (!disable_warning && settings.get_boolean ("show-warning"))
show.connect (show_initial_warning);
- set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
+ // maximize before setting default size: only one call to on_size_allocate() so no change of the
large-window CSS class at start
if (settings.get_boolean ("window-is-maximized"))
maximize ();
+ set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
set_css_styles ();
diff --git a/editor/folder-list-box-row.ui b/editor/folder-list-box-row.ui
index 12cd8d7..3a89c16 100644
--- a/editor/folder-list-box-row.ui
+++ b/editor/folder-list-box-row.ui
@@ -4,6 +4,7 @@
<template class="FolderListBoxRow" parent="ClickableListBoxRow">
<property name="visible">True</property>
<style>
+ <class name="managed"/>
<class name="folder"/>
</style>
<child>
diff --git a/editor/key-list-box-row.ui b/editor/key-list-box-row.ui
index 77c52a1..3e5dff9 100644
--- a/editor/key-list-box-row.ui
+++ b/editor/key-list-box-row.ui
@@ -4,6 +4,7 @@
<template class="KeyListBoxRow" parent="ClickableListBoxRow">
<property name="visible">True</property>
<style>
+ <class name="managed"/>
<class name="key"/>
</style>
<child>
@@ -41,6 +42,7 @@
<property name="ellipsize">end</property>
<property name="single-line-mode">True</property>
<style>
+ <class name="key-summary"/>
<class name="dim-label"/>
</style>
</object>
diff --git a/editor/modifications-revealer.ui b/editor/modifications-revealer.ui
index 4d1a538..249ad8e 100644
--- a/editor/modifications-revealer.ui
+++ b/editor/modifications-revealer.ui
@@ -7,6 +7,9 @@
<child>
<object class="GtkActionBar">
<property name="visible">True</property>
+ <style>
+ <class name="modifications-revealer"/>
+ </style>
<child>
<object class="GtkMenuButton" id="delayed_list_button">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]