diff options
Diffstat (limited to 'desktop-themes/TraditionalOk/gtk-3.0')
21 files changed, 729 insertions, 581 deletions
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am index 57bcd382..520d92ad 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am +++ b/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am @@ -5,7 +5,6 @@ themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0 theme_DATA = \ applications.css \ gtk.css \ - gtk-variant.css \ gtk-widgets.css \ gtk-widgets-img.css \ mate-applications.css \ diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css deleted file mode 100644 index 733b36f6..00000000 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-variant.css +++ /dev/null @@ -1,59 +0,0 @@ -/*********************************************************************** - * This section can be modified to create color variants of the theme. * - ***********************************************************************/ - -/**************** - * color scheme * - ****************/ - -@define-color base_color #ffffff; - -@define-color bg_color #edeceb; -@define-color fg_color #000000; - -@define-color selected_bg_color #86abd9; -@define-color selected_fg_color #ffffff; - -@define-color tooltip_bg_color #f5f5b5; -@define-color tooltip_fg_color #000000; - -@define-color text_color #1a1a1a; - -@define-color theme_base_color @base_color; - -@define-color theme_bg_color @bg_color; -@define-color theme_fg_color @fg_color; - -@define-color theme_selected_bg_color @selected_bg_color; -@define-color theme_selected_fg_color @selected_fg_color; - -@define-color theme_tooltip_bg_color @tooltip_bg_color; -@define-color theme_tooltip_fg_color @tooltip_fg_color; - -@define-color theme_text_color @text_color; - -@define-color link_color #0000ee; -@define-color visited_link_color #551a8b; - -/***************** - * error/warning * - *****************/ - -@define-color error_color #cc0000; - -@define-color warning_bg_color #faad3d; - -/*************** - * core colors * - ***************/ - -/* Core colors are only used in the current file, as bases for other - color declarations. */ - -@define-color core_color_a #a4c2e8; /* Core color for blue widgets in Clearlooks-Phenix. */ -@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */ - -/******************************************** - * End of configuration for color variants. * - ********************************************/ - diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css index 6292fc81..41b3e616 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css +++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css @@ -34,9 +34,9 @@ GtkSwitch.slider:insensitive { background-image: url("img/resize-grip.png"); } -/*************** +/************* * Scrollbar * - ***************/ + *************/ .scrollbar.slider { background-repeat: no-repeat; @@ -94,117 +94,127 @@ GtkSwitch.slider:insensitive { .check, .check row:selected, .check row:selected:focus { - background-image: none; - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked-insensitive.png")); + -gtk-icon-source: url("img/checkbox-unchecked-insensitive.png"); } .check:checked, -.check:active, .check row:selected:checked, +.check row:selected:focus:checked, +.check:active, .check row:selected:active, .check row:selected:focus:active { - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(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: none; - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked-insensitive.png")); + -gtk-icon-source: url("img/radio-unchecked-insensitive.png"); } .radio:checked, -.radio:active, .radio row:selected:checked, +.radio row:selected:focus:checked, +.radio:active, .radio row:selected:active, .radio row:selected:focus:active { - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(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 { - -gtk-icon-source: -gtk-scaled(url("img/radio-mixed-insensitive.png")); + -gtk-icon-source: url("img/radio-mixed-insensitive.png"); } /********************* @@ -291,81 +301,72 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive { *********/ .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"); } /********* @@ -386,22 +387,27 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive { /* 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, .titlebar .titlebutton:hover, .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, @@ -421,40 +427,15 @@ 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, @@ -593,17 +574,18 @@ GtkComboBox.combobox-entry .button:insensitive, /* 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, @@ -672,3 +654,88 @@ column-header:last-child .button:active:focus { 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; +} + +/* Dialog Action Area */ + +/* Leftmost button */ +.dialog-action-area.linked .button:first-child, +.dialog-action-area.linked .button:active:first-child, +.dialog-action-area.linked .button:active:hover:first-child, +.dialog-action-area.linked .button:focus:first-child, +.dialog-action-area.linked .button:focus:active:first-child, +.dialog-action-area.linked .button:insensitive:first-child, +/* Middle button */ +.dialog-action-area.linked .button, +.dialog-action-area.linked .button:active, +.dialog-action-area.linked .button:active:hover, +.dialog-action-area.linked .button:focus, +.dialog-action-area.linked .button:focus:active, +.dialog-action-area.linked .button:insensitive, +/* Rightmost button */ +.dialog-action-area.linked .button:last-child, +.dialog-action-area.linked .button:active:last-child, +.dialog-action-area.linked .button:active:hover:last-child, +.dialog-action-area.linked .button:focus:last-child, +.dialog-action-area.linked .button:focus:active:last-child, +.dialog-action-area.linked .button:insensitive:last-child { + border-radius: 3px; + border-width: 1px; +} diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css index 2406d77e..662dc593 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalOk/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; @@ -31,6 +31,12 @@ -GtkWidget-focus-padding: 2; -GtkWidget-focus-line-width: 1; + outline-color: @focus_border_color; + outline-style: dashed; + outline-offset: -2px; + outline-width: 1px; + outline-radius: 2px; + -GtkWindow-resize-grip-width: 11; -GtkWindow-resize-grip-height: 11; } @@ -43,7 +49,8 @@ GtkWindow { color: @theme_fg_color; } -* { +.background { + color: @theme_fg_color; background-color: @theme_bg_color; } @@ -92,8 +99,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 { @@ -432,6 +454,10 @@ GtkScrolledWindow.frame { padding: 0; } +GtkScrolledWindow GtkViewport { + background-color: @theme_bg_color; +} + /* avoid double borders when a viewport is * packed into a GtkScrolledWindow */ GtkScrolledWindow GtkViewport.frame { @@ -444,8 +470,52 @@ GtkScrolledWindow GtkViewport.frame { .button, .button.menuitem.menubar, -GtkComboBox.combobox-entry .button { - padding: 1px 4px; +.combobox-entry .button, +.inline-toolbar.toolbar .button, +.primary-toolbar.toolbar.horizontal .button, +.primary-toolbar.toolbar.horizontal .button:active, +.toolbar.horizontal .button, +.toolbar.horizontal .button:active, +.titlebar .linked.raised .button, +.titlebar .linked.raised .button:active { + padding: 5px 8px 6px; +} + +GtkComboBox GtkToggleButton.button, +GtkComboBoxText GtkToggleButton.button, +.toolbar.horizontal GtkComboBox GtkToggleButton.button, +.toolbar.horizontal GtkComboBoxText GtkToggleButton.button { + padding: 2px; +} + +.path-bar .button, +.path-bar .button GtkImage, +.path-bar .button GtkLabel { + padding: 2px; +} + +.path-bar .button { + border-width: 1px 0px 1px 1px; +} + +.path-bar .button:hover:active { + border-left-width: 1px; +} + +.path-bar .button:first-child, +.path-bar .button:first-child:hover:active { + border-right-width: 0px; +} + +.path-bar .button:only-child, +.path-bar .button:only-child:hover:active { + border-radius: 3px; + border-right-width: 1px; +} + +.linked.raised .button:first-child, +.linked.raised .button:first-child:hover:active { + border-right-width: 0px; } .button { @@ -480,7 +550,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 +615,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 +630,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 +643,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, @@ -586,6 +661,38 @@ GtkComboBox.combobox-entry .button:active, background-color: transparent; } +GtkListBoxRow.button.list-row:hover { + background-image: linear-gradient(to bottom, + shade(@button_active_gradient_a, 1.20), + shade(@button_active_gradient_b, 1.20) 3px, + shade(@button_active_gradient_c, 1.20) 4px, + shade(@button_active_gradient_d, 1.20) 50%, + shade(@button_active_gradient_e, 1.20) 50%, + shade(@button_active_gradient_f, 1.20)); + background-color: transparent; +} + +GtkListBoxRow.button.list-row { + color: @theme_text_color; + background-color: @theme_base_color; + border-radius: 0px; + border: none; +} + +GtkListBoxRow.button.list-row:selected { + color: @theme_selected_fg_color; + border-style: solid; + border-width: 1px; + border-color: @menubar_menuitem_hover_border_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@menubar_menuitem_hover_gradient_a), + color-stop (0.50, @menubar_menuitem_hover_gradient_b), + color-stop (0.50, @menubar_menuitem_hover_gradient_c), + to (@menubar_menuitem_hover_gradient_d)); +} + .trough, .trough.highlight, .trough row, @@ -610,8 +717,8 @@ GtkComboBox.combobox-entry .button:active, .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 +730,7 @@ GtkColorChooserWidget #add-color-button:hover { /* 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 +779,6 @@ GtkComboBox.combobox-entry .button:insensitive { .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,16 +786,22 @@ GtkComboBox.combobox-entry .button:insensitive { -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; + background-color: transparent; } .notebook tab.top { @@ -786,6 +896,10 @@ GtkComboBox.combobox-entry .button:insensitive { background-color: transparent; } +.notebook tab * { + background-color: transparent; +} + /* close button styling */ .notebook tab .button, .notebook tab .button:active, @@ -841,40 +955,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; } @@ -1023,22 +1137,6 @@ GtkComboBox .button *:hover { color: @scrollbar_button_insensitive_color; } -.scrollbar.button.top:insensitive { - border-bottom: none; -} - -.scrollbar.button.bottom:insensitive { - border-top: none; -} - -.scrollbar.button.left:insensitive { - border-right: none; -} - -.scrollbar.button.right:insensitive { - border-left: none; -} - .scrollbar.slider { background-color: @scrollbar_slider_bg_color; background-image: none; @@ -1068,6 +1166,7 @@ GtkTreeMenu .menuitem { } .menu { + font: normal; background-color: @menu_bg_color; color: @menu_fg_color; padding: 1px; @@ -1105,7 +1204,7 @@ GtkTreeMenu .menuitem { /* this controls the general appearance of the menubar */ .menubar { border-style: none; - padding: 0px; + padding: 1px; -GtkWidget-window-dragging: true; -GtkMenuBar-internal-padding: 1; background-image: -gtk-gradient (linear, @@ -1122,7 +1221,9 @@ GtkTreeMenu .menuitem { background-color: transparent; } -.menubar .menuitem:hover { +.menubar .menuitem:hover, +.menuitem.button.flat:hover, +.menuitem.button.flat:active { background-color: @menu_bg_color; border-style: solid; border-width: 1px 1px 0px; @@ -1138,6 +1239,15 @@ GtkTreeMenu .menuitem { to (@menubar_menuitem_hover_gradient_d)); } +.menuitem.button.flat:hover { + border-width: 1px; + border-radius: 3px; +} + +.menuitem.button.flat:focus { + color: @theme_text_color; +} + .menubar .menuitem *:hover { border-width: 1px; color: @menubar_menuitem_hover_color; @@ -1166,6 +1276,7 @@ GtkTreeMenu .menuitem:hover, } GtkTreeMenu .menuitem *:hover, +GtkComboBox .menuitem:hover *, .menu .menuitem:active, .menu .menuitem *:active, .menu .menuitem:hover, @@ -1240,75 +1351,29 @@ GtkTreeMenu .menuitem *:hover, border-style: solid; } -/***************************************************************************************************** - * Check and Radio items * - * Related to recent gtk3 development, to reveal checkboxes as part of the dialogue * - * of some of the applications whose notification icons appear in the system tray * - * the reference section of the HighContrast theme is used. * - * https://git.gnome.org/browse/gnome-themes-standard/tree/themes/HighContrast/gtk-3.0/gtk.css#n1398 * - *****************************************************************************************************/ - -GtkCheckButton.text-button, GtkRadioButton.text-button { - padding: 1px; - outline-offset: 0; } - -.check { - color: rgba(0, 0, 0, 0.1); - background-image: none; - -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked.png")); } - .check:hover { - color: #7f7f7f; } - .check:checked, .check:active { - -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked.png")); - color: #000; } - .check:checked:hover, .check:active:hover { - color: #7f7f7f; } - .check:checked:insensitive, .check:active:insensitive { - -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-insensitive.png")); - color: #7f7f7f; } - .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop { - color: #7f7f7f; } - .check:checked:backdrop, .check:active:backdrop { - color: #000; } - .check:insensitive { - color: rgba(127, 127, 127, 0.1); } - .check:insensitive:backdrop { - color: transparent; } - .check:inconsistent { - -gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed.png")); } - .check:backdrop { - color: rgba(0, 0, 0, 0.1); } - .check:backdrop:selected { - color: rgba(255, 255, 255, 0.1); } - -.radio { - color: rgba(0, 0, 0, 0.1); - background-image: none; - -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked.png")); } - .radio:hover { - color: #7f7f7f; } - .radio:checked, .radio:active { - -gtk-icon-source: -gtk-scaled(url("img/radio-checked.png")); - color: #000; } - .radio:checked:hover, .radio:active:hover { - color: #7f7f7f; } - .radio:checked:insensitive, .radio:active:insensitive { - -gtk-icon-source: -gtk-scaled(url("img/radio-checked-insensitive.png")); - color: #7f7f7f; } - .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop { - color: #7f7f7f; } - .radio:checked:backdrop, .radio:active:backdrop { - color: #000; } - .radio:insensitive { - color: rgba(127, 127, 127, 0.1); } - .radio:insensitive:backdrop { - color: transparent; } - .radio:inconsistent { - -gtk-icon-source: -gtk-scaled(url("img/radio-mixed.png")); } - .radio:backdrop { - color: rgba(0, 0, 0, 0.1); } - .radio:backdrop:selected { - color: rgba(255, 255, 255, 0.1); } +/**************** + * Radiobuttons * + ****************/ + +.check, +.radio, +.check:insensitive, +.radio:insensitive { + background-color: transparent; + border-style: none; +} + +.check row:selected:insensitive, +.check row:selected:focus:insensitive { + background-color: transparent; +} + +GtkCheckButton:hover, +GtkCheckButton:active:hover, +GtkCheckButton:selected, +GtkCheckButton:selected:focus { + background-color: transparent; +} /************ * Toolbars * @@ -1544,7 +1609,15 @@ GtkTreeView:insensitive { color: @insensitive_fg_color; } -GtkTreeView:selected:focus { +GtkTreeView:hover { + background-image: linear-gradient(to bottom, + shade(@button_active_gradient_a, 1.20), + shade(@button_active_gradient_b, 1.20) 3px, + shade(@button_active_gradient_c, 1.20) 4px, + shade(@button_active_gradient_d, 1.20) 50%, + shade(@button_active_gradient_e, 1.20) 50%, + shade(@button_active_gradient_f, 1.20)); + background-color: transparent; } column-header.button, @@ -1815,106 +1888,65 @@ GtkInfoBar:last-child, * Titlebar * ************/ -/* this is the default titlebar that is added by GTK - * when client-side decorations are in use and the application - * did not set a custom titlebar. - */ -.titlebar.default-decoration { - border: none; - box-shadow: none; -} - .titlebar { background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 1.20), - @theme_selected_bg_color); + @theme_base_color, + @theme_bg_color); background-color: transparent; - border-radius: 7px 7px 0px 0px; + border-radius: 0px; border-bottom: 1px solid; border-color: shade(@border_color, 1.30); - color: @theme_selected_fg_color; - font: Bold 10; - text-shadow: 1px 1px @theme_fg_color; + padding: 5px 4px 4px 4px; } - /* Colour when unfocused? */ -.titlebar:backdrop { - text-shadow: none; - background-image: none; - background-color: @theme_bg_color; -} - -.titlebar .titlebutton { +.titlebar > * { background: none; - border-image: none; - padding: 5px 5px 6px 5px; -} - -.titlebar .titlebutton:hover { - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 1.30), - shade (@theme_selected_bg_color, 1.05)); - border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; - border-radius: 3px; - border-width: 1px 1px 2px 1px; - border-style: solid; - border-color: transparent; - padding: 5px 5px 6px 5px; -} - -.titlebar .titlebutton:active { - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 1.05), - shade (@theme_selected_bg_color, 1.25)); - border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; - color: @theme_fg_color; - icon-shadow: none; } -.titlebar .right .titlebutton:first-child { - border-left: 1px solid @menu_separator; +.tiled .titlebar { + border-radius: 0; } -.titlebar .right .titlebutton:last-child { - +.maximized .titlebar { + border-radius: 0; } -.titlebar .left .titlebutton:last-child { - border-right: 1px solid @menu_separator; +.titlebar .title { + font: Bold; } -.titlebar .left .titlebutton:first-child { +/*.titlebar :first-child {*/ +/* padding: 5px 5px 6px 5px;*/ +/*}*/ +.titlebar .titlebutton { + background: none; + border-image: none; } -.titlebar .titlebutton:backdrop { - background: none; - color: @theme_text_color; - border-image: none; - icon-shadow: none; -} - -/**************************************************************************************** - * Give and take related to recent gtk3 development, * - * to achieve full size of the icon menu of some of the applications whose notification * - * icons appear in the system tray, the "shadow" is disabled. * - ****************************************************************************************/ -/* .window-frame { border-width: 1px; border-radius: 7px 7px 0 0; border-style: solid; - background-color: @theme_bg_color; - * dummy to avoid resizing mate-appearence-properties if theme changed - box-shadow: 0px 0px 0px 0px; margin: 10px; } -.window-frame:backdrop { - * dummy to avoid resizing mate-appearence-properties if theme changed - box-shadow: 0 0 0 2px @insensitive_text_shadow_color, 0 2px 5px 1px @insensitive_text_shadow_color; +/************** + * Action bar * + **************/ + +.action-bar { + border: none; + padding: 7px 7px 3px 7px; +} + +/************** + * Header bar * + **************/ + +GtkHeaderBar .header-bar { + padding: 5px 4px 4px 4px; } -*/ /************ * Popovers * @@ -1922,8 +1954,9 @@ GtkInfoBar:last-child, GtkPopover { border: 1px solid; - border-radius: 7px; + border-radius: 0px; border-color: @border_color; + background-color: @theme_bg_color; background-clip: border-box; } diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk.css index 6dd43210..c5c438aa 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk.css +++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk.css @@ -1,8 +1,48 @@ -/****************** - * imports 1 of 2 * - ******************/ +/*********************************************************************** + * This section can be modified to create color variants of the theme. * + ***********************************************************************/ -@import url("gtk-variant.css"); +/**************** + * color scheme * + ****************/ + +@define-color theme_base_color #ffffff; + +@define-color theme_bg_color #edeceb; +@define-color theme_fg_color #000000; + +@define-color theme_selected_bg_color #86abd9; +@define-color theme_selected_fg_color #ffffff; + +@define-color theme_tooltip_bg_color #f5f5b5; +@define-color theme_tooltip_fg_color #000000; + +@define-color theme_text_color #1a1a1a; + +@define-color link_color #0000ee; +@define-color visited_link_color #551a8b; + +/***************** + * error/warning * + *****************/ + +@define-color error_color #cc0000; + +@define-color warning_bg_color #faad3d; + +/*************** + * core colors * + ***************/ + +/* Core colors are only used in the current file, as bases for other + color declarations. */ + +@define-color core_color_a #a4c2e8; /* Core color for blue widgets in Clearlooks-Phenix. */ +@define-color core_color_b #edeceb; /* Core color for gray widgets in Clearlooks-Phenix. */ + +/******************************************** + * End of configuration for color variants. * + ********************************************/ /*********** * general * @@ -387,12 +427,11 @@ @define-color trough_gradient_a shade(@core_color_b, 0.81); @define-color trough_gradient_b shade(@core_color_b, 0.90); -/****************** - * imports 2 of 2 * - ******************/ +/*********** + * imports * + ***********/ @import url("gtk-widgets-img.css"); @import url("gtk-widgets.css"); @import url("applications.css"); @import url("mate-applications.css"); - diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am b/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am index c6fa4874..008f2776 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am @@ -55,6 +55,5 @@ theme_DATA = \ scale-slider-vert.png \ slider-horz-grip.png \ slider-vert-grip.png - - + EXTRA_DIST = $(theme_DATA) diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-ptb.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-ptb.svg index dfee1e5b..b360734f 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-ptb.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-ptb.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" @@ -15,54 +14,52 @@ id="svg33222" version="1.1" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="button-default-border-dark.svg"> + sodipodi:docname="border-focused-2.svg"> <defs id="defs33224"> <linearGradient - id="linearGradient7928"> + id="linearGradient3837"> <stop - style="stop-color:#505050;stop-opacity:1;" + style="stop-color:#ffffff;stop-opacity:1;" offset="0" - id="stop7930" /> + id="stop3839" /> <stop - id="stop3762" - offset="0.75114173" - style="stop-color:#aaaaaa;stop-opacity:1;" /> - <stop - style="stop-color:#aaaaaa;stop-opacity:1;" + style="stop-color:#ffffff;stop-opacity:0;" offset="1" - id="stop7932" /> + id="stop3841" /> </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7928" - id="linearGradient7934" - x1="5.0061774" - y1="8.9020138" - x2="14.827382" - y2="1.0544924" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.99998621,0,0,0.99998621,-15.999891,1.0988204e-4)" /> </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#8e8e8e" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="22.172911" - inkscape:cx="7.2404508" - inkscape:cy="9.7450004" + inkscape:zoom="44.5625" + inkscape:cx="8" + inkscape:cy="8" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="849" - inkscape:window-height="744" - inkscape:window-x="242" - inkscape:window-y="148" - inkscape:window-maximized="0" /> + inkscape:window-width="1280" + inkscape:window-height="949" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:showpageshadow="false" + showborder="false"> + <inkscape:grid + type="xygrid" + id="grid2992" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata id="metadata33227"> <rdf:RDF> @@ -80,14 +77,22 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> <rect - ry="3" - rx="3" - y="0.500103" - x="-15.499897" - height="14.999794" - width="14.999794" + ry="2.5" + rx="2.5000005" + y="0.5" + x="0.5" + height="13.999999" + width="15" id="rect17861" - style="color:#000000;fill:none;stroke:url(#linearGradient7934);stroke-width:1.00020635000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - transform="matrix(0,-1,1,0,0,0)" /> + style="color:#000000;fill:none;stroke:#869bb7;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + ry="1.5" + rx="1.5" + y="1.5" + x="1.5" + height="12" + width="13.000001" + id="rect17861-6" + style="color:#000000;fill:none;stroke:#cccccc;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25" /> </g> </svg> diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-switch.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-switch.svg index 76adc2c9..1402b7f2 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-switch.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused-switch.svg @@ -11,40 +11,64 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" height="16px" - id="svg12251" + id="svg33222" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="entry-border-focused-dark.svg"> + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="border-focused2.svg"> <defs - id="defs12253" /> + id="defs33224"> + <linearGradient + id="linearGradient3837"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3839" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3841" /> + </linearGradient> + </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#8e8e8e" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="22.197802" - inkscape:cx="2.9655938" - inkscape:cy="8" + inkscape:zoom="16" + inkscape:cx="2.81232" + inkscape:cy="9.5803639" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1216" - inkscape:window-height="739" - inkscape:window-x="5" - inkscape:window-y="26" - inkscape:window-maximized="0" /> + inkscape:window-width="1280" + inkscape:window-height="951" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:showpageshadow="false" + showborder="false"> + <inkscape:grid + type="xygrid" + id="grid2992" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata - id="metadata12256"> + id="metadata33227"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -52,23 +76,20 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + <path + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6" + d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4" + id="rect17861-5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssc" /> <rect - style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" - id="rect5836" - width="15.000001" - height="15" - x="0.49999997" - y="-15.5" - rx="2.2980974" - ry="2.2980971" - transform="scale(1,-1)" /> - <rect - transform="matrix(0,1,-1,0,0,0)" - style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new" - id="rect6042" - width="1" - height="12" - x="1" - y="-14" /> + ry="2.5" + rx="2.5000005" + y="0.5" + x="0.5" + height="13.999999" + width="15" + id="rect17861" + style="color:#000000;fill:none;stroke:#4b6e99;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> </svg> diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused.svg index 76adc2c9..95378763 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border-focused.svg @@ -11,40 +11,64 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" height="16px" - id="svg12251" + id="svg33222" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="entry-border-focused-dark.svg"> + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="button-border-focused.svg"> <defs - id="defs12253" /> + id="defs33224"> + <linearGradient + id="linearGradient3837"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3839" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3841" /> + </linearGradient> + </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#8e8e8e" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="22.197802" - inkscape:cx="2.9655938" - inkscape:cy="8" + inkscape:zoom="16" + inkscape:cx="2.68732" + inkscape:cy="9.5803639" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1216" - inkscape:window-height="739" - inkscape:window-x="5" - inkscape:window-y="26" - inkscape:window-maximized="0" /> + inkscape:window-width="1280" + inkscape:window-height="951" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:showpageshadow="false" + showborder="false"> + <inkscape:grid + type="xygrid" + id="grid2992" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata - id="metadata12256"> + id="metadata33227"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -52,23 +76,29 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + <path + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6" + d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4" + id="rect17861-5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssc" /> <rect - style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" - id="rect5836" - width="15.000001" - height="15" - x="0.49999997" - y="-15.5" - rx="2.2980974" - ry="2.2980971" - transform="scale(1,-1)" /> + ry="2.5" + rx="2.5000005" + y="0.5" + x="0.5" + height="13.999999" + width="15" + id="rect17861" + style="color:#000000;fill:none;stroke:#4b6e99;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect - transform="matrix(0,1,-1,0,0,0)" - style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new" - id="rect6042" - width="1" + ry="1.5" + rx="1.5" + y="1.5" + x="1.5" height="12" - x="1" - y="-14" /> + width="13.000001" + id="rect17861-6" + style="color:#000000;fill:none;stroke:#c8daef;stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.80000000000000004" /> </g> </svg> diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border-gnome-panel-button.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border-gnome-panel-button.svg index bcc83d8d..bcc83d8d 100755..100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border-gnome-panel-button.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border-gnome-panel-button.svg diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border-inline-button.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border-inline-button.svg index 76adc2c9..1691c52e 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border-inline-button.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border-inline-button.svg @@ -9,42 +9,55 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16px" - height="16px" - id="svg12251" + width="18" + height="16" + id="svg33222" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="entry-border-focused-dark.svg"> + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="border-inline.svg"> <defs - id="defs12253" /> + id="defs33224" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#8e8e8e" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="22.197802" - inkscape:cx="2.9655938" - inkscape:cy="8" + inkscape:zoom="16" + inkscape:cx="-0.97883235" + inkscape:cy="-0.54712037" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1216" - inkscape:window-height="739" - inkscape:window-x="5" - inkscape:window-y="26" - inkscape:window-maximized="0" /> + inkscape:window-width="1280" + inkscape:window-height="951" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:showpageshadow="false" + showborder="true" + fit-margin-top="0"> + <inkscape:grid + type="xygrid" + id="grid2992" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata - id="metadata12256"> + id="metadata33227"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -52,23 +65,24 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - <rect - style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" - id="rect5836" - width="15.000001" - height="15" - x="0.49999997" - y="-15.5" - rx="2.2980974" - ry="2.2980971" - transform="scale(1,-1)" /> - <rect - transform="matrix(0,1,-1,0,0,0)" - style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new" - id="rect6042" - width="1" - height="12" - x="1" - y="-14" /> + <g + id="g2991" + transform="translate(0,1)"> + <path + sodipodi:nodetypes="cssssc" + inkscape:connector-curvature="0" + id="rect17861-5" + d="M 16.5,3.000001 16.5,12 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 C 2.6150002,14.5 1.5,13.385 1.5,12 l 0,-8.999999" + style="opacity:0.6;color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:none;stroke:#918e8c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17861" + width="15" + height="13.999999" + x="1.5" + y="-0.49999899" + rx="2.5000005" + ry="2.5" /> + </g> </g> </svg> diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border-insensitive.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border-insensitive.svg index 76adc2c9..2b9e3612 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border-insensitive.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border-insensitive.svg @@ -11,40 +11,52 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" height="16px" - id="svg12251" + id="svg33222" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="entry-border-focused-dark.svg"> + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="border-insensitive.svg"> <defs - id="defs12253" /> + id="defs33224" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#8e8e8e" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="22.197802" - inkscape:cx="2.9655938" - inkscape:cy="8" + inkscape:zoom="16" + inkscape:cx="-3.4249403" + inkscape:cy="-0.54712037" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1216" - inkscape:window-height="739" - inkscape:window-x="5" - inkscape:window-y="26" - inkscape:window-maximized="0" /> + inkscape:window-width="1280" + inkscape:window-height="951" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:showpageshadow="false" + showborder="false"> + <inkscape:grid + type="xygrid" + id="grid2992" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata - id="metadata12256"> + id="metadata33227"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -52,23 +64,20 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + <path + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6" + d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4" + id="rect17861-5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssc" /> <rect - style="fill:#ffffff;fill-opacity:0;stroke:#6c6c6c;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" - id="rect5836" - width="15.000001" - height="15" - x="0.49999997" - y="-15.5" - rx="2.2980974" - ry="2.2980971" - transform="scale(1,-1)" /> - <rect - transform="matrix(0,1,-1,0,0,0)" - style="opacity:1;fill:#6c6c6c;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new" - id="rect6042" - width="1" - height="12" - x="1" - y="-14" /> + ry="2.5" + rx="2.5000005" + y="0.5" + x="0.5" + height="13.999999" + width="15" + id="rect17861" + style="color:#000000;fill:none;stroke:#a9a5a2;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> </svg> diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/border.svg b/desktop-themes/TraditionalOk/gtk-3.0/img/border.svg index 646f882d..4b97b514 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/border.svg +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/border.svg @@ -7,60 +7,49 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" height="16px" - id="svg11633" + id="svg33222" version="1.1" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="entry-border-normal-dark.svg"> + sodipodi:docname="border.svg"> <defs - id="defs11635"> - <linearGradient - id="linearGradient3751"> - <stop - style="stop-color:#2d2d2d;stop-opacity:1;" - offset="0" - id="stop3753" /> - <stop - style="stop-color:#525258;stop-opacity:1;" - offset="1" - id="stop3755" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3751" - id="linearGradient3757" - x1="0.49999997" - y1="-0.5" - x2="0.49999997" - y2="-15.5" - gradientUnits="userSpaceOnUse" /> - </defs> + id="defs33224" /> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#8e8e8e" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="26.24" - inkscape:cx="10.506099" - inkscape:cy="8.1522251" + inkscape:zoom="16" + inkscape:cx="-11.50355" + inkscape:cy="-0.54712037" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="1065" - inkscape:window-height="814" - inkscape:window-x="301" - inkscape:window-y="155" - inkscape:window-maximized="0" - inkscape:object-nodes="true" /> + inkscape:window-width="1280" + inkscape:window-height="951" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-nodes="false" + inkscape:snap-bbox="true" + inkscape:showpageshadow="false" + showborder="false"> + <inkscape:grid + type="xygrid" + id="grid2992" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata - id="metadata11638"> + id="metadata33227"> <rdf:RDF> <cc:Work rdf:about=""> @@ -75,18 +64,20 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + <path + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.6" + d="m 15.5,4 0,8.999999 c 0,1.385 -1.115,2.5 -2.5,2.5 l -9.9999995,0 c -1.3850003,0 -2.5000005,-1.115 -2.5000005,-2.5 L 0.5,4" + id="rect17861-5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssc" /> <rect - transform="scale(1,-1)" - ry="3" - rx="3" - y="-15.5" - x="0.49999997" - height="15" - width="15.000001" - id="rect5760" - style="fill:none;stroke:url(#linearGradient3757);stroke-width:0.99999988;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" - inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + ry="2.5" + rx="2.5000005" + y="0.5" + x="0.5" + height="13.999999" + width="15" + id="rect17861" + style="color:#000000;fill:none;stroke:#918e8c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> </svg> diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-hover.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-hover.png Binary files differindex c41492f2..4d8125b7 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-hover.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-hover.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-insensitive.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-insensitive.png Binary files differindex 2f387960..7129b2d3 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-insensitive.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-insensitive.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png Binary files differindex 882b675b..ec51e4ee 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed-insensitive.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed.png Binary files differindex 15b05201..a7b45a42 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox-mixed.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox.png Binary files differindex 69e491b5..f7acdd56 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-checkbox.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-checked-hover.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-checked-hover.png Binary files differindex 2b793e7a..59b61ee1 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-checked-hover.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-checked-hover.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-insensitive.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-insensitive.png Binary files differindex d94dfd54..06156923 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-insensitive.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio-insensitive.png diff --git a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio.png b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio.png Binary files differindex aba5c767..1f588e94 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio.png +++ b/desktop-themes/TraditionalOk/gtk-3.0/img/menuitem-radio.png |