Merge https://github.com/cldx/numix-gtk-theme

Conflicts: gtk-3.0/apps/granite-widgets.css gtk-3.0/gtk-widgets.css gtk-3.0/settings.ini
2013-03-02 13:42:52 +01:00 · 2013-03-02 13:42:52 +01:00 · 8a1f39dc1f
parent b92d35ee36 d2566a7a46
commit 8a1f39dc1f
272 changed files with 876 additions and 5576 deletions
--- a/gtk-2.0/Arrows/arrow-down-insens.png
+++ b/gtk-2.0/Arrows/arrow-down-insens.png
--- a/gtk-2.0/Arrows/arrow-down-prelight.png
+++ b/gtk-2.0/Arrows/arrow-down-prelight.png
--- a/gtk-2.0/Arrows/arrow-down-pressed.png
+++ b/gtk-2.0/Arrows/arrow-down-pressed.png
--- a/gtk-2.0/Arrows/arrow-down.png
+++ b/gtk-2.0/Arrows/arrow-down.png
--- a/gtk-2.0/Arrows/arrow-left-active.png
+++ b/gtk-2.0/Arrows/arrow-left-active.png
--- a/gtk-2.0/Arrows/arrow-left-insensitive.png
+++ b/gtk-2.0/Arrows/arrow-left-insensitive.png
--- a/gtk-2.0/Arrows/arrow-left-prelight.png
+++ b/gtk-2.0/Arrows/arrow-left-prelight.png
--- a/gtk-2.0/Arrows/arrow-left.png
+++ b/gtk-2.0/Arrows/arrow-left.png
--- a/gtk-2.0/Arrows/arrow-right-active.png
+++ b/gtk-2.0/Arrows/arrow-right-active.png
--- a/gtk-2.0/Arrows/arrow-right-insensitive.png
+++ b/gtk-2.0/Arrows/arrow-right-insensitive.png
--- a/gtk-2.0/Arrows/arrow-right-prelight.png
+++ b/gtk-2.0/Arrows/arrow-right-prelight.png
--- a/gtk-2.0/Arrows/arrow-right.png
+++ b/gtk-2.0/Arrows/arrow-right.png
--- a/gtk-2.0/Arrows/arrow-up-active.png
+++ b/gtk-2.0/Arrows/arrow-up-active.png
--- a/gtk-2.0/Arrows/arrow-up-insensitive.png
+++ b/gtk-2.0/Arrows/arrow-up-insensitive.png
--- a/gtk-2.0/Arrows/arrow-up-prelight.png
+++ b/gtk-2.0/Arrows/arrow-up-prelight.png
--- a/gtk-2.0/Arrows/arrow-up.png
+++ b/gtk-2.0/Arrows/arrow-up.png
--- a/gtk-2.0/Buttons/button-default.png
+++ b/gtk-2.0/Buttons/button-default.png
--- a/gtk-2.0/Buttons/button-insensitive.png
+++ b/gtk-2.0/Buttons/button-insensitive.png
--- a/gtk-2.0/Buttons/button-normal.png
+++ b/gtk-2.0/Buttons/button-normal.png
--- a/gtk-2.0/Buttons/button-prelight.png
+++ b/gtk-2.0/Buttons/button-prelight.png
--- a/gtk-2.0/Buttons/button-pressed.png
+++ b/gtk-2.0/Buttons/button-pressed.png
--- a/gtk-2.0/Check-Radio/check1.png
+++ b/gtk-2.0/Check-Radio/check1.png
--- a/gtk-2.0/Check-Radio/check2.png
+++ b/gtk-2.0/Check-Radio/check2.png
--- a/gtk-2.0/Check-Radio/check3.png
+++ b/gtk-2.0/Check-Radio/check3.png
--- a/gtk-2.0/Check-Radio/check4.png
+++ b/gtk-2.0/Check-Radio/check4.png
--- a/gtk-2.0/Check-Radio/checklight.png
+++ b/gtk-2.0/Check-Radio/checklight.png
--- a/gtk-2.0/Check-Radio/highlight.png
+++ b/gtk-2.0/Check-Radio/highlight.png
--- a/gtk-2.0/Check-Radio/menuitem-checkbox-insensitive.png
+++ b/gtk-2.0/Check-Radio/menuitem-checkbox-insensitive.png
--- a/gtk-2.0/Check-Radio/menuitem-checkbox-selected.png
+++ b/gtk-2.0/Check-Radio/menuitem-checkbox-selected.png
--- a/gtk-2.0/Check-Radio/menuitem-checkbox.png
+++ b/gtk-2.0/Check-Radio/menuitem-checkbox.png
--- a/gtk-2.0/Check-Radio/menuitem-radio-checked-insensitive.png
+++ b/gtk-2.0/Check-Radio/menuitem-radio-checked-insensitive.png
--- a/gtk-2.0/Check-Radio/menuitem-radio-checked-selected.png
+++ b/gtk-2.0/Check-Radio/menuitem-radio-checked-selected.png
--- a/gtk-2.0/Check-Radio/menuitem-radio-checked.png
+++ b/gtk-2.0/Check-Radio/menuitem-radio-checked.png
--- a/gtk-2.0/Check-Radio/option1.png
+++ b/gtk-2.0/Check-Radio/option1.png
--- a/gtk-2.0/Check-Radio/option2.png
+++ b/gtk-2.0/Check-Radio/option2.png
--- a/gtk-2.0/Check-Radio/option3.png
+++ b/gtk-2.0/Check-Radio/option3.png
--- a/gtk-2.0/Check-Radio/option4.png
+++ b/gtk-2.0/Check-Radio/option4.png
--- a/gtk-2.0/Combo/combo-arrow-active.png
+++ b/gtk-2.0/Combo/combo-arrow-active.png
--- a/gtk-2.0/Combo/combo-arrow-insens.png
+++ b/gtk-2.0/Combo/combo-arrow-insens.png
--- a/gtk-2.0/Combo/combo-arrow-prelight.png
+++ b/gtk-2.0/Combo/combo-arrow-prelight.png
--- a/gtk-2.0/Combo/combo-arrow.png
+++ b/gtk-2.0/Combo/combo-arrow.png
--- a/gtk-2.0/Combo/combo-inactive.png
+++ b/gtk-2.0/Combo/combo-inactive.png
--- a/gtk-2.0/Combo/combo-normal.png
+++ b/gtk-2.0/Combo/combo-normal.png
--- a/gtk-2.0/Combo/combo-prelight.png
+++ b/gtk-2.0/Combo/combo-prelight.png
--- a/gtk-2.0/Combo/combo-pressed.png
+++ b/gtk-2.0/Combo/combo-pressed.png
--- a/gtk-2.0/Combo/op-ins.png
+++ b/gtk-2.0/Combo/op-ins.png
--- a/gtk-2.0/Combo/op-pre.png
+++ b/gtk-2.0/Combo/op-pre.png
--- a/gtk-2.0/Combo/op.png
+++ b/gtk-2.0/Combo/op.png
--- a/gtk-2.0/Frame-Gap/frame-gap-end.png
+++ b/gtk-2.0/Frame-Gap/frame-gap-end.png
--- a/gtk-2.0/Frame-Gap/frame-gap-start.png
+++ b/gtk-2.0/Frame-Gap/frame-gap-start.png
--- a/gtk-2.0/Frame-Gap/frame1.png
+++ b/gtk-2.0/Frame-Gap/frame1.png
--- a/gtk-2.0/Handles/handle-h.png
+++ b/gtk-2.0/Handles/handle-h.png
--- a/gtk-2.0/Handles/handle-v.png
+++ b/gtk-2.0/Handles/handle-v.png
--- a/gtk-2.0/Handles/resize-grip.png
+++ b/gtk-2.0/Handles/resize-grip.png
--- a/gtk-2.0/Lines/line-h.png
+++ b/gtk-2.0/Lines/line-h.png
--- a/gtk-2.0/Lines/line-v.png
+++ b/gtk-2.0/Lines/line-v.png
--- a/gtk-2.0/ListHeaders/list_header-insens.png
+++ b/gtk-2.0/ListHeaders/list_header-insens.png
--- a/gtk-2.0/ListHeaders/list_header-prelight.png
+++ b/gtk-2.0/ListHeaders/list_header-prelight.png
--- a/gtk-2.0/ListHeaders/list_header-pressed.png
+++ b/gtk-2.0/ListHeaders/list_header-pressed.png
--- a/gtk-2.0/ListHeaders/list_header.png
+++ b/gtk-2.0/ListHeaders/list_header.png
--- a/gtk-2.0/ListHeaders/tree.png
+++ b/gtk-2.0/ListHeaders/tree.png
--- a/gtk-2.0/Menu-Menubar/arrow-right-prelight.png
+++ b/gtk-2.0/Menu-Menubar/arrow-right-prelight.png
--- a/gtk-2.0/Menu-Menubar/arrow-right.png
+++ b/gtk-2.0/Menu-Menubar/arrow-right.png
--- a/gtk-2.0/Menu-Menubar/menu.png
+++ b/gtk-2.0/Menu-Menubar/menu.png
--- a/gtk-2.0/Menu-Menubar/menubar-item.png
+++ b/gtk-2.0/Menu-Menubar/menubar-item.png
--- a/gtk-2.0/Menu-Menubar/menubar.png
+++ b/gtk-2.0/Menu-Menubar/menubar.png
--- a/gtk-2.0/Menu-Menubar/menuitem.png
+++ b/gtk-2.0/Menu-Menubar/menuitem.png
--- a/gtk-2.0/Menu-Menubar/menuline.png
+++ b/gtk-2.0/Menu-Menubar/menuline.png
--- a/gtk-2.0/Others/close.png
+++ b/gtk-2.0/Others/close.png
--- a/gtk-2.0/Others/focus.png
+++ b/gtk-2.0/Others/focus.png
--- a/gtk-2.0/Others/null.png
+++ b/gtk-2.0/Others/null.png
--- a/gtk-2.0/Others/ruler.png
+++ b/gtk-2.0/Others/ruler.png
--- a/gtk-2.0/Others/tooltip.png
+++ b/gtk-2.0/Others/tooltip.png
--- a/gtk-2.0/Panel/button-active.png
+++ b/gtk-2.0/Panel/button-active.png
--- a/gtk-2.0/Panel/button-inactive.png
+++ b/gtk-2.0/Panel/button-inactive.png
--- a/gtk-2.0/Panel/button-prelight.png
+++ b/gtk-2.0/Panel/button-prelight.png
--- a/gtk-2.0/Panel/handle-h.png
+++ b/gtk-2.0/Panel/handle-h.png
--- a/gtk-2.0/Panel/handle-v.png
+++ b/gtk-2.0/Panel/handle-v.png
--- a/gtk-2.0/Panel/menubar-item.png
+++ b/gtk-2.0/Panel/menubar-item.png
--- a/gtk-2.0/Panel/panel-bg.png
+++ b/gtk-2.0/Panel/panel-bg.png
--- a/gtk-2.0/Panel/panel-button-active-prelight.png
+++ b/gtk-2.0/Panel/panel-button-active-prelight.png
--- a/gtk-2.0/Panel/panel-button-active.png
+++ b/gtk-2.0/Panel/panel-button-active.png
--- a/gtk-2.0/Panel/panel-button-inactive.png
+++ b/gtk-2.0/Panel/panel-button-inactive.png
--- a/gtk-2.0/Panel/panel-button-prelight.png
+++ b/gtk-2.0/Panel/panel-button-prelight.png
--- a/gtk-2.0/Panel/panel-menubar.png
+++ b/gtk-2.0/Panel/panel-menubar.png
--- a/gtk-2.0/ProgressBar/progressbar-horiz.png
+++ b/gtk-2.0/ProgressBar/progressbar-horiz.png
--- a/gtk-2.0/ProgressBar/progressbar-pat.png
+++ b/gtk-2.0/ProgressBar/progressbar-pat.png
--- a/gtk-2.0/ProgressBar/progressbar-vert.png
+++ b/gtk-2.0/ProgressBar/progressbar-vert.png
--- a/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
+++ b/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
--- a/gtk-2.0/ProgressBar/trough-progressbar.png
+++ b/gtk-2.0/ProgressBar/trough-progressbar.png
--- a/gtk-2.0/Range/null.png
+++ b/gtk-2.0/Range/null.png
--- a/gtk-2.0/Range/scale-slider-hover-vert.png
+++ b/gtk-2.0/Range/scale-slider-hover-vert.png
--- a/gtk-2.0/Range/scale-slider-hover.png
+++ b/gtk-2.0/Range/scale-slider-hover.png
--- a/gtk-2.0/Range/scale-slider-insensitive-vert.png
+++ b/gtk-2.0/Range/scale-slider-insensitive-vert.png
--- a/gtk-2.0/Range/scale-slider-insensitive.png
+++ b/gtk-2.0/Range/scale-slider-insensitive.png
--- a/gtk-2.0/Range/scale-slider-vert.png
+++ b/gtk-2.0/Range/scale-slider-vert.png
--- a/gtk-2.0/Range/scale-slider.png
+++ b/gtk-2.0/Range/scale-slider.png
--- a/gtk-2.0/Range/trough-horizontal.png
+++ b/gtk-2.0/Range/trough-horizontal.png
--- a/gtk-2.0/Range/trough-vertical.png
+++ b/gtk-2.0/Range/trough-vertical.png
--- a/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+++ b/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
--- a/Show More
+++ b/Show More