diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2018-07-09 15:27:51 +0000 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2018-07-09 15:27:51 +0000 |
| commit | 8373b906d4a035d894f233c1892ac96ce3d37da8 (patch) | |
| tree | 25d3fe674c15da11a4ece27a2e86ccbc796cbfb1 | |
| parent | 0bca6969d448addc1499de76249faaf0dce8a734 (diff) | |
| parent | 660087db42303bd4738538c93e95ce7fb7a0f34b (diff) | |
| download | gtk+-8373b906d4a035d894f233c1892ac96ce3d37da8.tar.gz | |
Merge branch 'expander-size-3' into 'gtk-3-24'
HighContrast: Restore expander size
See merge request GNOME/gtk!210
| -rw-r--r-- | gtk/theme/HighContrast/_common.scss | 6 | ||||
| -rw-r--r-- | gtk/theme/HighContrast/gtk-contained-inverse.css | 4 | ||||
| -rw-r--r-- | gtk/theme/HighContrast/gtk-contained.css | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 200c9497ea..b31388a08b 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -1368,7 +1368,7 @@ treeview.view { -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; - -GtkTreeView-expander-size: 16; + -GtkTreeView-expander-size: 24; border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color, border-top-color: $bg_color; // while this is the grid lines color, better then nothing @@ -2832,8 +2832,8 @@ row.activatable { expander { title > arrow { - min-width: 16px; - min-height: 16px; + min-width: 24px; + min-height: 24px; -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 5ced7557b7..1d6d26fb5d 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -548,7 +548,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .path-bar button image { padding-top: 1px; } /************** Tree Views * */ -treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; border-left-color: #888888; border-top-color: #000; } +treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 24; border-left-color: #888888; border-top-color: #000; } treeview.view:selected { border-radius: 0; } @@ -1240,7 +1240,7 @@ row:hover, row.activatable:hover { transition: none; } .app-notification border, .app-notification.frame border { border-width: 0; } /************* Expanders * */ -expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +expander title > arrow { min-width: 24px; min-height: 24px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index 379fea90ce..377e18930d 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -552,7 +552,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .path-bar button image { padding-top: 1px; } /************** Tree Views * */ -treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; border-left-color: gray; border-top-color: #fff; } +treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 24; border-left-color: gray; border-top-color: #fff; } treeview.view:selected { border-radius: 0; } @@ -1246,7 +1246,7 @@ row:hover, row.activatable:hover { transition: none; } .app-notification border, .app-notification.frame border { border-width: 0; } /************* Expanders * */ -expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +expander title > arrow { min-width: 24px; min-height: 24px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } |