From 01c361de88e433c5a4b07bf56f3274b6004e3be0 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Mon, 29 Sep 2014 09:55:25 +0200 Subject: Update to 6.0.1 --HG-- branch : debian --- debian/changelog | 8 + debian/docs | 4 +- debian/img/menuitem-checkbox-hover.png | Bin 156 -> 0 bytes debian/img/menuitem-checkbox-insensitive.png | Bin 157 -> 0 bytes debian/img/menuitem-checkbox-mixed-insensitive.png | Bin 185 -> 0 bytes debian/img/menuitem-checkbox-mixed.png | Bin 170 -> 0 bytes debian/img/menuitem-checkbox.png | Bin 155 -> 0 bytes debian/img/menuitem-radio-checked-hover.png | Bin 413 -> 0 bytes debian/img/menuitem-radio-insensitive.png | Bin 350 -> 0 bytes debian/img/menuitem-radio.png | Bin 338 -> 0 bytes debian/install | 1 - debian/patches/gtk-3.14-fixes.patch | 689 --------------------- debian/patches/series | 1 - 13 files changed, 10 insertions(+), 693 deletions(-) delete mode 100644 debian/img/menuitem-checkbox-hover.png delete mode 100644 debian/img/menuitem-checkbox-insensitive.png delete mode 100644 debian/img/menuitem-checkbox-mixed-insensitive.png delete mode 100644 debian/img/menuitem-checkbox-mixed.png delete mode 100644 debian/img/menuitem-checkbox.png delete mode 100644 debian/img/menuitem-radio-checked-hover.png delete mode 100644 debian/img/menuitem-radio-insensitive.png delete mode 100644 debian/img/menuitem-radio.png delete mode 100644 debian/patches/gtk-3.14-fixes.patch delete mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b53463e..ef0f67b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +clearlooks-phenix-theme (6.0.1-1) unstable; urgency=medium + + * New upstream release. + * Drop obsolete patches. + * Fix watch file. + + -- Andrew Shadura Mon, 29 Sep 2014 09:54:59 +0200 + clearlooks-phenix-theme (5.0.2-2) unstable; urgency=medium * Fixes for GTK+ 3.14. diff --git a/debian/docs b/debian/docs index fa2b682..324c10f 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,3 @@ -doc/README.mkd -doc/LISEZ-MOI.mkd +README.md +LISEZ-MOI.md doc/*.png diff --git a/debian/img/menuitem-checkbox-hover.png b/debian/img/menuitem-checkbox-hover.png deleted file mode 100644 index 4d8125b..0000000 Binary files a/debian/img/menuitem-checkbox-hover.png and /dev/null differ diff --git a/debian/img/menuitem-checkbox-insensitive.png b/debian/img/menuitem-checkbox-insensitive.png deleted file mode 100644 index 7129b2d..0000000 Binary files a/debian/img/menuitem-checkbox-insensitive.png and /dev/null differ diff --git a/debian/img/menuitem-checkbox-mixed-insensitive.png b/debian/img/menuitem-checkbox-mixed-insensitive.png deleted file mode 100644 index ec51e4e..0000000 Binary files a/debian/img/menuitem-checkbox-mixed-insensitive.png and /dev/null differ diff --git a/debian/img/menuitem-checkbox-mixed.png b/debian/img/menuitem-checkbox-mixed.png deleted file mode 100644 index a7b45a4..0000000 Binary files a/debian/img/menuitem-checkbox-mixed.png and /dev/null differ diff --git a/debian/img/menuitem-checkbox.png b/debian/img/menuitem-checkbox.png deleted file mode 100644 index f7acdd5..0000000 Binary files a/debian/img/menuitem-checkbox.png and /dev/null differ diff --git a/debian/img/menuitem-radio-checked-hover.png b/debian/img/menuitem-radio-checked-hover.png deleted file mode 100644 index 59b61ee..0000000 Binary files a/debian/img/menuitem-radio-checked-hover.png and /dev/null differ diff --git a/debian/img/menuitem-radio-insensitive.png b/debian/img/menuitem-radio-insensitive.png deleted file mode 100644 index 0615692..0000000 Binary files a/debian/img/menuitem-radio-insensitive.png and /dev/null differ diff --git a/debian/img/menuitem-radio.png b/debian/img/menuitem-radio.png deleted file mode 100644 index 1f588e9..0000000 Binary files a/debian/img/menuitem-radio.png and /dev/null differ diff --git a/debian/install b/debian/install index 3dbc4b6..6b4bf2a 100644 --- a/debian/install +++ b/debian/install @@ -4,4 +4,3 @@ index.theme /usr/share/themes/Clearlooks-Phenix metacity-1 /usr/share/themes/Clearlooks-Phenix openbox-3 /usr/share/themes/Clearlooks-Phenix xfwm4 /usr/share/themes/Clearlooks-Phenix -debian/img /usr/share/themes/Clearlooks-Phenix/gtk-3.0 diff --git a/debian/patches/gtk-3.14-fixes.patch b/debian/patches/gtk-3.14-fixes.patch deleted file mode 100644 index 44166a9..0000000 --- a/debian/patches/gtk-3.14-fixes.patch +++ /dev/null @@ -1,689 +0,0 @@ -diff --git a/gtk-3.0/gtk-widgets-img.css b/gtk-3.0/gtk-widgets-img.css ---- a/gtk-3.0/gtk-widgets-img.css -+++ b/gtk-3.0/gtk-widgets-img.css -@@ -94,109 +94,127 @@ GtkSwitch.slider:insensitive { - .check, - .check row:selected, - .check row:selected:focus { -- background-image: url("img/checkbox-unchecked.png"); -+ -gtk-icon-source: url("img/checkbox-unchecked.png"); - } - - .check:hover, - .check row:selected:hover, - .check row:selected:focus:hover { -- background-image: url("img/checkbox-unchecked-hover.png"); -+ -gtk-icon-source: url("img/checkbox-unchecked-hover.png"); - } - - .check:insensitive, - .check row:selected:insensitive, - .check row:selected:focus:insensitive { -- background-image: url("img/checkbox-unchecked-insensitive.png"); -+ -gtk-icon-source: url("img/checkbox-unchecked-insensitive.png"); - } - -+.check:checked, -+.check row:selected:checked, -+.check row:selected:focus:checked, - .check:active, - .check row:selected:active, - .check row:selected:focus:active { -- background-image: url("img/checkbox-checked.png"); -+ -gtk-icon-source: url("img/checkbox-checked.png"); - } - -+.check:checked:hover, -+.check row:selected:checked:hover, -+.check row:selected:focus:checked:hover, - .check:active:hover, - .check row:selected:active:hover, - .check row:selected:focus:active:hover { -- background-image: url("img/checkbox-checked-hover.png"); -+ -gtk-icon-source: url("img/checkbox-checked-hover.png"); - } - -+.check:checked:insensitive, -+.check row:selected:checked:insensitive, -+.check row:selected:focus:checked:insensitive, - .check:active:insensitive, - .check row:selected:active:insensitive, - .check row:selected:focus:active:insensitive { -- background-image: url("img/checkbox-checked-insensitive.png"); -+ -gtk-icon-source: url("img/checkbox-checked-insensitive.png"); - } - - .check:inconsistent, - .check row:selected:inconsistent, - .check row:selected:focus:inconsistent { -- background-image: url("img/checkbox-mixed.png"); -+ -gtk-icon-source: url("img/checkbox-mixed.png"); - } - - .check:inconsistent:hover, - .check row:selected:inconsistent:hover, - .check row:selected:focus:inconsistent:hover { -- background-image: url("img/checkbox-mixed-hover.png"); -+ -gtk-icon-source: url("img/checkbox-mixed-hover.png"); - } - - .check:inconsistent:insensitive, - .check row:selected:inconsistent:insensitive, - .check row:selected:focus:inconsistent:insensitive { -- background-image: url("img/checkbox-mixed-insensitive.png"); -+ -gtk-icon-source: url("img/checkbox-mixed-insensitive.png"); - } - - .radio, - .radio row:selected, - .radio row:selected:focus { -- background-image: url("img/radio-unchecked.png"); -+ -gtk-icon-source: url("img/radio-unchecked.png"); - } - - .radio:hover, - .radio row:selected:hover, - .radio row:selected:focus:hover { -- background-image: url("img/radio-unchecked-hover.png"); -+ -gtk-icon-source: url("img/radio-unchecked-hover.png"); - } - - .radio:insensitive, - .radio row:selected:insensitive, - .radio row:selected:focus:insensitive { -- background-image: url("img/radio-unchecked-insensitive.png"); -+ -gtk-icon-source: url("img/radio-unchecked-insensitive.png"); - } - -+.radio:checked, -+.radio row:selected:checked, -+.radio row:selected:focus:checked, - .radio:active, - .radio row:selected:active, - .radio row:selected:focus:active { -- background-image: url("img/radio-checked.png"); -+ -gtk-icon-source: url("img/radio-checked.png"); - } - -+.radio:checked:hover, -+.radio row:selected:checked:hover, -+.radio row:selected:focus:checked:hover, - .radio:active:hover, - .radio row:selected:active:hover, - .radio row:selected:focus:active:hover { -- background-image: url("img/radio-checked-hover.png"); -+ -gtk-icon-source: url("img/radio-checked-hover.png"); - } - -+.radio:checked:insensitive, -+.radio row:selected:checked:insensitive, -+.radio row:selected:focus:checked:insensitive, - .radio:active:insensitive, - .radio row:selected:active:insensitive, - .radio row:selected:focus:active:insensitive { -- background-image: url("img/radio-checked-insensitive.png"); -+ -gtk-icon-source: url("img/radio-checked-insensitive.png"); - } - - .radio:inconsistent, - .radio row:selected:inconsistent, - .radio row:selected:focus:inconsistent { -- background-image: url("img/radio-mixed.png"); -+ -gtk-icon-source: url("img/radio-mixed.png"); - } - - .radio:inconsistent:hover, - .radio row:selected:inconsistent:hover, - .radio row:selected:focus:inconsistent:hover { -- background-image: url("img/radio-mixed-hover.png"); -+ -gtk-icon-source: url("img/radio-mixed-hover.png"); - } - - .radio:inconsistent:insensitive, - .radio row:selected:inconsistent:insensitive, - .radio row:selected:focus:inconsistent:insensitive { -- background-image: url("img/radio-mixed-insensitive.png"); -+ -gtk-icon-source: url("img/radio-mixed-insensitive.png"); - } - - /********************* -@@ -283,81 +301,72 @@ GtkScale.scale-has-marks-below.slider.ve - *********/ - - .menu .menuitem.check { -- background-image: url("img/menuitem-checkbox.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox.png"); - } - - .menu .menuitem.check:hover { -- background-image: url("img/menuitem-checkbox-hover.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-hover.png"); - } - - .menu .menuitem.check:insensitive { -- background-image: url("img/menuitem-checkbox-insensitive.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-insensitive.png"); - } - -+.menu .menuitem.check:checked, - .menu .menuitem.check:active { -- background-image: url("img/menuitem-checkbox-checked.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-checked.png"); - } - -+.menu .menuitem.check:checked:hover, - .menu .menuitem.check:active:hover { -- background-image: url("img/menuitem-checkbox-checked-hover.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png"); - } - -+.menu .menuitem.check:checked:insensitive, - .menu .menuitem.check:active:insensitive { -- background-image: url("img/menuitem-checkbox-checked-insensitive.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png"); - } - - .menu .menuitem.check:inconsistent, - .menu .menuitem.radio:inconsistent { -- background-image: url("img/menuitem-checkbox-mixed.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-mixed.png"); - } - - .menu .menuitem.check:inconsistent:hover, - .menu .menuitem.radio:inconsistent:hover { -- background-image: url("img/menuitem-checkbox-mixed-hover.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png"); - } - - .menu .menuitem.check:inconsistent:insensitive, - .menu .menuitem.radio:inconsistent:insensitive { -- background-image: url("img/menuitem-checkbox-mixed-insensitive.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png"); - } - - .menu .menuitem.radio { -- background-image: url("img/menuitem-radio.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-radio.png"); - } - - .menu .menuitem.radio:hover { -- background-image: url("img/menuitem-radio-hover.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-radio-hover.png"); - } - - .menu .menuitem.radio:insensitive { -- background-image: url("img/menuitem-radio-insensitive.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-radio-insensitive.png"); - } - -+.menu .menuitem.radio:checked, - .menu .menuitem.radio:active { -- background-image: url("img/menuitem-radio-checked.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-radio-checked.png"); - } - -+.menu .menuitem.radio:checked:hover, - .menu .menuitem.radio:active:hover { -- background-image: url("img/menuitem-radio-checked-hover.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-radio-checked-hover.png"); - } - -+.menu .menuitem.radio:checked:insensitive, - .menu .menuitem.radio:active:insensitive { -- background-image: url("img/menuitem-radio-checked-insensitive.png"); -- background-repeat: no-repeat; -+ -gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png"); - } - - /********* -@@ -378,22 +387,26 @@ GtkScale.scale-has-marks-below.slider.ve - - /* generic element borders */ - .entry, --GtkComboBox.combobox-entry .entry, --GtkComboBox.combobox-entry .button, -+.combobox-entry .entry, -+.combobox-entry .button, - .button:active, - .trough, - .trough.highlight, - GtkSwitch.trough, - /* generic button borders */ - .button, -+.button.flat:active, -+.button.flat:hover, -+.menu-button:active, - .titlebar .titlebutton:hover, -+.primary-toolbar .button:checked, - .primary-toolbar .button.raised, - .primary-toolbar .raised .button, - .primary-toolbar GtkComboBox .button, - /* primary toolbar - generic element borders */ - .primary-toolbar .entry, --.primary-toolbar GtkComboBox.combobox-entry .entry, --.primary-toolbar GtkComboBox.combobox-entry .button, -+.primary-toolbar .combobox-entry .entry, -+.primary-toolbar .combobox-entry .button, - .primary-toolbar .button:active, - .primary-toolbar .button.raised:active, - .primary-toolbar .raised .button:active, -@@ -413,40 +426,16 @@ GtkSwitch.trough, - } - - .primary-toolbar .entry, --.primary-toolbar GtkComboBox.combobox-entry .entry { -+.primary-toolbar .combobox-entry .entry { - border-width: 1px 2px 2px; - } - - .primary-toolbar .entry:focus, --.primary-toolbar GtkComboBox.combobox-entry .entry:focus { -+.primary-toolbar .combobox-entry .entry:focus { - border-width: 1px 2px 2px; - } - - /* linked buttons */ --/* Middle button */ --.linked .entry, --.linked .button, --.linked .button:active, --.linked .button:active:hover, --.linked .button:focus, --.linked .button:focus:active, --.linked .button:insensitive, --/* Leftmost button */ --.linked .entry:first-child, --.linked .button:first-child, --.linked .button:active:first-child, --.linked .button:active:hover:first-child, --.linked .button:focus:first-child, --.linked .button:focus:active:first-child, --.linked .button:insensitive:first-child, --/* Rightmost button */ --.linked .entry:last-child, --.linked .button:last-child, --.linked .button:active:last-child, --.linked .button:active:hover:last-child, --.linked .button:focus:last-child, --.linked .button:focus:active:last-child, --.linked .button:insensitive:last-child, - /* Linked single button */ - .linked .entry:only-child, - .linked .button:only-child, -@@ -571,8 +560,8 @@ GtkSwitch.trough, - - /* generic insensitive element borders */ - GtkSwitch.trough:insensitive, --GtkComboBox.combobox-entry .entry:insensitive, --GtkComboBox.combobox-entry .button:insensitive, -+.combobox-entry .entry:insensitive, -+.combobox-entry .button:insensitive, - .entry:insensitive, - .button:insensitive, - .trough row { -@@ -583,19 +572,28 @@ GtkComboBox.combobox-entry .button:insen - border-color: transparent; - } - -+.menuitem.button.flat, -+.menuitem.button.flat:active, -+.button.flat, -+.button.flat:insensitive { -+ border-image: none; -+ background-image: none; -+} -+ - /* focused element borders */ - .entry:focus, --GtkComboBox.combobox-entry .entry:focus, -+.combobox-entry .entry:focus, -+.button.flat:focus:active, - .button:focus:active, - .button.default:active, - /* focused button borders */ --.button:focus, -+.button.flat:focus, - .button.default, - .primary-toolbar .entry:focus, - .primary-toolbar .button:active:focus, - .primary-toolbar .button:focus:hover, --.primary-toolbar GtkComboBox.combobox-entry .entry:focus, --.primary-toolbar GtkComboBox.combobox-entry .button:focus, -+.primary-toolbar .combobox-entry .entry:focus, -+.primary-toolbar .combobox-entry .button:focus, - .primary-toolbar .button.raised:focus:active, - .primary-toolbar .raised .button:focus:active, - .primary-toolbar .button.raised.default:active, -@@ -664,3 +662,62 @@ column-header:last-child .button:active: - border-right: none; - } - -+/* Leftmost button */ -+.linked .entry:first-child, -+.linked > GtkComboBox:first-child > .button:last-child, -+.linked > GtkComboBox:first-child > .button:active:last-child, -+.linked > GtkComboBox:first-child > .button:active:hover:last-child, -+.linked > GtkComboBox:first-child > .button:focus:last-child, -+.linked > GtkComboBox:first-child > .button:focus:active:last-child, -+.linked > GtkComboBox:first-child > .button:insensitive:last-child, -+.linked .button:first-child, -+.linked .button:active:first-child, -+.linked .button:active:hover:first-child, -+.linked .button:focus:first-child, -+.linked .button:focus:active:first-child, -+.linked .button:insensitive:first-child { -+ border-image: none; -+ border-radius: 3px 0 0 3px; -+ border-color: @border_color; -+ border-width: 1px; -+ padding: 1px 2px; -+} -+ -+/* Middle button */ -+.linked .entry, -+.linked > GtkComboBox > .button:last-child, -+.linked > GtkComboBox > .button:active:last-child, -+.linked > GtkComboBox > .button:active:hover:last-child, -+.linked > GtkComboBox > .button:focus:last-child, -+.linked > GtkComboBox > .button:focus:active:last-child, -+.linked > GtkComboBox > .button:insensitive:last-child, -+.linked .button, -+.linked .button:active, -+.linked .button:active:hover, -+.linked .button:focus, -+.linked .button:focus:active, -+.linked .button:insensitive { -+ border-image: none; -+ border-radius: 0; -+ border-color: @border_color; -+ border-width: 1px 0; -+ padding: 1px 2px; -+} -+ -+/* Rightmost button */ -+.linked .entry:last-child, -+.linked > GtkComboBox:last-child > .button, -+.linked > GtkComboBox:last-child > .button:last-child, -+.linked .button:last-child, -+.linked .button:active:last-child, -+.linked .button:active:hover:last-child, -+.linked .button:focus:last-child, -+.linked .button:focus:active:last-child, -+.linked .button:insensitive:last-child { -+ border-image: none; -+ border-radius: 0 3px 3px 0; -+ border-color: @border_color; -+ border-width: 1px; -+ padding: 1px 2px; -+} -+ -diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css ---- a/gtk-3.0/gtk-widgets.css -+++ b/gtk-3.0/gtk-widgets.css -@@ -11,7 +11,7 @@ - -GtkPaned-handle-size: 5; - - -GtkCheckButton-indicator-size: 16; -- -GtkCheckMenuItem-indicator-size: 12; -+ -GtkCheckMenuItem-indicator-size: 10; - - -GtkScrolledWindow-scrollbar-spacing: 3; - -GtkScrolledWindow-scrollbars-within-bevel: 0; -@@ -39,11 +39,8 @@ - * Base States * - ***************/ - --GtkWindow { -+.background { - color: @theme_fg_color; --} -- --* { - background-color: @theme_bg_color; - } - -@@ -92,8 +89,23 @@ GtkGrid:insensitive { - * Miscellaneous * - *****************/ - -+@keyframes spin { -+ to { -+ -gtk-icon-transform: rotate(1turn); -+ } -+} -+.spinner { -+ background-image: none; -+ background-color: blue; -+ opacity: 0; -+ -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); -+} - .spinner:active { -- transition: 750ms linear loop; -+ opacity: 1; -+ animation: spin 1s linear infinite; -+} -+.spinner:active:insensitive { -+ opacity: 0.5; - } - - .floating-bar { -@@ -444,8 +456,8 @@ GtkScrolledWindow GtkViewport.frame { - - .button, - .button.menuitem.menubar, --GtkComboBox.combobox-entry .button { -- padding: 1px 4px; -+.combobox-entry .button { -+ padding: 5px 8px 6px; - } - - .button { -@@ -480,7 +492,9 @@ GtkMenuToolButton *, - - .primary-toolbar .button *:active, - .inline-toolbar .button *:active, --.button *:active { -+.button *:active, -+.button *:active:focus, -+.button *:focus { - color: @button_active_text_color; - } - -@@ -543,8 +557,8 @@ GtkMenuToolButton *, - .toolbar .raised .button:focus, - .toolbar GtkComboBox .button, - .toolbar GtkComboBox .button:focus, --GtkComboBox.combobox-entry .button, --.primary-toolbar GtkComboBox.combobox-entry .button, -+.combobox-entry .button, -+.primary-toolbar .combobox-entry .button, - .titlebar .titlebutton:hover, - GtkColorChooserWidget #add-color-button { - background-image: -gtk-gradient (linear, -@@ -558,8 +572,11 @@ GtkColorChooserWidget #add-color-button - } - - /* Pushed button background */ -+.button:checked, -+.button:checked:hover, - .button:active, - .button:active:hover, -+.menuitem.button:hover, - .spinbutton .button:active, - .spinbutton .button:active:hover, - .toolbar .button:active, -@@ -568,8 +585,8 @@ GtkColorChooserWidget #add-color-button - .toolbar .raised .button:active, - .toolbar .button.raised:active:hover, - .toolbar .raised .button:active:hover, --.primary-toolbar GtkComboBox.combobox-entry .button:active, --GtkComboBox.combobox-entry .button:active, -+.primary-toolbar .combobox-entry .button:active, -+.combobox-entry .button:active, - .primary-toolbar .button:active, - .primary-toolbar .button:active:hover, - .primary-toolbar .button:focus:active, -@@ -610,8 +627,8 @@ GtkComboBox.combobox-entry .button:activ - .toolbar .raised .button:hover, - .toolbar GtkComboBox .button:hover, - .primary-toolbar .button:hover, --GtkComboBox.combobox-entry .button:hover, --.primary-toolbar GtkComboBox.combobox-entry .button:hover, -+.combobox-entry .button:hover, -+.primary-toolbar .combobox-entry .button:hover, - GtkColorChooserWidget #add-color-button:hover { - background-color: transparent; - background-image: linear-gradient(to bottom, -@@ -623,7 +640,7 @@ GtkColorChooserWidget #add-color-button: - /* Insensitive button background */ - .button:insensitive, - .toolbar GtkComboBox .button:insensitive, --GtkComboBox.combobox-entry .button:insensitive { -+.combobox-entry .button:insensitive { - background-image: linear-gradient(to bottom, - @button_insensitive_inner_border_color 1px, - @button_insensitive_gradient_a 2px, -@@ -672,9 +689,6 @@ GtkComboBox.combobox-entry .button:insen - - .notebook { - padding: 0; -- border-color: @border_color; -- border-style: solid; -- border-width: 1px; - background-clip: border-box; - background-color: @notebook_bg_color; - -GtkNotebook-tab-overlap: 2; -@@ -682,13 +696,18 @@ GtkComboBox.combobox-entry .button:insen - -GtkNotebook-initial-gap: 0; - } - -+.notebook.header.frame { -+ border-width: 0; -+} -+ - .notebook GtkViewport { -- background-color: @theme_base_color; -+ background-color: @theme_bg_color; - } - - .notebook tab { - padding: 3px; - border-radius: 3px; -+ border-color: @border_color; - border-style: solid; - border-width: 1px; - background-color: transparent; -@@ -841,40 +860,40 @@ GtkComboBox .separator { - -GtkWidget-vertical-separator: 0; - } - --GtkComboBox.combobox-entry .entry:first-child, --GtkComboBox.combobox-entry .button:first-child { -+.combobox-entry .entry:first-child, -+.combobox-entry .button:first-child { - border-image-width: 3px 0 4px 3px; - border-radius: 3px 0 0 3px; - border-right-width: 0; - } - --GtkComboBox.combobox-entry .entry:last-child, --GtkComboBox.combobox-entry .button:last-child { -+.combobox-entry .entry:last-child, -+.combobox-entry .button:last-child { - border-image-width: 3px 3px 4px 0; - border-radius: 0 3px 3px 0; - border-left-width: 0; - } - --GtkComboBox.combobox-entry .button:last-child { -+.combobox-entry .button:last-child { - border-image-width: 3px 3px 4px 2px; - } - --.primary-toolbar GtkComboBox.combobox-entry .entry:first-child, --.primary-toolbar GtkComboBox.combobox-entry .button:first-child { -+.primary-toolbar .combobox-entry .entry:first-child, -+.primary-toolbar .combobox-entry .button:first-child { - border-image-width: 4px 0 4px 4px; - border-radius: 3px 0 0 3px; - border-right-width: 0; - } - --.primary-toolbar GtkComboBox.combobox-entry .entry:last-child, --.primary-toolbar GtkComboBox.combobox-entry .button:last-child { -+.primary-toolbar .combobox-entry .entry:last-child, -+.primary-toolbar .combobox-entry .button:last-child { - border-image-width: 4px 4px 4px 0; - border-radius: 0 3px 3px 0; - border-left-width: 0; - } - --GtkComboBox.combobox-entry .button *:active, --GtkComboBox.combobox-entry .button *:active:hover { -+.combobox-entry .button *:active, -+.combobox-entry .button *:active:hover { - color: @theme_text_color; - } - -@@ -1022,7 +1041,7 @@ GtkComboBox .button *:hover { - .scrollbar.button:insensitive { - color: @scrollbar_button_insensitive_color; - } -- -+/* - .scrollbar.button.top:insensitive { - border-bottom: none; - } -@@ -1038,6 +1057,7 @@ GtkComboBox .button *:hover { - .scrollbar.button.right:insensitive { - border-left: none; - } -+*/ - - .scrollbar.slider { - background-color: @scrollbar_slider_bg_color; -@@ -1167,6 +1187,7 @@ GtkTreeMenu .menuitem:hover, - } - - GtkTreeMenu .menuitem *:hover, -+GtkComboBox .menuitem:hover *, - .menu .menuitem:active, - .menu .menuitem *:active, - .menu .menuitem:hover, -@@ -1796,10 +1817,13 @@ GtkInfoBar:last-child, - font: Bold; - } - -+.titlebar :first-child { -+ padding: 5px 5px 6px 5px; -+} -+ - .titlebar .titlebutton { - background: none; - border-image: none; -- padding: 5px 5px 6px 5px; - } - - .window-frame { -@@ -1817,6 +1841,7 @@ GtkPopover { - border: 1px solid; - border-radius: 7px; - border-color: @border_color; -+ background-color: @theme_bg_color; - background-clip: border-box; - } - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b2f8db1..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -gtk-3.14-fixes.patch -- cgit v1.2.3