From 62cb17afd0cdc731b5ffd39d126380a8987c660b Mon Sep 17 00:00:00 2001 From: raveit65 Date: Mon, 11 May 2015 22:27:41 +0200 Subject: Menta Themes GTK3: fix vertical linked buttons + --> - remove button border from circular-button - fix background of GtkPrintUnixDialog --- .../BlueMenta/gtk-3.0/gtk-widgets-borders.css | 49 ++++++++------- desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css | 71 ++++++++++++++++++++-- 2 files changed, 93 insertions(+), 27 deletions(-) (limited to 'desktop-themes/BlueMenta/gtk-3.0') diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css index c33b9a79..4befce04 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css @@ -2,14 +2,16 @@ /* generic element borders */ .entry, -GtkComboBox.combobox-entry .entry, -GtkComboBox.combobox-entry .button, .button:active, .button:checked, +GtkComboBox.combobox-entry .entry, +GtkComboBox.combobox-entry .button, .spinbutton.vertical .button:active, -.inline-toolbar.toolbar.vertical .button:active, .spinbutton.vertical .button:checked, -.inline-toolbar.toolbar.vertical .button:checked { +.inline-toolbar.toolbar.vertical .button:active, +.inline-toolbar.toolbar.vertical .button:checked, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:active, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:checked { border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -24,12 +26,13 @@ GtkComboBox.combobox-entry .button, .entry:insensitive, -GtkComboBox.combobox-entry .entry:insensitive, -GtkComboBox.combobox-entry .button:insensitive, .button:active:insensitive, .spinbutton.vertical .button:insensitive, +GtkComboBox.combobox-entry .entry:insensitive, +GtkComboBox.combobox-entry .button:insensitive, .inline-toolbar.toolbar.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical .button.default:insensitive { +.inline-toolbar.toolbar.vertical .button.default:insensitive, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:insensitive { border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -40,10 +43,11 @@ GtkComboBox.combobox-entry .button:insensitive, .button:insensitive, .button.default:insensitive, .spinbutton.vertical .button:insensitive, +.inline-toolbar.toolbar .button:insensitive, +.inline-toolbar.toolbar .button.default:insensitive, .inline-toolbar.toolbar.vertical .button:insensitive, .inline-toolbar.toolbar.vertical .button.default:insensitive, -.inline-toolbar.toolbar .button.default:insensitive, -.inline-toolbar.toolbar .button:insensitive { +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:insensitive { border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -52,7 +56,7 @@ GtkComboBox.combobox-entry .button:insensitive, } .trough row { - border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; /* Zuki note: figure out what the heck it does */ + border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; border-radius: 4px; border-width: 1px; border-style: solid; @@ -61,19 +65,21 @@ GtkComboBox.combobox-entry .button:insensitive, /* focused element borders */ .entry:focus, -GtkComboBox.combobox-entry .button:focus, +.button:active:focus, +.button:checked:focus, .button.default:active, -.inline-toolbar.toolbar.vertical .button.default:active, .button.default:checked, -.inline-toolbar.toolbar.vertical .button.default:checked, -.button:active:focus, +GtkComboBox.combobox-entry .button:focus, .spinbutton.vertical .button:active:focus, -.inline-toolbar.toolbar.vertical .button:active:focus -.button:checked:focus, .spinbutton.vertical .button:checked:focus, .inline-toolbar.toolbar.vertical .button:active:focus, -.spinbutton.vertical .button:checked:focus, -.inline-toolbar.toolbar.vertical .button:checked:focus { +.inline-toolbar.toolbar.vertical .button:checked:focus +.inline-toolbar.toolbar.vertical .button.default:active, +.inline-toolbar.toolbar.vertical .button.default:checked, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:focus, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus { border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -82,9 +88,9 @@ GtkComboBox.combobox-entry .button:focus, } .titlebar .button:hover, -.titlebar .button:checked:checked, .titlebar .titlebutton:hover, -.titlebar .titlebutton:active { +.titlebar .titlebutton:active, +.titlebar .button:checked:checked { border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -103,7 +109,8 @@ GtkComboBox.combobox-entry .button:focus, } .spinbutton.vertical .button, -.inline-toolbar.toolbar.vertical .button { +.inline-toolbar.toolbar.vertical .button, +GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button { border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-radius: 4px; border-width: 2px; diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css index e39eca92..83390a91 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css @@ -1109,6 +1109,13 @@ GtkToggleButton.button { border-radius: 1px; } +.button.image-button.circular-button { + border-image: none; + border-width: 1px; + border-style: solid; + border-color: @borders; +} + /* We may want a background for focused buttons, but in the meantime let's remove it too */ .primary-toolbar .button, .primary-toolbar .button:insensitive, @@ -1387,6 +1394,16 @@ GtkToggleButton.button { } /* Middle button (vertical) */ +.linked.vertical > GtkComboBox > .button:last-child, +.linked.vertical > GtkComboBox > .button:focus:last-child, +.linked.vertical > GtkComboBox > .button:insensitive:last-child, +.linked.vertical > GtkComboBox > .button:active:last-child, +.linked.vertical > GtkComboBox > .button:focus:active:last-child, +.linked.vertical > GtkComboBox > .button:checked:last-child, +.linked.vertical > GtkComboBox > .button:focus:checked:last-child, +.linked.vertical > GtkComboBox > .button:hover:last-child, +.linked.vertical > GtkComboBox > .button:active:hover:last-child, +.linked.vertical > GtkComboBox > .button:checked:hover:last-child, .linked.vertical .entry, .linked.vertical .button, .linked.vertical .button:active, @@ -1394,13 +1411,25 @@ GtkToggleButton.button { .linked.vertical .button:checked, .linked.vertical .button:checked:hover, .linked.vertical .button:insensitive { - border-top-width: 0; - border-bottom-width: 0; + border-top-width: 0px; + border-bottom-width: 0px; + border-right-width: 1px; + border-left-width: 1px; border-image-width: 0 4px; border-radius: 0; } /* Top button (vertical) */ +.linked.vertical > GtkComboBox:first-child > .button:last-child, +.linked.vertical > GtkComboBox:first-child > .button:focus:last-child, +.linked.vertical > GtkComboBox:first-child > .button:insensitive:last-child, +.linked.vertical > GtkComboBox:first-child > .button:active:last-child, +.linked.vertical > GtkComboBox:first-child > .button:focus:active:last-child, +.linked.vertical > GtkComboBox:first-child > .button:checked:first-child:last-child, +.linked.vertical > GtkComboBox:first-child > .button:focus:checked:first-child:last-child, +.linked.vertical > GtkComboBox:first-child > .button:hover:first-child:last-child, +.linked.vertical > GtkComboBox:first-child > .button:active:hover:last-child, +.linked.vertical > GtkComboBox:first-child > .button:checked:hover:last-child, .linked.vertical .entry:first-child, .linked.vertical .button:first-child, .linked.vertical .button:active:first-child, @@ -1408,12 +1437,25 @@ GtkToggleButton.button { .linked.vertical .button:checked:first-child, .linked.vertical .button:checked:hover:first-child, .linked.vertical .button:insensitive:first-child { - border-bottom-width: 0; + border-bottom-width: 0px; + border-top-width: 1px; + border-right-width: 1px; + border-left-width: 1px; border-image-width: 3px 4px 0 4px; border-radius: 4px 4px 0 0; } /* Bottom button (vertical) */ +.linked.vertical > GtkComboBox:last-child > .button, +.linked.vertical > GtkComboBox:last-child > .button:last-child, +.linked.vertical > GtkComboBox:last-child > .button:insensitive:last-child, +.linked.vertical > GtkComboBox:last-child > .button:active:last-child, +.linked.vertical > GtkComboBox:last-child > .button:focus:active:last-child, +.linked.vertical > GtkComboBox:last-child > .button:checked:last-child, +.linked.vertical > GtkComboBox:last-child > .button:focus:checked:last-child, +.linked.vertical > GtkComboBox:last-child > .button:hover:last-child, +.linked.vertical > GtkComboBox:last-child > .button:active:hover:last-child, +.linked.vertical > GtkComboBox:last-child > .button:checked:hover:last-child, .linked.vertical .entry:last-child, .linked.vertical .button:last-child, .linked.vertical .button:active:last-child, @@ -1421,12 +1463,25 @@ GtkToggleButton.button { .linked.vertical .button:checked:last-child, .linked.vertical .button:checked:hover:last-child, .linked.vertical .button:insensitive:last-child { - border-top-width: 0; + border-top-width: 0px; + border-bottom-width: 1px; + border-right-width: 1px; + border-left-width: 1px; border-image-width: 0 4px 4px 4px; border-radius: 0 0 4px 4px; } /* Linked single button (vertical) */ +.linked.vertical > GtkComboBox:only-child > .button, +.linked.vertical > GtkComboBox:only-child > .button:only-child, +.linked.vertical > GtkComboBox:only-child > .button:insensitive:only-child, +.linked.vertical > GtkComboBox:only-child > .button:hover:only-child, +.linked.vertical > GtkComboBox:only-child > .button:active:only-child, +.linked.vertical > GtkComboBox:only-child > .button:active:hover:only-child, +.linked.vertical > GtkComboBox:only-child > .button:focus:active:only-child, +.linked.vertical > GtkComboBox:only-child > .button:checked:only-child, +.linked.vertical > GtkComboBox:only-child > .button:checked:hover:only-child, +.linked.vertical > GtkComboBox:only-child > .button:focus:checked:only-child, .linked.vertical .entry:only-child, .linked.vertical .button:only-child, .linked.vertical .button:active:only-child, @@ -1434,8 +1489,7 @@ GtkToggleButton.button { .linked.vertical .button:checked:only-child, .linked.vertical .button:checked:hover:only-child, .linked.vertical .button:insensitive:only-child { - border-top-width: 1px; - border-bottom-width: 1px; + border-width: 1px; border-image-width: 3px 4px 4px 4px; border-radius: 4px; } @@ -4619,6 +4673,11 @@ GtkModelButton.button.flat:selected { box-shadow: 0 1px 5px @wm_shadow; } +/* print dialog */ +GtkPrintUnixDialog.background .vertical.view.dialog-vbox { + background-color: shade (@theme_bg_color, 1.1) +} + /* Various hacks and shit */ /* FIXME - BELOW: Some stuff that can probably be done better or in another way */ -- cgit v1.2.1