From 3bcbf4cf4ebde34b37c4a165a24ac3f9c0aa909a Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Mon, 1 Jan 2018 19:53:43 +0000 Subject: [PATCH] themes: Regenerate CSS to reflect recent commits a lot of them, in this case --- gtk/theme/Adwaita/gtk-contained-dark.css | 18 +++++++++----- gtk/theme/Adwaita/gtk-contained.css | 20 ++++++++++------ .../HighContrast/gtk-contained-inverse.css | 22 ++++++++++------- gtk/theme/HighContrast/gtk-contained.css | 24 +++++++++++-------- 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index bb2535128e..a5ec8976bd 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1,12 +1,18 @@ * { padding: 0; -gtk-secondary-caret-color: #215d9c; } -button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } +button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } /*************** Base States * */ .background { color: #eeeeec; background-color: #33393b; } .background:backdrop { color: #919494; background-color: #33393b; text-shadow: none; -gtk-icon-shadow: none; } +.normal-icons { -gtk-icon-size: 16px; } + +.large-icons { -gtk-icon-size: 32px; } + +image.drag-icon { -gtk-icon-size: 32px; } + /* These wildcard seems unavoidable, need to investigate. Wildcards are bad and troublesome, use them with care, or better, just don't. Everytime a wildcard is used a kitten dies, painfully. */ *:disabled { -gtk-icon-filter: opacity(0.5); } @@ -1140,13 +1146,13 @@ menu menuitem check, menu menuitem radio { margin: 0; } menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled { min-height: 14px; min-width: 14px; background-image: none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; border-color: currentColor; } -check { border-radius: 3px; } +check { border-radius: 3px; -gtk-icon-size: 14px; } check:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); } check:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); } -treeview.view radio:selected:focus, treeview.view radio:selected, radio { border-radius: 100%; } +treeview.view radio:selected:focus, treeview.view radio:selected, radio { border-radius: 100%; -gtk-icon-size: 14px; } treeview.view radio:checked:selected, radio:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")), -gtk-recolor(url("assets/bullet@2-symbolic.symbolic.png"))); } @@ -1564,11 +1570,11 @@ row.activatable:selected:backdrop { background-color: #215d9c; } .app-notification border, .app-notification.frame border { border: none; } /************* Expanders * */ -expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } +expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } expander title:hover arrow { color: white; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f1470cd491..f2d880528c 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1,12 +1,18 @@ * { padding: 0; -gtk-secondary-caret-color: #4a90d9; } -button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } +button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } /*************** Base States * */ .background { color: #2e3436; background-color: #e8e8e7; } .background:backdrop { color: #8b8e8f; background-color: #e8e8e7; text-shadow: none; -gtk-icon-shadow: none; } +.normal-icons { -gtk-icon-size: 16px; } + +.large-icons { -gtk-icon-size: 32px; } + +image.drag-icon { -gtk-icon-size: 32px; } + /* These wildcard seems unavoidable, need to investigate. Wildcards are bad and troublesome, use them with care, or better, just don't. Everytime a wildcard is used a kitten dies, painfully. */ *:disabled { -gtk-icon-filter: opacity(0.5); } @@ -48,7 +54,7 @@ flowbox flowboxchild:selected { outline-offset: -2px; } .content-view .tile:disabled { background-color: transparent; } -label { caret-color: currentColor; border-radius: 99px;} +label { caret-color: currentColor; } label.separator { color: #2e3436; } @@ -1160,13 +1166,13 @@ menu menuitem check, menu menuitem radio { margin: 0; } menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled { min-height: 14px; min-width: 14px; background-image: none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; border-color: currentColor; } -check { border-radius: 3px; } +check { border-radius: 3px; -gtk-icon-size: 14px; } check:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); } check:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); } -treeview.view radio:selected:focus, treeview.view radio:selected, radio { border-radius: 100%; } +treeview.view radio:selected:focus, treeview.view radio:selected, radio { border-radius: 100%; -gtk-icon-size: 14px; } treeview.view radio:checked:selected, radio:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")), -gtk-recolor(url("assets/bullet@2-symbolic.symbolic.png"))); } @@ -1584,11 +1590,11 @@ row.activatable:selected:backdrop { background-color: #4a90d9; } .app-notification border, .app-notification.frame border { border: none; } /************* Expanders * */ -expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } +expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } expander title:hover arrow { color: #748489; } diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 86d36c419e..2b4d6622a1 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -32,7 +32,9 @@ @define-color wm_button_active_color_b shade(#000, 0.89); @define-color wm_button_active_color_c shade(#000, 0.9); @define-color content_view_bg #111; -* { padding: 0; -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: #cc0000; -gtk-icon-style: symbolic; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkTreeView-horizontal-separator: 4; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; outline-color: currentColor; outline-style: dashed; outline-offset: -4px; outline-width: 2px; -gtk-outline-radius: 2px; } +* { padding: 0; -gtk-icon-style: symbolic; outline-style: none; } + +*:focus(visible) { outline-color: currentColor; outline-style: dashed; outline-offset: -4px; outline-width: 2px; -gtk-outline-radius: 2px; } /*************** Base States * */ .background { color: #fff; background-color: #000; } @@ -52,6 +54,10 @@ .gtkstyle-fallback:selected { background-color: #ddd; color: #000; } +.normal-icons { -gtk-icon-size: 16px; } + +.large-icons { -gtk-icon-size: 32px; } + .view, textview text, iconview { color: #fff; background-color: #111; } .view:backdrop, textview text:backdrop, iconview:backdrop { color: #fff; background-color: #111; } @@ -162,7 +168,7 @@ button.titlebutton:disabled, button:disabled { border-width: 2px; border-style: button.titlebutton:disabled:active, button.titlebutton:disabled:checked, button:disabled:active, button:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: #494949; background-image: none; background-color: #070707; } -button.titlebutton:backdrop, button:backdrop { border-width: 2px; border-style: solid; color: #fff; background-color: #000; border-color: #737373; background-image: none; -gtk-icon-effect: none; } +button.titlebutton:backdrop, button:backdrop { border-width: 2px; border-style: solid; color: #fff; background-color: #000; border-color: #737373; background-image: none; -gtk-icon-filter: none; } button.titlebutton:backdrop:active, button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked { border-width: 2px; border-style: solid; color: black; background-color: #737373; border-color: #737373; background-image: none; } @@ -544,7 +550,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 { border-left-color: #888888; border-top-color: #000; } treeview.view:selected { border-radius: 0; } @@ -808,8 +814,6 @@ notebook tab button > image { padding: 2px; } /************** Scrollbars * */ scrollbar { background-color: #0a0a0a; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } -* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } - scrollbar.top { border-bottom: 1px solid gray; } scrollbar.bottom { border-top: 1px solid gray; } @@ -916,7 +920,7 @@ checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indete checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, checkbutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop { color: gray; } -check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; border-width: 2px; border-style: solid; color: #fff; background-image: none; background-color: #000; border-color: gray; } +check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; -gtk-icon-size: 14px; border-width: 2px; border-style: solid; color: #fff; background-image: none; background-color: #000; border-color: gray; } check:only-child, radio:only-child { margin: 0; } @@ -1234,11 +1238,11 @@ row:hover, row.activatable:hover { transition: none; } .app-notification border, .app-notification.frame border { border-width: 0; } /************* Expanders * */ -expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } +expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } expander title:hover arrow { color: white; } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index e06639bca8..536ef816ed 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -32,7 +32,9 @@ @define-color wm_button_active_color_b shade(#fff, 0.89); @define-color wm_button_active_color_c shade(#fff, 0.9); @define-color content_view_bg #fff; -* { padding: 0; -GtkToolButton-icon-spacing: 4; -GtkTextView-error-underline-color: #cc0000; -gtk-icon-style: symbolic; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkTreeView-horizontal-separator: 4; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; outline-color: currentColor; outline-style: dashed; outline-offset: -4px; outline-width: 2px; -gtk-outline-radius: 2px; } +* { padding: 0; -gtk-icon-style: symbolic; outline-style: none; } + +*:focus(visible) { outline-color: currentColor; outline-style: dashed; outline-offset: -4px; outline-width: 2px; -gtk-outline-radius: 2px; } /*************** Base States * */ .background { color: #000; background-color: #fff; } @@ -52,6 +54,10 @@ .gtkstyle-fallback:selected { background-color: #000; color: #fff; } +.normal-icons { -gtk-icon-size: 16px; } + +.large-icons { -gtk-icon-size: 32px; } + .view, textview text, iconview { color: #000; background-color: #fff; } .view:backdrop, textview text:backdrop, iconview:backdrop { color: #000; background-color: #fff; } @@ -162,11 +168,11 @@ button.titlebutton:disabled, button:disabled { border-width: 2px; border-style: button.titlebutton:disabled:active, button.titlebutton:disabled:checked, button:disabled:active, button:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: silver; background-image: none; background-color: white; } -button.titlebutton:backdrop, button:backdrop { border-width: 2px; border-style: solid; color: #000; background-color: #fff; border-color: #8d8d8d; background-image: none; -gtk-icon-effect: none; } +button.titlebutton:backdrop, button:backdrop { border-width: 2px; border-style: solid; color: #000; background-color: #fff; border-color: #8d8d8d; background-image: none; -gtk-icon-filter: none; } button.titlebutton:backdrop:active, button.titlebutton:backdrop:checked, button:backdrop:active, button:backdrop:checked { border-width: 2px; border-style: solid; color: white; background-color: #8d8d8d; border-color: #8d8d8d; background-image: none; } - button.titlebutton:backdrop:disabled, button:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: white; border-color: silver; background-image: none; } +button.titlebutton:backdrop:disabled, button:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: white; border-color: silver; background-image: none; } button.titlebutton:backdrop:disabled:active, button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: silver; background-image: none; background-color: #f6f6f6; } @@ -548,7 +554,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 { border-left-color: gray; border-top-color: #fff; } treeview.view:selected { border-radius: 0; } @@ -812,8 +818,6 @@ notebook tab button > image { padding: 2px; } /************** Scrollbars * */ scrollbar { background-color: #f2f2f2; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } -* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } - scrollbar.top { border-bottom: 1px solid gray; } scrollbar.bottom { border-top: 1px solid gray; } @@ -920,7 +924,7 @@ checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indete checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, checkbutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop { color: gray; } -check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; border-width: 2px; border-style: solid; color: #000; background-image: none; background-color: #fff; border-color: gray; } +check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; -gtk-icon-size: 14px; border-width: 2px; border-style: solid; color: #000; background-image: none; background-color: #fff; border-color: gray; } check:only-child, radio:only-child { margin: 0; } @@ -1240,11 +1244,11 @@ row:hover, row.activatable:hover { transition: none; } .app-notification border, .app-notification.frame border { border-width: 0; } /************* Expanders * */ -expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } +expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander title > arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } expander title:hover arrow { color: #4d4d4d; }