From 65d53424ff5ee9849a0213e1467cbf5d2763fb5d Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 29 Jan 2022 01:33:41 +0100 Subject: [PATCH 1/2] Style buttons on minadwaita --- share/ui/Minwaita-Inkscape.css | 150 +++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 61 deletions(-) diff --git a/share/ui/Minwaita-Inkscape.css b/share/ui/Minwaita-Inkscape.css index 1e23bb75a8..eb388be193 100644 --- a/share/ui/Minwaita-Inkscape.css +++ b/share/ui/Minwaita-Inkscape.css @@ -2,126 +2,126 @@ /* - * Keep as small as possible - */ +* Keep as small as possible +*/ toolbar toolbutton > button:disabled, toolbar toolbutton > button:backdrop:disabled, .toolbar toolbutton > button:disabled, .toolbar toolbutton > button:backdrop:disabled { - -gtk-icon-effect: dim; + -gtk-icon-effect: dim; } scrollbar { - margin: -1px; +margin: -1px; } filechooser #pathbarbox button { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #c4c4bf; - border-bottom-color: #a0a097; - background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); - text-shadow: 0 1px rgba(255, 255, 255, 0.769231); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); - box-shadow: inset 0 1px white; + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #c4c4bf; + border-bottom-color: #a0a097; + background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); + text-shadow: 0 1px rgba(255, 255, 255, 0.769231); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); + box-shadow: inset 0 1px white; } filechooser #pathbarbox button:hover { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #c4c4bf; - border-bottom-color: #a0a097; - text-shadow: 0 1px rgba(255, 255, 255, 0.769231); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); - box-shadow: inset 0 1px white; - background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); -} - -filechooser #pathbarbox button:active { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #c4c4bf; - background-image: image(#e6e6e4); - box-shadow: inset 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - -gtk-icon-shadow: none; + border-bottom-color: #a0a097; + text-shadow: 0 1px rgba(255, 255, 255, 0.769231); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); + box-shadow: inset 0 1px white; + background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); +} + +filechooser #pathbarbox button:active { +color: #2e3436; +outline-color: rgba(46, 52, 54, 0.3); +border-color: #c4c4bf; +background-image: image(#e6e6e4); +box-shadow: inset 0 1px rgba(255, 255, 255, 0); +text-shadow: none; +-gtk-icon-shadow: none; } filechooser #pathbarbox button:disabled { - border-color: #c4c4bf; - background-image: image(#f9f9f8); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); +border-color: #c4c4bf; +background-image: image(#f9f9f8); +text-shadow: none; +-gtk-icon-shadow: none; +box-shadow: inset 0 1px rgba(255, 255, 255, 0); } filechooser #pathbarbox button:disabled label, filechooser #pathbarbox button:disabled { - color: #313739; +color: #313739; } filechooser #pathbarbox button:backdrop { - border-color: #cecec9; - background-image: image(#f5f5f4); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); +border-color: #cecec9; +background-image: image(#f5f5f4); +text-shadow: none; +-gtk-icon-shadow: none; +box-shadow: inset 0 1px rgba(255, 255, 255, 0); } filechooser #pathbarbox button:backdrop label, filechooser #pathbarbox button:backdrop { - color: #313739; +color: #313739; } filechooser #pathbarbox button:backdrop:disabled { - border-color: #cecec9; - background-image: image(#f9f9f8); - text-shadow: none; - -gtk-icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); +border-color: #cecec9; +background-image: image(#f9f9f8); +text-shadow: none; +-gtk-icon-shadow: none; +box-shadow: inset 0 1px rgba(255, 255, 255, 0); } filechooser #pathbarbox button:backdrop:disabled label, filechooser #pathbarbox button:backdrop:disabled { - color: #566164; +color: #566164; } button.titlebutton { - color:inherit; - border-style: none; - background-position: center; - background-repeat: no-repeat; - background-image: -gtk-scaled(url("assets/window-buttons/titlebutton.png"), url("assets/window-buttons/titlebutton@2.png")); - text-shadow: none; - -gtk-icon-shadow:none; +color:inherit; +border-style: none; +background-position: center; +background-repeat: no-repeat; +background-image: -gtk-scaled(url("assets/window-buttons/titlebutton.png"), url("assets/window-buttons/titlebutton@2.png")); +text-shadow: none; +-gtk-icon-shadow:none; } window.nautilus-desktop-window box.searchbar-container.vertical > searchbar, window.nautilus-desktop-window box.searchbar-container.vertical > searchbar:backdrop { - background-color: transparent; +background-color: transparent; } viewport.frame > list.tweak-categories label:backdrop { - color: #313739; +color: #313739; } .primary-toolbar button.raised { - margin: 0px; +margin: 0px; } scrolledwindow undershoot.top,scrolledwindow undershoot.bottom,scrolledwindow undershoot.left,scrolledwindow undershoot.right { - background-image: none; + background-image: none; } #AuxToolbox { - min-height:38px; +min-height:38px; } notebook notebook header label { - font-weight:normal; + font-weight:normal; } notebook notebook header image { - -gtk-icon-transform:scale(0.75); - margin:-1px 0 -1px -3px; + -gtk-icon-transform:scale(0.75); + margin:-1px 0 -1px -3px; } spinbutton button{ - -gtk-icon-transform:scale(0.6) translatex(-0.6px); +-gtk-icon-transform:scale(0.6) translatex(-0.6px); margin:0 -0.6px 0 0; padding:0; } @@ -129,3 +129,31 @@ spinbutton button{ spinbutton entry{ padding:0 0 0 3px; } + +#ToolboxCommon flowboxchild, +toolbutton{ + margin:0; + padding:0; +} +#ToolboxCommon flowboxchild button, +toolbutton button { + margin:0; + padding:4px; +} +#ToolboxCommon flowboxchild button *, +toolbutton button *{ + margin:0; + padding:0px; +} + +.dark button.radio:checked,.dark button.toggle:checked,.dark button:hover{ + background-color:transparent; + background-image:image(linear-gradient(shade(@theme_fg_color,0.42), shade(@theme_fg_color,0.3))); + box-shadow:none; +} + +button.radio:checked,button.toggle:checked,button:hover{ + background-color:transparent; + background-image:image(linear-gradient(shade(@theme_bg_color,1), shade(@theme_bg_color,0.6))); + box-shadow:none; +} \ No newline at end of file -- GitLab From 837b64a6c145f63119f98c8d0d37ba0cb5dea958 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Mon, 31 Jan 2022 13:49:31 +0000 Subject: [PATCH 2/2] Update share/ui/Minwaita-Inkscape.css --- share/ui/Minwaita-Inkscape.css | 134 +++++++++++++++------------------ 1 file changed, 61 insertions(+), 73 deletions(-) diff --git a/share/ui/Minwaita-Inkscape.css b/share/ui/Minwaita-Inkscape.css index eb388be193..b57c57f322 100644 --- a/share/ui/Minwaita-Inkscape.css +++ b/share/ui/Minwaita-Inkscape.css @@ -2,126 +2,126 @@ /* -* Keep as small as possible -*/ + * Keep as small as possible + */ toolbar toolbutton > button:disabled, toolbar toolbutton > button:backdrop:disabled, .toolbar toolbutton > button:disabled, .toolbar toolbutton > button:backdrop:disabled { - -gtk-icon-effect: dim; + -gtk-icon-effect: dim; } scrollbar { -margin: -1px; + margin: -1px; } filechooser #pathbarbox button { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #c4c4bf; - border-bottom-color: #a0a097; - background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); - text-shadow: 0 1px rgba(255, 255, 255, 0.769231); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); - box-shadow: inset 0 1px white; + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #c4c4bf; + border-bottom-color: #a0a097; + background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); + text-shadow: 0 1px rgba(255, 255, 255, 0.769231); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); + box-shadow: inset 0 1px white; } filechooser #pathbarbox button:hover { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #c4c4bf; - border-bottom-color: #a0a097; - text-shadow: 0 1px rgba(255, 255, 255, 0.769231); - -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); - box-shadow: inset 0 1px white; - background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #c4c4bf; + border-bottom-color: #a0a097; + text-shadow: 0 1px rgba(255, 255, 255, 0.769231); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); + box-shadow: inset 0 1px white; + background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); } filechooser #pathbarbox button:active { -color: #2e3436; -outline-color: rgba(46, 52, 54, 0.3); -border-color: #c4c4bf; -background-image: image(#e6e6e4); -box-shadow: inset 0 1px rgba(255, 255, 255, 0); -text-shadow: none; --gtk-icon-shadow: none; + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #c4c4bf; + background-image: image(#e6e6e4); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } filechooser #pathbarbox button:disabled { -border-color: #c4c4bf; -background-image: image(#f9f9f8); -text-shadow: none; --gtk-icon-shadow: none; -box-shadow: inset 0 1px rgba(255, 255, 255, 0); + border-color: #c4c4bf; + background-image: image(#f9f9f8); + text-shadow: none; + -gtk-icon-shadow: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } filechooser #pathbarbox button:disabled label, filechooser #pathbarbox button:disabled { -color: #313739; + color: #313739; } filechooser #pathbarbox button:backdrop { -border-color: #cecec9; -background-image: image(#f5f5f4); -text-shadow: none; --gtk-icon-shadow: none; -box-shadow: inset 0 1px rgba(255, 255, 255, 0); + border-color: #cecec9; + background-image: image(#f5f5f4); + text-shadow: none; + -gtk-icon-shadow: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } filechooser #pathbarbox button:backdrop label, filechooser #pathbarbox button:backdrop { -color: #313739; + color: #313739; } filechooser #pathbarbox button:backdrop:disabled { -border-color: #cecec9; -background-image: image(#f9f9f8); -text-shadow: none; --gtk-icon-shadow: none; -box-shadow: inset 0 1px rgba(255, 255, 255, 0); + border-color: #cecec9; + background-image: image(#f9f9f8); + text-shadow: none; + -gtk-icon-shadow: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0); } filechooser #pathbarbox button:backdrop:disabled label, filechooser #pathbarbox button:backdrop:disabled { -color: #566164; + color: #566164; } button.titlebutton { -color:inherit; -border-style: none; -background-position: center; -background-repeat: no-repeat; -background-image: -gtk-scaled(url("assets/window-buttons/titlebutton.png"), url("assets/window-buttons/titlebutton@2.png")); -text-shadow: none; --gtk-icon-shadow:none; + color:inherit; + border-style: none; + background-position: center; + background-repeat: no-repeat; + background-image: -gtk-scaled(url("assets/window-buttons/titlebutton.png"), url("assets/window-buttons/titlebutton@2.png")); + text-shadow: none; + -gtk-icon-shadow:none; } window.nautilus-desktop-window box.searchbar-container.vertical > searchbar, window.nautilus-desktop-window box.searchbar-container.vertical > searchbar:backdrop { -background-color: transparent; + background-color: transparent; } viewport.frame > list.tweak-categories label:backdrop { -color: #313739; + color: #313739; } .primary-toolbar button.raised { -margin: 0px; + margin: 0px; } scrolledwindow undershoot.top,scrolledwindow undershoot.bottom,scrolledwindow undershoot.left,scrolledwindow undershoot.right { - background-image: none; + background-image: none; } #AuxToolbox { -min-height:38px; + min-height:38px; } notebook notebook header label { - font-weight:normal; + font-weight:normal; } notebook notebook header image { - -gtk-icon-transform:scale(0.75); - margin:-1px 0 -1px -3px; + -gtk-icon-transform:scale(0.75); + margin:-1px 0 -1px -3px; } spinbutton button{ --gtk-icon-transform:scale(0.6) translatex(-0.6px); + -gtk-icon-transform:scale(0.6) translatex(-0.6px); margin:0 -0.6px 0 0; padding:0; } @@ -145,15 +145,3 @@ toolbutton button *{ margin:0; padding:0px; } - -.dark button.radio:checked,.dark button.toggle:checked,.dark button:hover{ - background-color:transparent; - background-image:image(linear-gradient(shade(@theme_fg_color,0.42), shade(@theme_fg_color,0.3))); - box-shadow:none; -} - -button.radio:checked,button.toggle:checked,button:hover{ - background-color:transparent; - background-image:image(linear-gradient(shade(@theme_bg_color,1), shade(@theme_bg_color,0.6))); - box-shadow:none; -} \ No newline at end of file -- GitLab