diff -Nru shimmer-themes-1.6.1/albatross/gtk-2.0/gtkrc shimmer-themes-1.6.2/albatross/gtk-2.0/gtkrc --- shimmer-themes-1.6.1/albatross/gtk-2.0/gtkrc 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-2.0/gtkrc 2013-09-13 18:24:14.000000000 -0400 @@ -3,7 +3,7 @@ # Inspired by Shiki-Wise by perfectska04 (Victor C.) # 2.x: Pasi Lallinaho -gtk_color_scheme = "fg_color:#202020\nbg_color:#EDEDED\nbase_color:#fff\ntext_color:#444\nselected_bg_color:#A9B7C4\nselected_fg_color:#333333\ntooltip_bg_color:#D6DCE4\ntooltip_fg_color:#222222" +gtk-color-scheme = "fg_color:#202020\nbg_color:#EDEDED\nbase_color:#fff\ntext_color:#444\nselected_bg_color:#A9B7C4\nselected_fg_color:#333333\ntooltip_bg_color:#D6DCE4\ntooltip_fg_color:#222222" gtk-icon-sizes = "gtk-button = 16,16" diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/apps/gnome-applications.css shimmer-themes-1.6.2/albatross/gtk-3.0/apps/gnome-applications.css --- shimmer-themes-1.6.1/albatross/gtk-3.0/apps/gnome-applications.css 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/apps/gnome-applications.css 2013-09-13 18:24:14.000000000 -0400 @@ -4,12 +4,12 @@ PanelWidget, PanelApplet, PanelToplevel { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.5)), - to (shade(@dark_bg_color, 1.05))); padding: 0; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 1.5)), + to (shade(@panel_bg_color, 1.05))); - color: @dark_fg_color; + color: @panel_fg_color; } PanelApplet { @@ -19,10 +19,10 @@ PanelSeparator { border-width: 0; background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.5)), - to (shade(@dark_bg_color, 1.05))); + from (shade(@panel_bg_color, 1.5)), + to (shade(@panel_bg_color, 1.05))); - color: @dark_fg_color; + color: @panel_fg_color; } .gnome-panel-menu-bar, @@ -33,89 +33,76 @@ -PanelMenuBar-icon-visible: true; background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.5)), - to (shade(@dark_bg_color, 1.05))); + from (shade(@panel_bg_color, 1.5)), + to (shade(@panel_bg_color, 1.05))); } -PanelAppletFrame { - background-color: @dark_bg_color; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.5)), - to (shade(@dark_bg_color, 1.05))); +PanelAppletFrame { border-width: 0; + background-color: @panel_bg_color; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 1.5)), + to (shade(@panel_bg_color, 1.05))); } PanelApplet .button { -GtkButton-inner-border: 2; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.5)), - to (shade(@dark_bg_color, 1.05))); - - border-color: shade(@dark_bg_color, 0.7); + border-width: 0 1px; border-radius: 0; - border-width: 0 1px 0 1px; - - color: @dark_fg_color; + border-color: shade(@panel_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 1.5)), + to (shade(@panel_bg_color, 1.05))); + color: @panel_fg_color; text-shadow: none; box-shadow: none; } -PanelApplet .button:prelight:active, PanelApplet .button:active { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 0.85)), - to (shade(@dark_bg_color, 1.0))); - border-color: shade(@dark_bg_color, 0.7); + border-width: 0 1px; border-radius: 0; - border-width: 0 1px 0 1px; + border-color: shade(@panel_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 0.85)), + to (shade(@panel_bg_color, 1.0))); } PanelApplet .button:prelight { + border-color: shade(@panel_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.7)), - to (shade(@dark_bg_color, 1.25))); - border-color: shade(@dark_bg_color, 0.7); - border-radius: 0; - border-width: 0 1px 0 1px; + from (shade(@panel_bg_color, 1.7)), + to (shade(@panel_bg_color, 1.25))); } -ClockBox { - text-shadow: 0 -1px shade(@dark_bg_color, 0.6); +PanelApplet .button:active:prelight { + border-color: shade(@panel_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 1.7)), + to (shade(@panel_bg_color, 1.25))); } WnckPager, WnckTasklist { - background-color: @dark_bg_color; + background-color: @panel_bg_color; } /************ * nautilus * ************/ -NautilusWindow * { - -GtkPaned-handle-size: 1; -} - .nautilus-canvas-item { border-radius: 2px; } -/* desktop mode */ .nautilus-desktop.nautilus-canvas-item { - color: #ffffff; - text-shadow: 1px 1px #000000; + color: white; + text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:active { - background-image: none; - background-color: alpha(@theme_bg_color, 0.84); - color: @theme_fg_color; } .nautilus-desktop.nautilus-canvas-item:selected { - background-image: none; - background-color: alpha(@theme_selected_bg_color, 0.84); - color: @theme_selected_fg_color; } @@ -125,25 +112,181 @@ text-shadow: none; } +NautilusWindow .toolbar { + border-width: 0 0 1px; + border-style: solid; + border-color: shade(@toolbar_bg_color, 0.8); +} + +NautilusWindow .sidebar .frame { + border-style: none; +} + +NautilusWindow > GtkGrid > .pane-separator, +NautilusWindow > GtkGrid > .pane-separator:hover { + border-width: 0 1px 0 0; + border-style: solid; + border-color: shade(@theme_bg_color, 0.8); + background-color: @theme_bg_color; +} + +NautilusNotebook.notebook { + border-right-width: 0; + border-left-width: 0; + border-bottom-width: 0; +} + +NautilusNotebook .frame { + border-width: 0; +} + +NautilusQueryEditor .primary-toolbar.toolbar { + border-top-width: 0; + border-bottom-width: 0; +} + +NautilusQueryEditor .toolbar { + padding-top: 3px; + padding-bottom: 2px; + border-width: 1px 0 0 0; + border-style: solid; + border-color: @toolbar_bg_color; + background-color: shade(@toolbar_bg_color, 0.9); +} + +NautilusQueryEditor .toolbar:nth-child(2) { + border-color: shade(@toolbar_bg_color, 0.8); +} + +NautilusQueryEditor .toolbar:last-child, +NautilusQueryEditor .primary-toolbar.toolbar:only-child { + border-bottom-width: 1px; + border-bottom-color: shade(@toolbar_bg_color, 0.8); +} + /****************** * gnome terminal * ******************/ -TerminalScreen { - background-color: shade(@theme_fg_color, 0.95); - color: #fff; - - -TerminalScreen-background-darkness: 0.9; +VteTerminal { + background-color: @osd_base; + color: @osd_fg; } TerminalWindow GtkNotebook.notebook { - border-bottom-width: 0; border-right-width: 0; + border-bottom-width: 0; border-left-width: 0; } -/*********************** - * gnome control center * - ***********************/ -CcShellItemView.view { +/********* + * gedit * + *********/ +GeditWindow .pane-separator, +GeditWindow .pane-separator:hover { + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 1.02); + color: shade(@theme_bg_color, 0.8); +} + +GeditPanel.title GtkLabel { + padding: 4px 0; +} + +GeditPanel.vertical .title { + padding: 4px 0 4px 3px; + border-style: none; +} + +GeditPanel .toolbar { + border-style: none; + background-color: transparent; +} + +GeditDocumentsPanel .view { background-color: @theme_bg_color; } + +GeditPanel.vertical .notebook { + padding: 0; + border-width: 1px 0; +} + +GeditPanel.horizontal .notebook { + padding: 0; + border-width: 0 1px 1px 0; +} + +GeditWindow .notebook { + border-width: 1px 0; +} + +GeditPanel .notebook tab, +GeditWindow .notebook tab { + border-width: 0; +} + +GeditStatusComboBox .button, +GeditStatusComboBox .button:hover, +GeditStatusComboBox .button:active, +GeditStatusComboBox .button:active:hover { + padding: 1px 6px 2px 4px; + border-style: solid; + border-width: 0 1px; + border-radius: 0; +} + +GeditStatusComboBox .button:hover, +GeditStatusComboBox .button:active, +GeditStatusComboBox .button:active:hover { + border-color: shade(@theme_bg_color, 0.8); +} + +GeditViewFrame .gedit-search-slider { + padding: 4px; + border-radius: 0 0 2px 2px; + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + background-color: @theme_base_color; +} + +GeditViewFrame .gedit-search-slider .not-found { + background-color: @error_bg_color; + background-image: none; + color: @error_fg_color; +} + +GeditViewFrame .gedit-search-slider .not-found:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +GeditFileBrowserWidget .primary-toolbar.toolbar { + padding: 2px; + border-top: none; + background-color: @theme_bg_color; + background-image: none; +} + +/*************** + * font-viewer * + ***************/ +SushiFontWidget { + padding: 6px 12px; +} + +/************* + * gucharmap * + *************/ +GucharmapChartable { + background-color: @theme_base_color; +} + +GucharmapChartable:active, +GucharmapChartable:focus, +GucharmapChartable:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/apps/unity.css shimmer-themes-1.6.2/albatross/gtk-3.0/apps/unity.css --- shimmer-themes-1.6.1/albatross/gtk-3.0/apps/unity.css 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/apps/unity.css 2013-09-13 18:24:14.000000000 -0400 @@ -1,13 +1,14 @@ UnityPanelWidget, .unity-panel { background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@dark_bg_color, 1.5)), - to (shade(@dark_bg_color, 1.04))); - border-top-color: shade(@dark_bg_color, 1.6); + from (shade(@panel_bg_color, 1.5)), + to (shade(@panel_bg_color, 1.04))); + + border-top-color: shade(@panel_bg_color, 1.6); border-style: solid; border-width: 1px 0 0 0; - color: @dark_fg_color; + color: @panel_fg_color; } .unity-panel.menubar, @@ -18,7 +19,7 @@ .unity-panel .menuitem { border-width: 1px 1px 0 1px; - icon-shadow: 0 -1px shade(@dark_bg_color, 0.7); + icon-shadow: 0 -1px shade(@panel_bg_color, 0.7); } .unity-panel.menubar.menuitem:hover, diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/apps/xfce.css shimmer-themes-1.6.2/albatross/gtk-3.0/apps/xfce.css --- shimmer-themes-1.6.1/albatross/gtk-3.0/apps/xfce.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/apps/xfce.css 2013-09-13 18:24:14.000000000 -0400 @@ -0,0 +1,58 @@ +XfceHeading { + background-color: @theme_base_color; + background-image: none; + padding: 0; + border-width: 0; +} + +.xfce4-panel { + background-color: @panel_bg_color; +} + +.xfce4-panel .button { + border-radius: 0; + padding: 1px; + color: @panel_fg_color; +} + +.xfce4-panel .button:active { + border-width: 0 1px; + border-radius: 0; + border-color: shade(@panel_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 0.85)), + to (shade(@panel_bg_color, 1.0))); + + color: @panel_fg_color; +} + +.xfce4-panel .button:hover, +.xfce4-panel .button:active:hover { + border-color: shade(@panel_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@panel_bg_color, 1.7)), + to (shade(@panel_bg_color, 1.25))); + + color: @panel_fg_color; +} + +/* menu-styling, e.g. for indicators */ +.xfce4-panel .menu, +.xfce4-panel .menu GtkLabel, +.xfce4-panel .menu GtkImage { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + +.xfce4-panel .menu *:hover { + border-color: shade(@theme_selected_bg_color, 0.8); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@theme_selected_bg_color, 1.1)), + to (shade(@theme_selected_bg_color, 0.9))); +} + +.xfce4-panel .menu GtkLabel:hover, +.xfce4-panel .menu GtkImage:hover { + background-image: none; + color: @theme_selected_fg_color; +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/gtk-3.0/assets/grid-selection-checked.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/gtk-3.0/assets/grid-selection-checked.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/gtk-3.0/assets/grid-selection-unchecked.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/gtk-3.0/assets/grid-selection-unchecked.png differ diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/gtk.css shimmer-themes-1.6.2/albatross/gtk-3.0/gtk.css --- shimmer-themes-1.6.1/albatross/gtk-3.0/gtk.css 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/gtk.css 2013-09-13 18:24:14.000000000 -0400 @@ -1,4 +1,4 @@ -/* default color scheme */ +/* Default color scheme */ @define-color bg_color #ededed; @define-color fg_color #202020; @define-color base_color #fff; @@ -18,9 +18,9 @@ @define-color theme_tooltip_bg_color @tooltip_bg_color; @define-color theme_tooltip_fg_color @tooltip_fg_color; -/* dark colormap */ -@define-color dark_bg_color #292b2c; -@define-color dark_fg_color mix(@theme_fg_color, #efffff, 0.7); +/* shadow effects */ +@define-color light_shadow #fff; +@define-color dark_shadow #000; /* misc colors used by gtk+ */ @define-color info_fg_color rgb(0, 0, 0); @@ -36,14 +36,30 @@ @define-color success_color #4e9a06; @define-color error_color #cc0000; +/* widget colors */ +@define-color menubar_bg_color #1e1e1e; +@define-color menubar_fg_color mix(@theme_fg_color, #efffff, 0.7); +@define-color toolbar_bg_color #dedede; +@define-color toolbar_fg_color #202020; +@define-color menu_bg_color #292b2c; +@define-color menu_fg_color mix(@theme_fg_color, #efffff, 0.7); +@define-color panel_bg_color #292b2c; +@define-color panel_fg_color mix(@theme_fg_color, #efffff, 0.7); + +/* osd */ +@define-color osd_base #292b2c; +@define-color osd_fg mix(@theme_fg_color, #efffff, 0.7); +@define-color osd_bg alpha(@osd_base, 0.8); + /* window manager colors */ -@define-color wm_bg shade(@theme_fg_color, 0.95); -@define-color wm_title_focused mix(@dark_fg_color, @dark_bg_color, 0.1); -@define-color wm_title_unfocused mix(@dark_fg_color, @dark_bg_color, 0.6); -@define-color wm_border_focused shade(@theme_bg_color, 0.5); -@define-color wm_border_unfocused shade(@theme_bg_color, 0.5); +@define-color wm_bg #1e1e1e; +@define-color wm_title_focused #ededed; +@define-color wm_title_unfocused #626262; +@define-color wm_border_focused #3f3f3f; +@define-color wm_border_unfocused #3f3f3f; @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); @import url("apps/gnome-applications.css"); @import url("apps/unity.css"); +@import url("apps/xfce.css"); diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/gtk-widgets-assets.css shimmer-themes-1.6.2/albatross/gtk-3.0/gtk-widgets-assets.css --- shimmer-themes-1.6.1/albatross/gtk-3.0/gtk-widgets-assets.css 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/gtk-widgets-assets.css 2013-09-13 18:24:14.000000000 -0400 @@ -18,6 +18,7 @@ /******************* * check and radio * *******************/ +/* draw regular check and radio items using our assets */ .check, .check row:selected, .check row:selected:focus { @@ -38,8 +39,7 @@ .check:active:insensitive, .check row:selected:active:insensitive, -.check row:selected:focus:active:insensitive -{ +.check row:selected:focus:active:insensitive { background-image: url("assets/checkbox-checked-insensitive.png"); } @@ -103,6 +103,11 @@ background-image: url("assets/menuitem-checkbox-checked-insensitive.png"); } +.menuitem.check:inconsistent:hover, +.menuitem.radio:inconsistent:hover { + background-image: url("assets/menuitem-checkbox-mixed-selected.png"); +} + .menuitem.check:inconsistent, .menuitem.radio:inconsistent { background-image: url("assets/menuitem-checkbox-mixed.png"); @@ -113,11 +118,6 @@ background-image: url("assets/menuitem-checkbox-mixed-insensitive.png"); } -.menuitem.check:inconsistent:hover, -.menuitem.radio:inconsistent:hover { - background-image: url("assets/menuitem-checkbox-mixed-selected.png"); -} - .menuitem.radio:active { background-image: url("assets/menuitem-radio-checked.png"); } @@ -129,3 +129,11 @@ .menuitem.radio:active:insensitive { background-image: url("assets/menuitem-radio-checked-insensitive.png"); } + +GtkIconView.content-view.cell.check { + background-image: url("assets/grid-selection-unchecked.png"); +} + +GtkIconView.content-view.cell.check:active { + background-image: url("assets/grid-selection-checked.png"); +} diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/gtk-widgets.css shimmer-themes-1.6.2/albatross/gtk-3.0/gtk-widgets.css --- shimmer-themes-1.6.1/albatross/gtk-3.0/gtk-widgets.css 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/gtk-widgets.css 2013-09-13 18:24:14.000000000 -0400 @@ -1,130 +1,171 @@ /* NOTES to contributors: - * use 4 spaces intends, and keep code ALIGNED and ORDERED */ + * use 4 spaces indents, and keep code ALIGNED and ORDERED */ /* default */ * { engine: none; background-clip: padding-box; - border-width: 1px; -GtkArrow-arrow-scaling: 0.6; -GtkButton-child-displacement-x: 0; -GtkButton-child-displacement-y: 1; -GtkButton-default-border: 0; -GtkButton-image-spacing: 0; - -GtkButton-interior-focus: true; -GtkButton-inner-border: 1; + -GtkButton-interior-focus: true; -GtkCheckButton-indicator-size: 16; -GtkCheckMenuItem-indicator-size: 12; - -GtkEntry-inner-border: 1; - -GtkEntry-progress-border: 2; -GtkExpander-expander-size: 16; -GtkHTML-link-color: @link_color; -GtkIMHtml-hyperlink-color: @link_color; -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; - -GtkMenuBar-internal-padding: 0; - -GtkMenuItem-arrow-scaling: 0.5; + -GtkMenu-vertical-padding: 0; -GtkNotebook-initial-gap: 0; - -GtkNotebook-tab-overlap: 1; -GtkPaned-handle-size: 1; -GtkProgressBar-min-horizontal-bar-height: 21; -GtkProgressBar-min-vertical-bar-width: 21; -GtkRange-slider-width: 13; -GtkRange-stepper-size: 12; - -GtkRange-stepper-spacing: 1; + -GtkRange-stepper-spacing: 0; + -GtkRange-trough-border: 0; -GtkRange-trough-under-steppers: 1; - -GtkScale-trough-border: 1; - -GtkScrollbar-activate-slider: 1; - -GtkScrollbar-trough-border: 0; - -GtkScrollbar-slider-width: 13; + -GtkScrollbar-has-backward-stepper: true; + -GtkScrollbar-has-forward-stepper: true; -GtkScrollbar-min-slider-length: 35; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkScrolledWindow-scrollbars-within-bevel: 1; - -GtkSeparatorMenuItem-horizontal-padding: 0; -GtkStatusbar-shadow-type: none; -GtkTextView-error-underline-color: @error_color; -GtkToolButton-icon-spacing: 6; -GtkToolItemGroup-expander-size: 11; - -GtkToolbar-internal-padding: 1; - -GtkTreeView-expander-size: 14; - -GtkTreeView-vertical-separator: 0; - -GtkWidget-wide-separators: true; - -GtkWidget-separator-width: 1; - -GtkWidget-separator-height: 1; - -GtkWidget-focus-padding: 0; + -GtkTreeView-expander-size: 1; -GtkWidget-focus-line-width: 1; + -GtkWidget-focus-padding: 0; -GtkWidget-link-color: @link_color; - -GtkWidget-visited-link-color: @visited_link_color; - -GtkWindow-resize-grip-width: 0; + -GtkWidget-visited-link-color: @link_color; -GtkWindow-resize-grip-height: 0; + -GtkWindow-resize-grip-width: 0; -WnckTasklist-fade-overlay-rect: 0; + + outline-color: alpha(@theme_selected_bg_color, 0.5); + outline-style: solid; + outline-offset: 0; } -GtkWindow { +/*************** + * base states * + ***************/ +.background { + background-color: @theme_bg_color; color: @theme_fg_color; } -* { - /* inherit the color from parent by default */ - color: inherit; - background-color: inherit; +.background.client-decorated { + background-color: transparent; } -/********** - * states * - **********/ -*:insensitive { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); +.background.window-content { + background-color: @theme_bg_color; +} + +GtkClutterOffscreen { + background-color: @theme_bg_color; + color: @theme_fg_color; +} + +*:selected, +*:selected:focus { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } *:active { background-color: shade(@theme_bg_color, 0.9); } -*:active:hover:insensitive { +*:insensitive, +*:insensitive:insensitive { + color: mix(@theme_fg_color, @theme_bg_color, 0.5); } -*:active:insensitive { +/* apply effects to insensitive and prelit images */ +*:insensitive { + -gtk-image-effect: dim; } *:hover { + -gtk-image-effect: highlight; } -*:hover:insensitive { +.gtkstyle-fallback { + background-color: @theme_bg_color; + color: @theme_fg_color; } -*:selected, -*:selected:focus { - background-color: alpha(@theme_selected_bg_color, 0.9); +.gtkstyle-fallback:prelight { + background-color: shade(@theme_bg_color, 1.1); + color: @theme_fg_color; +} + +.gtkstyle-fallback:active { + background-color: shade(@theme_bg_color, 0.9); + color: @theme_fg_color; +} + +.gtkstyle-fallback:insensitive { + background-color: shade(shade(@theme_bg_color, 0.95), 1.05); + color: mix(@theme_fg_color, @theme_bg_color, 0.5); +} + +.gtkstyle-fallback:selected { + background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } /****************** - * common effects * + * visual effects * ******************/ +/* transitions */ +.button { + transition: border 100ms ease-in-out; +} + +.entry { + transition: border 100ms ease-out; +} + +.entry:focus { + transition: border 100ms ease-in; +} + +/* inset shadows */ .button, .progressbar, +.scale.highlight.left, GtkSwitch.slider { - box-shadow: inset 1px 1px alpha(@theme_base_color, 0.3), - inset -1px 1px alpha(@theme_base_color, 0.3); + box-shadow: inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); } +.scale.highlight.bottom, .progressbar.vertical { - box-shadow: inset 1px 1px alpha(@theme_base_color, 0.3), - inset 1px -1px alpha(@theme_base_color, 0.3); + box-shadow: inset 1px 1px alpha(@light_shadow, 0.3), + inset 1px -1px alpha(@light_shadow, 0.3); } -.button:active { - box-shadow: inset 1px 1px alpha(@dark_bg_color, 0.1), - inset -1px -1px alpha(@dark_bg_color, 0.1); +.button:active, +.primary-toolbar .button:active, +.toolbar .button:active, +.header-bar .button:active { + box-shadow: inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); } .entry, .trough { - box-shadow: inset 1px 1px alpha(@dark_bg_color, 0.05), - inset -1px -1px alpha(@dark_bg_color, 0.05); + box-shadow: inset 1px 1px alpha(@dark_shadow, 0.05), + inset -1px -1px alpha(@dark_shadow, 0.05); } .entry:focus { @@ -133,45 +174,26 @@ inset -1px -1px alpha(@theme_selected_bg_color, 0.3); } +.menuitem:active, .menuitem:hover { box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.1), inset -1px 1px alpha(@theme_selected_bg_color, 0.1); } -/* draw borders using box shadow */ -GtkScale.slider, -GtkScale.trough { - box-shadow: inset 1px 0px shade(@theme_bg_color, 0.7), - inset 0px 1px shade(@theme_bg_color, 0.7), - inset -1px 0px shade(@theme_bg_color, 0.7), - inset 0px -1px shade(@theme_bg_color, 0.7); -} - -.menubar .menuitem .scale.highlight.left, -.scale.highlight.left, -.scale.highlight.bottom { - box-shadow: inset 1px 0px shade(@theme_selected_bg_color, 0.7), - inset 0px 1px shade(@theme_selected_bg_color, 0.7), - inset -1px 0px shade(@theme_selected_bg_color, 0.7), - inset 0px -1px shade(@theme_selected_bg_color, 0.7); -} - -GtkScale.slider:insensitive, -GtkScale.trough:insensitive, -.scale.highlight.left:insensitive, -.scale.highlight.bottom:insensitive { - box-shadow: inset 1px 0px shade(@theme_bg_color, 0.8), - inset 0px 1px shade(@theme_bg_color, 0.8), - inset -1px 0px shade(@theme_bg_color, 0.8), - inset 0px -1px shade(@theme_bg_color, 0.8); -} - -/* disable box shadow */ +/* disable inset shadow */ .button:insensitive, -.primary-toolbar GtkComboBox, -.primary-toolbar .button *, -.primary-toolbar .button, +.primary-toolbar .button:insensitive, +.toolbar .button:insensitive, +.header-bar .button:insensitive, +.button:active *:insensitive, +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive, +.entry:insensitive, +.scrollbar.button, GtkCalendar.button, +.scale.highlight.left:insensitive, +.scale.highlight.bottom:insensitive, GtkSwitch.slider:insensitive { box-shadow: none; } @@ -184,48 +206,47 @@ } GtkAssistant .sidebar { - background-color: @theme_bg_color; + padding: 2px; + border-width: 0 1px 0 0; + border-style: solid; border-right-color: shade(@theme_bg_color, 0.7); border-radius: 0; - border-style: solid; - border-width: 0 1px 0 0; - padding: 12px; - - color: @theme_fg_color; -} - -/************** - * background * - **************/ -.background { background-color: @theme_bg_color; - border-width: 0; + color: mix(@theme_fg_color, @theme_bg_color, 0.1); } /********** * button * **********/ .button { - padding: 3px; -} + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; -GtkSwitch.slider, -GtkComboBox.combobox-entry .button, -.button { + padding: 3px; + border-width: 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.7); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); - border-radius: 2px; - border-color: shade(@theme_bg_color, 0.7); - border-style: solid; color: @theme_fg_color; } -GtkComboBox.combobox-entry .button:active, +.button:hover { + border-color: shade(@theme_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), + to (shade(@theme_selected_bg_color, 1.09))); +} + .button:active { + border-color: shade(@theme_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 0.98), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 0.91), 1.04)), @@ -233,10 +254,8 @@ to (shade(@theme_bg_color, 0.82))); } -GtkComboBox.combobox-entry .button:hover, -GtkComboBox.combobox-entry .button:active:hover, -.button:hover, .button:active:hover { + border-color: shade(@theme_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), @@ -244,18 +263,24 @@ to (shade(@theme_selected_bg_color, 1.09))); } -GtkSwitch.slider:insensitive, -GtkComboBox.combobox-entry .button:insensitive, +.button:focus, +.button:hover:focus, +.button:active:focus, +.button:active:hover:focus { + border-color: shade(@theme_selected_bg_color, 0.8); +} + .button:insensitive { + border-color: shade(@theme_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); - border-color: shade(@theme_bg_color, 0.8); } -.button:insensitive:active { +.button:active *:insensitive { + border-color: shade(@theme_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 0.98), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 0.91), 1.04)), @@ -263,96 +288,35 @@ to (shade(@theme_bg_color, 0.82))); } -/* middle button */ -.linked .entry, -.linked .button, -.linked .button:active, -.linked .button:active:hover, -.linked .button:insensitive, -.primary-toolbar .linked .entry, -.primary-toolbar .linked .button, -.primary-toolbar .linked .button:active, -.primary-toolbar .linked .button:active:hover, -.primary-toolbar .linked .button:insensitive { - border-width: 1px; - border-right-width: 0; - - border-radius: 0; -} - -/* leftmost button */ -.linked .entry:first-child, -.linked .button:first-child, -.linked .button:active:first-child, -.linked .button:active:hover:first-child, -.linked .button:insensitive:first-child, -.primary-toolbar .linked .entry:first-child, -.primary-toolbar .linked .button:first-child, -.primary-toolbar .linked .button:active:first-child, -.primary-toolbar .linked .button:active:hover:first-child, -.primary-toolbar .linked .button:insensitive:first-child { - border-width: 1px; - border-right-width: 0; - - border-radius: 2px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -/* rightmost button */ -.linked .entry:last-child, -.linked .button:last-child, -.linked .button:active:last-child, -.linked .button:active:hover:last-child, -.linked .button:insensitive:last-child, -.primary-toolbar .linked .entry:last-child, -.primary-toolbar .linked .button:last-child, -.primary-toolbar .linked .button:active:last-child, -.primary-toolbar .linked .button:active:hover:last-child, -.primary-toolbar .linked .button:insensitive:last-child { - border-width: 1px; - - border-radius: 2px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -/* linked single button */ -.linked .entry:only-child, -.linked .button:only-child, -.linked .button:active:only-child, -.linked .button:active:hover:only-child, -.linked .button:insensitive:only-child, -.primary-toolbar .linked .entry:only-child, -.primary-toolbar .linked .button:only-child, -.primary-toolbar .linked .button:active:only-child, -.primary-toolbar .linked .button:active:hover:only-child, -.primary-toolbar .linked .button:insensitive:only-child { - border-width: 1px; - - border-radius: 2px; -} - /**************** * cell and row * ****************/ .cell { - background-color: @theme_base_color; - border-radius: 0; border-width: 0; + border-radius: 0; +} + +.cell:selected, +.cell:selected:focus { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } row:selected, +row:selected:hover, row:selected:focus { + border-width: 1px 0; + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.97); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_selected_bg_color, 1.09)), color-stop (0.50, shade(@theme_selected_bg_color, 1.01)), to (shade(@theme_selected_bg_color, 0.91))); - border-color: shade(@theme_selected_bg_color, 0.97); - border-style: solid; - border-width: 1px 0; color: @theme_selected_fg_color; + + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; } /******************* @@ -362,8 +326,8 @@ .radio, .check:insensitive, .radio:insensitive { - background-color: transparent; border-style: none; + background-color: transparent; } GtkCheckButton:hover, @@ -378,20 +342,28 @@ *****************/ column-header .button, column-header .button:active { - border-radius: 0; border-width: 0 1px 1px 0; + border-radius: 0; } -column-header .button { +column-header .button, +column-header .button:active, +column-header .button:focus, +column-header .button:active:focus { + border-color: shade(@theme_base_color, 0.9); + border-bottom-color: shade(@theme_base_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.14)), color-stop (0.50, shade(shade(@theme_bg_color, 1.01), 1.14)), to (shade(@theme_bg_color, 0.91))); - border-color: shade(@theme_bg_color, 0.9); - border-bottom-color: shade(@theme_bg_color, 0.8); } -column-header .button:hover { +column-header .button:hover, +column-header .button:active:hover, +column-header .button:hover:focus, +column-header .button:active:hover:focus { + border-color: shade(@theme_base_color, 0.9); + border-bottom-color: shade(@theme_base_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.18)), color-stop (0.50, shade(shade(@theme_bg_color, 1.01), 1.18)), @@ -403,24 +375,57 @@ } /**************** - * drawing area * + * content view * ****************/ -GtkDrawingArea { - background-color: transparent; +.content-view.view { + background-color: @theme_base_color; } -/************ -* gucharmap * -*************/ -GucharmapChartable { - background-color: @theme_base_color; +.content-view.view:prelight { + background-color: alpha(@theme_selected_bg_color, 0.6); } -GucharmapChartable:active, -GucharmapChartable:focus, -GucharmapChartable:selected { +.content-view.view:selected, +.content-view.view:active { background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; +} + +.content-view.view:insensitive { + background-color: shade(@theme_base_color, 0.9); +} + +GdMainIconView.content-view { + -GdMainIconView-icon-size: 40; +} + +GtkIconView.content-view.check { + background-color: transparent; +} + +GtkIconView.content-view.check:active { + background-color: transparent; +} + +.content-view.view.check, +.content-view.view.check:active { + background-color: transparent; +} + +GtkIconView.content-view.check:prelight, +GtkIconView.content-view.check:insensitive, +GtkIconView.content-view.check:selected { + background-color: transparent; +} + +/**************** + * drawing area * + ****************/ +GtkDrawingArea { + background-color: transparent; +} + +GtkDrawingArea:insensitive { + background-color: shade(@theme_bg_color, 0.9); } /*********** @@ -482,9 +487,9 @@ GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .entry:focus, GtkComboBox.combobox-entry .entry:insensitive { + border-width: 1px 0 1px 1px; border-top-right-radius: 0; border-bottom-right-radius: 0; - border-width: 1px 0 1px 1px; } .primary-toolbar GtkComboBox.combobox-entry .button, @@ -495,56 +500,51 @@ GtkComboBox.combobox-entry .button:hover, GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:insensitive { - border-top-left-radius: 0; - border-bottom-left-radius: 0; border-width: 1px 1px 1px 1px; -} - -GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button:hover, -GtkComboBox.combobox-entry .button:active { - border-color: shade(@theme_bg_color, 0.7); + border-bottom-left-radius: 0; + border-top-left-radius: 0; } /********* * entry * *********/ .entry { - background-image: none; - background-color: @theme_base_color; + padding: 4px 3px; + border-width: 1px; + border-style: solid; border-color: shade(@theme_bg_color, 0.7); border-radius: 2px; - border-style: solid; - padding: 3px 5px 3px 5px; - + background-color: @theme_base_color; + background-image: none; color: @theme_text_color; } +.entry:active, +.entry:focus { + border-color: shade(@theme_selected_bg_color, 0.8); +} + .entry:selected, .entry:selected:focus { background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; } .entry:insensitive { - background-color: shade(@theme_bg_color, 0.96); - background-image: none; border-color: shade(@theme_bg_color, 0.8); - - color: mix(@theme_text_color, @theme_base_color, 0.4); + background-color: shade(@theme_bg_color, 0.95); + background-image: none; + color: mix(@theme_text_color, @theme_base_color, 0.5); } -.primary-toolbar .entry.progressbar, -.primary-toolbar .entry.progressbar, .entry.progressbar { - background-image: -gtk-gradient(linear, left top, left bottom, + border-width: 0; + border-radius: 2px; + background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 0.92), 1.04)), color-stop (0.49, shade(shade(@theme_selected_bg_color, 0.86), 1.04)), color-stop (0.50, shade(@theme_selected_bg_color, 0.86)), to (shade(@theme_selected_bg_color, 0.77))); - border-radius: 2px; - border-width: 0; color: @theme_selected_fg_color; } @@ -553,56 +553,64 @@ * expander * ************/ .expander { - border-style: solid; - border-width: 1px; - border-radius: 2px; - border-color: alpha(@theme_fg_color, 0.5); - - color: alpha(@theme_fg_color, 0.6); - background-color: @theme_base_color; + color: alpha(@theme_fg_color, 0.7); } .expander:hover { - background-color: shade(@theme_bg_color, 1.02); + color: alpha(@theme_fg_color, 0.8); } /********* * frame * *********/ .frame { - border-radius: 2px; + border-width: 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.7); + border-radius: 0; +} + +/******************* + * scrolled window * + *******************/ +GtkScrolledWindow.frame { + border-width: 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.7); + border-radius: 0; +} + +/* avoid double borders when a viewport is + * packed into a GtkScrolledWindow */ +GtkScrolledWindow GtkViewport.frame { + border-style: none; } /************ * iconview * ************/ -GtkIconView { - background-color: transparent; -} - GtkIconView.view.cell:selected, GtkIconView.view.cell:selected:focus { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.8); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_selected_bg_color, 1.09)), color-stop (0.50, shade(@theme_selected_bg_color, 1.01)), to (shade(@theme_selected_bg_color, 0.91))); - border-radius: 2px; - border-style: solid; - border-width: 1px; color: @theme_selected_fg_color; - border-color: shade(@theme_bg_color, 0.7); } +.content-view.view.rubberband, .view.rubberband, .rubberband { - background-color: alpha(@theme_selected_bg_color, 0.3); - border-color: @theme_selected_bg_color; - border-radius: 0; - border-style: solid; border-width: 1px; + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.9); + border-radius: 0; + background-color: alpha(@theme_selected_bg_color, 0.3); } /********* @@ -626,94 +634,145 @@ /*********** * infobar * ***********/ +GtkInfoBar { + border-width: 0; + border-style: none; +} + .info { + border-width: 1px; + border-style: solid; + border-color: shade(@info_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@info_bg_color, 1.09)), color-stop (0.50, shade(@info_bg_color, 1.01)), to (shade(@info_bg_color, 0.91))); - border-style: solid; - border-width: 1px; color: @info_fg_color; - border-color: shade(@info_bg_color, 0.7); +} + +.info .button.close { + color: @info_fg_color; +} + +.info .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.info .button.close:active { + color: @info_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); } .warning { + border-width: 1px; + border-style: solid; + border-color: shade(@warning_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@warning_bg_color, 1.09)), color-stop (0.50, shade(@warning_bg_color, 1.01)), to (shade(@warning_bg_color, 0.91))); - border-style: solid; - border-width: 1px; color: @warning_fg_color; - border-color: shade(@warning_bg_color, 0.7); +} + +.warning .button.close { + color: @warning_fg_color; +} + +.warning .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.warning .button.close:active { + color: @warning_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); } .question { + border-width: 1px; + border-style: solid; + border-color: shade(@question_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@question_bg_color, 1.09)), color-stop (0.50, shade(@question_bg_color, 1.01)), to (shade(@question_bg_color, 0.91))); - border-style: solid; - border-width: 1px; color: @question_fg_color; - border-color: shade(@question_bg_color, 0.7); } -.error { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@error_bg_color, 1.09)), - color-stop (0.50, shade(@error_bg_color, 1.01)), - to (shade(@error_bg_color, 0.91))); - border-style: solid; - border-width: 1px; +.question .button.close { + color: @question_fg_color; +} - color: @error_fg_color; - border-color: shade(@error_bg_color, 0.7); +.question .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); } -/************ - * gtkstyle * - ************/ -.gtkstyle-fallback { - background-color: @theme_bg_color; - color: @theme_fg_color; +.question .button.close:active { + color: @question_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); } -.gtkstyle-fallback:prelight { - background-color: shade(@theme_bg_color, 1.10); - color: @theme_fg_color; +.error { + border-width: 1px; + border-style: solid; + border-color: shade(@error_bg_color, 0.8); + background-color: @error_bg_color; + background-image: none; + color: @error_fg_color; } -.gtkstyle-fallback:active { - background-color: shade(@theme_bg_color, 0.90); - color: @theme_fg_color; +.error .button.close { + color: @error_fg_color; } -.gtkstyle-fallback:insensitive { - background-color: shade(shade(@theme_bg_color, 1.09), 1.04); - color: mix(@theme_fg_color, @theme_bg_color, 0.5); +.error .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); } -.gtkstyle-fallback:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; +.error .button.close:active { + color: @error_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); } /******************* * symbolic images * *******************/ -.image { +.image, +.view.image { color: alpha(@theme_fg_color, 0.5); } -.image:hover { +.image:hover, +.view.image:hover { color: @theme_fg_color; } -.image:selected { +.image:selected, +.image:selected:hover, +.view.image:selected, +.view.image:selected:hover { color: @theme_selected_fg_color; } @@ -721,14 +780,16 @@ * miscellaneous * *****************/ .floating-bar { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.8); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_bg_color, 1.09)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); - border-color: shade(@theme_bg_color, 0.7); - border-radius: 2px; - border-width: 1px; - border-style: solid; + + color: @theme_fg_color; } .floating-bar.top { @@ -751,72 +812,81 @@ .floating-bar.left { border-left-width: 0; - border-top-left-radius: 0; border-bottom-left-radius: 0; + border-top-left-radius: 0; } .floating-bar .button { - background-color: transparent; - background-image: none; - - border-style: none; - -GtkButton-image-spacing: 0; -GtkButton-inner-border: 0; -} -.view.dim-label, -.dim-label, -.dim-label:hover, -.dim-label:focus { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); + border-style: none; + background-color: transparent; + background-image: none; } -.dim-label:selected, -.dim-label:selected:focus { - color: mix(@theme_selected_fg_color, @theme_bg_color, 0.5); +.view.dim-label, +.dim-label { + color: alpha(currentColor, 0.5); } .dnd { - border-color: shade(@theme_selected_bg_color, 1.12); border-width: 1px; border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.9); } .grip { background-color: transparent; } +.arrow { + color: alpha(@theme_fg_color, 0.7); +} + /******** * menu * ********/ GtkTreeMenu.menu, GtkMenuToolButton.menu, GtkComboBox .menu { - background-color: @dark_bg_color; + background-color: @menu_bg_color; } +.primary-toolbar .menu, .primary-toolbar .button .menu, .toolbar .menu, .toolbar .primary-toolbar .menu, +.header-bar .menu, +.header-bar .primary-toolbar .menu, .menu { padding: 0; border-radius: 0; border-style: none; - background-color: @dark_bg_color; - color: @dark_fg_color; + background-color: @menu_bg_color; + color: @menu_fg_color; } .menu.button:hover, .menu.button:active, -.menu.button:active:insensitive, +.menu.button:active *:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; - background-color: @dark_bg_color; + background-color: @menu_bg_color; background-image: none; } +.context-menu { + font: initial; +} + +/* ubuntu software center menu */ +#toolbar-popup { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + /*********** * menubar * ***********/ @@ -824,9 +894,9 @@ -GtkWidget-window-dragging: true; border-style: none; - background-color: shade(@theme_fg_color, 0.95); + background-color: @menubar_bg_color; background-image: none; - color: @dark_fg_color; + color: @menubar_fg_color; } /*************** @@ -834,25 +904,26 @@ ***************/ .menubar.menuitem, .menubar .menuitem { - padding: 3px 5px 3px 5px; + padding: 3px 5px; + border-width: 1px; border-radius: 2px 2px 0 0; - border-width: 1px 1px 0 1px; border-style: solid; border-color: transparent; background-color: transparent; background-image: none; - color: @dark_fg_color; + color: @menubar_fg_color; } .menubar.menuitem:hover, .menubar .menuitem:hover { + border-color: shade(shade(@theme_selected_bg_color, 0.77), 0.85); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 0.92), 1.04)), color-stop (0.49, shade(shade(@theme_selected_bg_color, 0.86), 1.04)), color-stop (0.50, shade(@theme_selected_bg_color, 0.86)), to (shade(@theme_selected_bg_color, 0.77))); - border-color: shade(shade(@theme_selected_bg_color, 0.77), 0.85); + color: @theme_selected_fg_color; } .menubar .menuitem *:hover { @@ -867,10 +938,6 @@ border-width: 0; } -GtkTreeMenu .menuitem * { - color: @dark_fg_color; -} - .menuitem, .menu .menuitem { padding: 3px; @@ -880,14 +947,14 @@ border-radius: 0; background-color: transparent; background-image: none; - color: @dark_fg_color; + color: @menu_fg_color; -GtkMenuItem-arrow-scaling: 0.5; } .menu .menuitem:active, .menu .menuitem:hover { - border-color: shade(@theme_selected_bg_color, 0.9); + border-color: shade(@theme_selected_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_selected_bg_color, 1.1)), to (shade(@theme_selected_bg_color, 0.9))); @@ -902,7 +969,7 @@ .menu .menuitem:insensitive, .menu .menuitem *:insensitive { - color: mix(@dark_fg_color, @dark_bg_color, 0.5); + color: mix(@menu_fg_color, @menu_bg_color, 0.5); } .menuitem.check, @@ -916,18 +983,18 @@ background-image: none; } -.menuitem.arrow { - color: alpha(@dark_fg_color, 0.6); -} - .menuitem.check:active, .menuitem.radio:active { border-style: none; background-color: transparent; } +.menuitem.arrow { + color: alpha(@menu_fg_color, 0.6); +} + .menuitem GtkCalendar:inconsistent { - color: mix(@dark_fg_color, @dark_bg_color, 0.5); + color: mix(@menu_fg_color, @menu_bg_color, 0.5); } .menuitem GtkCalendar.button { @@ -937,19 +1004,19 @@ } .menuitem .entry { - border-color: shade(@dark_bg_color, 0.7); - background-color: @dark_bg_color; + border-color: shade(@menu_bg_color, 0.7); + background-color: @menu_bg_color; background-image: none; - color: @dark_fg_color; + color: @menu_fg_color; } .menuitem .entry:active, .menuitem .entry:focus { - border-color: shade(@theme_selected_bg_color, 0.8); + border-color: shade(@menu_bg_color, 0.7); } .menuitem .accelerator { - color: alpha(@dark_fg_color, 0.6); + color: alpha(@menu_fg_color, 0.6); } .menuitem .accelerator:hover { @@ -957,94 +1024,111 @@ } .menuitem .accelerator:insensitive { - color: alpha(mix(@dark_fg_color, @dark_bg_color, 0.5), 0.6); + color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6); +} + +GtkModelMenuItem GtkBox GtkImage { + padding-right: 4px; } /************ * notebook * ************/ .notebook { + padding: 0; + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.7); + border-radius: 2px; background-color: shade(@theme_bg_color, 1.03); background-image: none; - border-radius: 0; - border-style: solid; - border-color: shade(@theme_bg_color, 0.7); - padding: 0; + background-clip: border-box; +} + +.notebook GtkViewport { + background-color: @theme_base_color; + color: @theme_text_color; } .notebook tab { + padding: 3px; + border-color: shade(@theme_base_color, 0.75); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_bg_color, 0.99)), to (shade(@theme_bg_color, 0.95))); - border-color: shade(@theme_bg_color, 0.7); } .notebook tab:active { + border-color: shade(@theme_base_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_bg_color, 1.02)), to (shade(@theme_bg_color, 1.03))); } .notebook tab GtkLabel { - padding: 1px 1px 2px 1px; + color: @theme_text_color; } .notebook tab.top { padding: 3px; - border-radius: 2px 2px 0 0; + border-width: 1px 1px 0 1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } .notebook tab.top:active { padding: 4px 3px; - border-width: 1px 1px 0 1px; } .notebook tab.right { padding: 3px; - border-radius: 0 2px 2px 0; + border-width: 1px 1px 1px 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; } .notebook tab.right:active { padding: 3px 4px; - border-width: 1px 1px 1px 0; } .notebook tab.bottom { padding: 3px; - border-radius: 0 0 2px 2px; + border-width: 0 1px 1px 1px; + border-top-right-radius: 0; + border-top-left-radius: 0; } .notebook tab.bottom:active { padding: 4px 3px; - border-width: 0 1px 1px 1px; } .notebook tab.left { padding: 3px; - border-radius: 2px 0 0 2px; + border-width: 1px 0 1px 1px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } .notebook tab.left:active { padding: 3px 4px; - border-width: 1px 0 1px 1px; } /****************** * pane separator * ******************/ .pane-separator { - color: shade(@theme_bg_color, 0.7); - border-width: 0; + background-color: @theme_bg_color; + color: transparent; } /************************* * progressbar and scale * *************************/ -GtkScale, GtkProgressBar { - border-radius: 2px; - border-width: 1px; padding: 2px; + border-width: 1px; + border-radius: 2px; } .progressbar, @@ -1052,61 +1136,56 @@ .progressbar row:hover, .progressbar row:selected, .progressbar row:selected:focus { - border-style: solid; border-width: 1px; border-radius: 0; - border-color: shade(@theme_selected_bg_color, 0.7); + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.8); + /* background image defined in assets */ } .progressbar.vertical { - border-style: solid; - border-width: 1px; - border-radius: 0; - border-color: shade(@theme_selected_bg_color, 0.7); } .trough, -.trough.vertical, .trough row, .trough row:hover, .trough row:selected, .trough row:selected:focus { - background-image: none; - background-color: shade(@theme_bg_color, 0.85); - border-style: solid; border-width: 1px; - - color: @theme_text_color; + border-style: solid; border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 0.85); + background-image: none; +} + +.trough.vertical { } /* level bars as used for password quality or remaining power */ GtkLevelBar { -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 3; + -GtkLevelBar-min-block-height: 2; } GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-width: 2; -GtkLevelBar-min-block-height: 34; } .level-bar.trough { - padding: 2px; + padding: 1px; + border-radius: 2px; } .level-bar.fill-block { border-width: 1px; border-style: solid; - - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.15)), - to (shade(@theme_selected_bg_color, 0.95))); - border-color: shade(@theme_selected_bg_color, 0.7); + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; } .level-bar.indicator-continuous.fill-block { - padding: 2px; + padding: 1px; border-radius: 2px; } @@ -1137,7 +1216,6 @@ .level-bar.indicator-discrete.fill-block.vertical:last-child { border-radius: 0 0 2px 2px; } - */ .level-bar.fill-block.level-high { @@ -1154,53 +1232,68 @@ background-image: linear-gradient(to bottom, shade(@warning_bg_color, 1.3), @warning_bg_color 75%, - shade(@warning_bg_color, 0.90) + shade(@warning_bg_color, 0.9) ); } .level-bar.fill-block.empty-fill-block { + border-color: alpha(@theme_fg_color, 0.1); background-color: transparent; background-image: none; - border-color: alpha(@theme_fg_color, 0.1); } -GtkScale { +.scale { + padding: 0; + border-width: 1px; + border-radius: 2px; + -GtkRange-slider-width: 13; -GtkRange-trough-border: 1; -GtkScale-slider-length: 24; } -GtkScale.vertical { - -GtkScale-slider-length: 24; -} - -GtkScale.slider { - color: transparent; +.scale.slider { + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); - border-radius: 2px; + + /* we will draw the border using box shadow for now */ + box-shadow: inset 1px 0 shade(@theme_bg_color, 0.8), + inset 0 1px shade(@theme_bg_color, 0.8), + inset -1px 0 shade(@theme_bg_color, 0.8), + inset 0 -1px shade(@theme_bg_color, 0.8); } -GtkScale.slider:hover { +.scale.slider:hover { background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), to (shade(@theme_selected_bg_color, 1.09))); + + box-shadow: inset 1px 0 shade(@theme_bg_color, 0.7), + inset 0 1px shade(@theme_bg_color, 0.7), + inset -1px 0 shade(@theme_bg_color, 0.7), + inset 0 -1px shade(@theme_bg_color, 0.7); } -GtkScale.slider:insensitive { +.scale.slider:insensitive { background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); + + box-shadow: inset 1px 0 shade(@theme_bg_color, 0.9), + inset 0 1px shade(@theme_bg_color, 0.9), + inset -1px 0 shade(@theme_bg_color, 0.9), + inset 0 -1px shade(@theme_bg_color, 0.9); } -GtkScale.slider.vertical { +.scale.slider.vertical { background-image: -gtk-gradient(linear, left top, right top, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), @@ -1208,7 +1301,7 @@ to (shade(@theme_bg_color, 0.91))); } -GtkScale.slider.vertical:hover { +.scale.slider.vertical:hover { background-image: -gtk-gradient(linear, left top, right top, from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), @@ -1216,7 +1309,7 @@ to (shade(@theme_selected_bg_color, 1.09))); } -GtkScale.slider.vertical:insensitive { +.scale.slider.vertical:insensitive { background-image: -gtk-gradient(linear, left top, right top, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), @@ -1224,77 +1317,93 @@ to (shade(@theme_bg_color, 0.91))); } -GtkScale.mark { - border-color: shade(@theme_bg_color, 0.7); +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; } -GtkScale.trough, -GtkScale.trough.vertical { - background-image: none; - background-color: shade(@theme_bg_color, 0.85); - border-color: transparent; +.scale.mark { + border-color: shade(@theme_bg_color, 0.7); } -.menubar .menuitem .scale.highlight.left, -.scale.highlight.left, -.scale.highlight.bottom { +.scale.trough { + margin: 5px 0; + border-color: shade(@theme_bg_color, 0.7); + border-radius: 2px; + background-color: shade(@theme_bg_color, 0.85); background-image: none; - background-color: shade(@theme_selected_bg_color, 1.04); - /* we will draw the border using box shadow for now */ - border-color: transparent; } -GtkScale.trough, +.scale.trough.vertical { + margin: 0 5px; +} + .menubar .menuitem .scale.highlight.left, .scale.highlight.left { - border-width: 5px 0; - border-radius: 7px; + border-color: shade(@theme_selected_bg_color, 0.8); + background-color: @theme_selected_bg_color; + background-image: none; } -GtkScale.trough.vertical, -.scale.highlight.bottom { - border-width: 0 5px; - border-radius: 7px; +.menubar .menuitem .scale.highlight.left:hover { + border-color: shade(@theme_selected_bg_color, 0.6); + background-color: shade(@theme_selected_bg_color, 0.8); } - -GtkScale.trough:insensitive, -GtkScale.trough.vertical:insensitive, -.scale.highlight.left:insensitive, -.scale.highlight.bottom:insensitive { +.scale.highlight.bottom { + border-color: @theme_selected_bg_color; + background-color: @theme_selected_bg_color; background-image: none; +} + +.scale.trough:insensitive, +.scale.highlight.left:insensitive { + border-color: shade(@theme_bg_color, 0.85); background-color: shade(@theme_bg_color, 0.9); + background-image: none; } /************* * scrollbar * *************/ .scrollbar { - background-image: none; + border-width: 1px; border-style: solid; + padding: 0; } -.scrollbar.trough, -.scrollbar.trough.horizontal, -.scrollbar.trough.vertical { - background-image: none; - background-color: @theme_bg_color; +.scrollbars-junction, +.scrollbar.trough { border-width: 1px; + border-radius: 0; border-color: shade(@theme_bg_color, 0.9); + background-color: @theme_bg_color; + background-image: none; +} + +.scrollbar.button, +.scrollbar.button:active, +.scrollbar.button:active:hover { + border-width: 0; border-radius: 0; + background-color: transparent; + background-image: none; + color: shade(@theme_bg_color, 0.6); } .scrollbar.slider, .scrollbar.slider.vertical { + border-width: 1px; + border-color: shade(@theme_selected_bg_color, 0.97); + border-radius: 0; background-image: -gtk-gradient(linear, left top, right top, from (shade(@theme_selected_bg_color, 0.91)), color-stop (0.50, shade(@theme_selected_bg_color, 0.96)), to (shade(@theme_selected_bg_color, 0.91))); - border-width: 1px; - border-color: shade(@theme_selected_bg_color, 0.97); - border-radius: 0; - - color: shade(@theme_selected_bg_color, 0.97); } .scrollbar.slider.horizontal { @@ -1304,16 +1413,6 @@ to (shade(@theme_selected_bg_color, 0.91))); } -.scrollbar.button, -.scrollbar.button.vertical, -.scrollbar.button.horizontal { - background-image: none; - background-color: @theme_bg_color; - border-width: 0; - - color: shade(@theme_bg_color, 0.6); -} - .scrollbar.slider:hover, .scrollbar.slider.vertical:hover { background-image: -gtk-gradient(linear, left top, right top, @@ -1329,10 +1428,25 @@ to (shade(@theme_selected_bg_color, 0.95))); } -.scrollbar.button:insensitive, -.scrollbar.button.vertical:insensitive, -.scrollbar.button.horizontal:insensitive { - color: shade(@theme_bg_color, 0.8); +.scrollbar.slider:active, +.scrollbar.slider.vertical:active { + background-image: -gtk-gradient(linear, left top, right top, + from (shade(@theme_selected_bg_color, 0.95)), + color-stop (0.50, shade(@theme_selected_bg_color, 0.99)), + to (shade(@theme_selected_bg_color, 0.95))); +} + +.scrollbar.slider.horizontal:active { + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@theme_selected_bg_color, 0.95)), + color-stop (0.50, shade(@theme_selected_bg_color, 0.99)), + to (shade(@theme_selected_bg_color, 0.95))); +} + +.scrollbar.slider.fine-tune:prelight:active { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; } /* overlay scrollbar */ @@ -1347,45 +1461,65 @@ OsThumb:active, OsScrollbar:active { - background-color: shade(@theme_bg_color, 0.8); + background-color: @theme_selected_bg_color; } OsThumb:insensitive, OsScrollbar:insensitive { - background-color: shade(@theme_bg_color, 0.97); -} - -/******************* - * scrolled window * - *******************/ -GtkScrolledWindow.frame { - border-color: shade(@theme_bg_color, 0.7); - border-radius: 0; - border-style: solid; + background-color: shade(@theme_bg_color, 0.9); } /************* * separator * *************/ +.sidebar.view.separator, +.view.separator, .separator { - color: shade(@theme_bg_color, 0.9); - border-color: shade(@theme_bg_color, 0.9); + border-width: 1px; border-style: solid; + border-color: shade(@theme_bg_color, 0.9); + color: shade(@theme_bg_color, 0.9); } .button .separator, .button.separator { - border-color: shade(@theme_bg_color, 0.9); -} - -.notebook .button .separator, -.notebook .button.separator { - border-color: shade(@theme_bg_color, 0.9); + border-color: shade(@theme_bg_color, 0.95); } .button .separator:insensitive, .button.separator:insensitive { - border-color: shade(@theme_bg_color, 0.9); + border-color: shade(@theme_bg_color, 0.85); +} + +.primary-toolbar GtkSeparatorToolItem, +.primary-toolbar .separator, +.primary-toolbar .separator:insensitive, +.toolbar GtkSeparatorToolItem, +.toolbar .separator, +.toolbar .separator:insensitive +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { + border-color: shade(@toolbar_bg_color, 0.8); + color: shade(@toolbar_bg_color, 0.8); +} + +.primary-toolbar .button .separator, +.primary-toolbar .button.separator, +.toolbar .button .separator, +.toolbar .button.separator, +.header-bar .button .separator, +.header-bar .button.separator { + border-color: shade(@toolbar_bg_color, 0.95); +} + +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive, +.toolbar .button .separator:insensitive, +.toolbar .button.separator:insensitive, +.header-bar .button .separator:insensitive, +.header-bar .button.separator:insensitive { + border-color: shade(@toolbar_bg_color, 0.85); } .menuitem.separator { @@ -1393,7 +1527,16 @@ -GtkWidget-separator-height: 1; border-style: none; - color: shade(@dark_bg_color, 0.9); + color: shade(@menu_bg_color, 0.9); +} + +GtkComboBox .separator { + border-style: none; + + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; } /*********** @@ -1401,8 +1544,10 @@ ***********/ .sidebar, .sidebar.view, -.sidebar .view { +.sidebar .view, +.sidebar GtkScrolledWindow { background-color: @theme_bg_color; + color: mix(@theme_fg_color, @theme_bg_color, 0.1); } .sidebar .frame { @@ -1412,107 +1557,297 @@ /************** * spinbutton * **************/ -.spinbutton.button:active, -.spinbutton.button:insensitive, -.notebook .spinbutton.button:active, -.notebook .spinbutton.button:insensitive, -.spinbutton.button, -.notebook .spinbutton.button { - border-radius: 0; - border-width: 0 0 0 1px; -} - -.spinbutton.button:active:last-child, -.spinbutton.button:insensitive:last-child, -.notebook .spinbutton.button:active:last-child, -.notebook .spinbutton.button:insensitive:last-child, -.spinbutton.button:last-child, -.notebook .spinbutton.button:last-child { +.spinbutton .button { + color: mix(@theme_text_color, @theme_base_color, 0.4); + padding: 2px 4px; + border-width: 0; + border-radius: 0; + border-style: none; + background-color: transparent; + background-image: none; + box-shadow: inset 1px 0 shade(@theme_base_color, 0.9); +} + +.spinbutton .button:insensitive { + color: mix(@theme_text_color, @theme_base_color, 0.7); + box-shadow: inset 1px 0 shade(@theme_bg_color, 0.95); +} + +.spinbutton .button:active, +.spinbutton .button:hover { + color: @theme_fg_color; +} + +.spinbutton .button:first-child { + border-radius: 2px 0 0 2px; + box-shadow: none; +} + +.spinbutton .button:last-child { border-radius: 0 2px 2px 0; } -.spinbutton.button, -.notebook .spinbutton.button { +.spinbutton .button:dir(rtl) { + box-shadow: inset -1px 0 shade(@theme_base_color, 0.9); +} + +.spinbutton.vertical .button { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.7); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); + + color: @theme_fg_color; + box-shadow: none; +} + +.spinbutton.vertical .button:hover { border-color: shade(@theme_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), + to (shade(@theme_selected_bg_color, 1.09))); +} + +.spinbutton.vertical .button:active { + border-color: shade(@theme_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_bg_color, 0.98), 1.04)), + color-stop (0.49, shade(shade(@theme_bg_color, 0.91), 1.04)), + color-stop (0.50, shade(@theme_bg_color, 0.91)), + to (shade(@theme_bg_color, 0.82))); +} + +.spinbutton.vertical .button:active:hover { + border-color: shade(@theme_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), + to (shade(@theme_selected_bg_color, 1.09))); +} + +.spinbutton.vertical .button:focus, +.spinbutton.vertical .button:hover:focus, +.spinbutton.vertical .button:active:focus, +.spinbutton.vertical .button:active:hover:focus { + border-color: shade(@theme_selected_bg_color, 0.7); } -.spinbutton.button:insensitive, -.notebook .spinbutton.button:insensitive { +.spinbutton.vertical .button:insensitive { + border-color: shade(@theme_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); - border-color: shade(@theme_bg_color, 0.8); +} - color: shade(@theme_bg_color, 0.7); +.spinbutton.vertical .button:first-child { + border-width: 1px; + border-bottom-width: 0; + border-radius: 2px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; } -.spinbutton, -.spinbutton:hover { - color: @theme_fg_color; +.spinbutton.vertical .button:last-child { + border-width: 1px; + border-top-width: 0; + border-radius: 2px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +.spinbutton.vertical.entry { + border-width: 1px; + border-style: solid; + border-radius: 0; } /*********** * spinner * ***********/ +@keyframes spinner { + 0.00% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } + + 12.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } + + 25.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)); } + + 37.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)); } + + 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)); } + + 62.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)); } + + 75.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)); } + + 87.5% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)); } + + 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)); } +} + +.spinner { + background-color: transparent; + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); + + background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%; + background-size: 15% 15%; + background-repeat: no-repeat; +} + .spinner:active { - transition: 750ms linear loop; + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.875)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.750)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.625)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.500)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.375)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)), + -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); + + animation: spinner 1s infinite linear; +} + +.menu.spinner, +.primary-toolbar .spinner { + color: @theme_selected_bg_color; } /************* * statusbar * *************/ GtkStatusbar { + padding: 3px; + color: @theme_fg_color; } /********** * switch * **********/ GtkSwitch { - border-radius: 2px; padding: 2px; + border-radius: 2px; + font: regular; } -GtkSwitch.trough { - background-image: none; - background-color: shade(@theme_bg_color, 0.85); - color: @theme_fg_color; +GtkSwitch.slider { + border-width: 1px; + border-radius: 0; + border-style: solid; border-color: shade(@theme_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_bg_color, 1.09), 1.04)), + color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), + color-stop (0.50, shade(@theme_bg_color, 1.01)), + to (shade(@theme_bg_color, 0.91))); } -GtkSwitch.trough:active { - background-image: none; - background-color: shade(@theme_selected_bg_color, 0.85); - color: @theme_selected_fg_color; - border-color: shade(@theme_selected_bg_color, 0.7); -} - -GtkSwitch.trough:insensitive { - background-image: none; - background-color: shade(@theme_bg_color, 0.9); - color: shade(@theme_bg_color, 0.7); +GtkSwitch.slider:insensitive { border-color: shade(@theme_bg_color, 0.8); -} - -GtkSwitch.slider { background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_bg_color, 1.09), 1.04)), color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), color-stop (0.50, shade(@theme_bg_color, 1.01)), to (shade(@theme_bg_color, 0.91))); - border-style: solid; +} + +GtkSwitch.trough { border-color: shade(@theme_bg_color, 0.7); - border-radius: 0; + background-color: shade(@theme_bg_color, 0.85); + background-image: none; + color: @theme_fg_color; } -GtkSwitch.slider:insensitive { +GtkSwitch.trough:active { + border-color: shade(@theme_selected_bg_color, 0.7); + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +GtkSwitch.trough:insensitive { border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 0.9); + background-image: none; + color: mix(@theme_fg_color, @theme_bg_color, 0.5); } /************ @@ -1520,324 +1855,1500 @@ ************/ GtkTextView { background-color: @theme_base_color; + color: @theme_text_color; } -/*********** - * toolbar * - ***********/ -.toolbar { +/***************** + * color chooser * + *****************/ +GtkColorSwatch, +GtkColorSwatch:selected { + border-width: 1px; + border-style: solid; + border-color: alpha(black, 0.1); + border-radius: 1px; background-color: transparent; - border-style: none; - padding: 2px; - color: @theme_fg_color; + background-clip: border-box; } -/* primary-toolbar */ -.primary-toolbar, -.primary-toolbar .toolbar, -.primary-toolbar.toolbar { - -GtkWidget-window-dragging: true; +GtkColorSwatch:hover, +GtkColorSwatch:selected:hover { + border-color: alpha(black, 0.3); +} - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.84)), - to (shade(@theme_bg_color, 1.0))); - border-style: none; - border-width: 0; - padding: 2px; +GtkColorSwatch.color-dark:hover { +} - color: @theme_fg_color; +GtkColorSwatch.color-light:hover { } -.primary-toolbar GtkComboBox, -.primary-toolbar .button *, -.primary-toolbar .button { - background-color: transparent; +GtkColorSwatch.color-light:selected:hover, +GtkColorSwatch.color-dark:selected:hover { background-image: none; - border-color: transparent; - border-radius: 2px; - border-width: 1px; +} + +GtkColorSwatch.left, +GtkColorSwatch:first-child { + border-top-left-radius: 2px; + border-bottom-left-radius: 2px; +} + +GtkColorSwatch.right, +GtkColorSwatch:last-child { + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; +} + +GtkColorSwatch:only-child { + border-radius: 2px; +} + +GtkColorSwatch.top { + border-top-left-radius: 2px; + border-top-right-radius: 2px; +} + +GtkColorSwatch.bottom { + border-bottom-left-radius: 2px; + border-bottom-right-radius: 2px; +} + +GtkColorChooserWidget #add-color-button { + background-clip: padding-box; + border-color: alpha(black, 0.1); + background-color: shade(@theme_bg_color, 0.95); + color: @theme_fg_color; +} + +GtkColorChooserWidget #add-color-button:hover { + border-color: alpha(black, 0.3); + background-color: shade(@theme_bg_color, 0.90); + color: @theme_fg_color; +} + +.color-active-badge, +.color-active-badge:selected { + border-width: 1px; + border-style: solid; + border-width: 2px; + background-color: transparent; +} + +.color-active-badge.color-light, +.color-active-badge.color-light:hover { + border-color: alpha(black, 0.3); + color: alpha(black, 0.3); +} + +.color-active-badge.color-dark, +.color-active-badge.color-dark:hover { + border-color: alpha(white, 0.3); + color: alpha(white, 0.3); +} + +GtkColorEditor GtkColorSwatch { + border-radius: 2px; +} + +GtkColorEditor GtkColorSwatch.color-dark:hover, +GtkColorEditor GtkColorSwatch.color-light:hover { + background-image: none; + border-color: alpha(black, 0.3); +} + +GtkColorButton.button { + padding: 2px; +} + +/************** + * header-bar * + **************/ +.header-bar { + padding: 4px; + border-width: 0 0 1px; + border-style: solid; + border-color: shade(@toolbar_bg_color, 0.8); +} + +.header-bar .button.text-button { + padding: 4px; +} + +.header-bar .button.image-button { + padding: 6px; +} + +.header-bar .title { + font: bold; +} + +.header-bar .subtitle { + font: smaller; +} + +/*********** + * toolbar * + ***********/ +.toolbar { + padding: 4px; + border-style: none; + background-color: @toolbar_bg_color; + background-image: none; +} + +.toolbar .button { + padding: 2px; +} + +.toolbar .button.text-button { + padding: 2px 4px; +} + +.toolbar .button.image-button { + padding: 4px 3px 3px 4px; +} + +.toolbar:insensitive { + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5); + background-color: shade(@toolbar_bg_color, 0.9); +} + +/* menubar toolbars */ +.toolbar.menubar { + -GtkToolbar-button-relief: normal; +} + +/******************* + * primary-toolbar * + *******************/ +.primary-toolbar, +.primary-toolbar .toolbar, +.primary-toolbar.toolbar { + -GtkWidget-window-dragging: true; + padding: 2px; + border-width: 0 0 1px 0; + border-style: solid; + border-color: shade(@toolbar_bg_color, 0.8); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@toolbar_bg_color, 0.84)), + to (shade(@toolbar_bg_color, 1.0))); + + color: @toolbar_fg_color; +} + +.primary-toolbar GtkComboBox, +.primary-toolbar .button { + padding: 2px; + border-width: 1px; + border-color: transparent; + border-radius: 2px; + background-color: transparent; + background-image: none; + color: @toolbar_fg_color; +} + +.primary-toolbar .raised .button, +.primary-toolbar .raised.button, +.toolbar GtkComboBox, +.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { + border-color: shade(@toolbar_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@toolbar_bg_color, 1.09), 1.04)), + color-stop (0.49, shade(shade(@toolbar_bg_color, 1.01), 1.04)), + color-stop (0.50, shade(@toolbar_bg_color, 1.01)), + to (shade(@toolbar_bg_color, 0.91))); + + color: @toolbar_fg_color; +} + +.primary-toolbar .button:hover, +.toolbar .button:hover, +.header-bar .button:hover { + border-color: shade(@toolbar_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), + to (shade(@theme_selected_bg_color, 1.09))); +} + +.primary-toolbar .button:active, +.toolbar .button:active, +.header-bar .button:active { + border-color: shade(@toolbar_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@toolbar_bg_color, 0.98), 1.04)), + color-stop (0.49, shade(shade(@toolbar_bg_color, 0.91), 1.04)), + color-stop (0.50, shade(@toolbar_bg_color, 0.91)), + to (shade(@toolbar_bg_color, 0.82))); +} + +.primary-toolbar .button:active:hover, +.toolbar .button:active:hover, +.header-bar .button:active:hover { + border-color: shade(@toolbar_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), + to (shade(@theme_selected_bg_color, 1.09))); +} + +.primary-toolbar .button:focus, +.primary-toolbar .button:hover:focus, +.primary-toolbar .button:active:focus, +.primary-toolbar .button:active:hover:focus, +.toolbar .button:focus, +.toolbar .button:hover:focus, +.toolbar .button:active:focus, +.toolbar .button:active:hover:focus, +.header-bar .button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:active:hover:focus { + border-color: shade(@theme_selected_bg_color, 0.8); +} + +.primary-toolbar .button:insensitive, +.toolbar .button:insensitive, +.header-bar .button:insensitive { + border-color: shade(@toolbar_bg_color, 0.8); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@toolbar_bg_color, 1.09), 1.04)), + color-stop (0.49, shade(shade(@toolbar_bg_color, 1.01), 1.04)), + color-stop (0.50, shade(@toolbar_bg_color, 1.01)), + to (shade(@toolbar_bg_color, 0.91))); +} + +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive { + border-color: shade(@toolbar_bg_color, 0.8); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@toolbar_bg_color, 0.98), 1.04)), + color-stop (0.49, shade(shade(@toolbar_bg_color, 0.91), 1.04)), + color-stop (0.50, shade(@toolbar_bg_color, 0.91)), + to (shade(@toolbar_bg_color, 0.82))); +} + +.primary-toolbar .entry, +.toolbar .entry, +.header-bar .entry { + border-color: shade(@toolbar_bg_color, 0.7); +} + +.primary-toolbar .entry:active, +.primary-toolbar .entry:focus, +.toolbar .entry:active, +.toolbar .entry:focus, +.header-bar .entry:active, +.header-bar .entry:focus { + border-color: shade(@theme_selected_bg_color, 0.8); +} + +/* inline-toolbar */ +.inline-toolbar.toolbar { + -GtkToolbar-button-relief: normal; + + padding: 1px; + border-width: 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.8); + border-radius: 0; + background-color: @theme_bg_color; + background-image: none; +} + +.inline-toolbar.toolbar:last-child { + border-width: 0 1px 1px 1px; + border-color: shade(@theme_bg_color, 0.8); + border-radius: 0; +} + +.inline-toolbar.toolbar .button { + padding: 1px; + border-width: 1px 0 1px 1px; + border-style: solid; + border-color: shade(@theme_bg_color, 0.8); + border-radius: 0; + background-color: shade(@theme_bg_color, 1.08); + background-image: none; + color: @theme_fg_color; +} + +.inline-toolbar.toolbar .button:hover { + border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 1.10); + background-image: none; +} + +.inline-toolbar.toolbar .button:active { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 0.95); + background-image: none; +} + +.inline-toolbar.toolbar .button:active:hover { + border-color: shade(@theme_bg_color, 0.7); +} + +.inline-toolbar.toolbar .button:focus, +.inline-toolbar.toolbar .button:hover:focus, +.inline-toolbar.toolbar .button:active:focus, +.inline-toolbar.toolbar .button:active:hover:focus { + border-color: shade(@theme_bg_color, 0.7); +} + +.inline-toolbar.toolbar .button *:insensitive, +.inline-toolbar.toolbar GtkToolButton .button:insensitive { + border-color: shade(@theme_bg_color, 0.85); + background-color: shade(@theme_bg_color, 0.9); + background-image: none; +} + +/****************** + * linked buttons * + *****************/ +/* set up shadows for visual separation */ +.linked .button, +.inline-toolbar.toolbar .button, +.inline-toolbar.toolbar GtkToolButton .button, +.inline-toolbar.toolbar GtkToolButton > .button { + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8), + inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); +} + +.linked .button:active, +.inline-toolbar.toolbar .button:active, +.inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton > .button:active { + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8), + inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); +} + +.linked .button:insensitive, +.inline-toolbar.toolbar .button:insensitive, +.inline-toolbar.toolbar GtkToolButton .button:insensitive, +.inline-toolbar.toolbar GtkToolButton > .button:insensitive { + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8); +} + +/* remove box shadow from last-child and only-child */ +.linked .button:active *:insensitive:last-child, +.linked .button:active *:insensitive:only-child, +.inline-toolbar.toolbar .button:active *:insensitive:last-child, +.inline-toolbar.toolbar .button:active *:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { + box-shadow: none; +} + +/* add back the inset shadow effect */ +.linked .button:last-child, +.linked .button:only-child, +.linked .button:insensitive:last-child, +.linked .button:insensitive:only-child, +.inline-toolbar.toolbar .button:last-child, +.inline-toolbar.toolbar .button:only-child, +.inline-toolbar.toolbar .button:insensitive:last-child, +.inline-toolbar.toolbar .button:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button, +.inline-toolbar.toolbar GtkToolButton:only-child > .button, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive { + box-shadow: inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); +} + +.linked .button:active:last-child, +.linked .button:active:only-child, +.inline-toolbar.toolbar .button:active:last-child, +.inline-toolbar.toolbar .button:active:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active { + box-shadow: inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); +} + +/* middle button */ +.linked .entry, +.linked .button, +.linked .button:active, +.linked .button:active:hover, +.linked .button:insensitive, +.inline-toolbar.toolbar .button, +.inline-toolbar.toolbar .button:active, +.inline-toolbar.toolbar .button:insensitive, +.inline-toolbar.toolbar GtkToolButton .button, +.inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton .button:insensitive { + border-width: 1px; + border-radius: 0; + border-right-width: 0; + border-left-width: 0; +} + +/*leftmost button */ +.linked .entry:first-child, +.linked .button:first-child, +.linked .button:active:first-child, +.linked .button:active:hover:first-child, +.linked .button:insensitive:first-child, +.inline-toolbar.toolbar .button:first-child, +.inline-toolbar.toolbar .button:active:first-child, +.inline-toolbar.toolbar .button:insensitive:first-child, +.inline-toolbar.toolbar GtkToolButton:first-child .button, +.inline-toolbar.toolbar GtkToolButton:first-child .button:active, +.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive { + border-width: 1px; + border-radius: 2px; + border-right-width: 0; + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} + +/* rightmost button */ +.linked .entry:last-child, +.linked .button:last-child, +.linked .button:active:last-child, +.linked .button:active:hover:last-child, +.linked .button:insensitive:last-child, +.inline-toolbar.toolbar .button:last-child, +.inline-toolbar.toolbar .button:active:last-child, +.inline-toolbar.toolbar .button:insensitive:last-child, +.inline-toolbar.toolbar GtkToolButton:last-child .button, +.inline-toolbar.toolbar GtkToolButton:last-child .button:active, +.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive { + border-width: 1px; + border-radius: 2px; + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +/* linked single button */ +.linked .entry:only-child, +.linked .button:only-child, +.linked .button:active:only-child, +.linked .button:active:hover:only-child, +.linked .button:insensitive:only-child, +.inline-toolbar.toolbar .button:only-child, +.inline-toolbar.toolbar .button:active:only-child, +.inline-toolbar.toolbar .button:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:only-child .button, +.inline-toolbar.toolbar GtkToolButton:only-child .button:active, +.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive { + border-width: 1px; + border-radius: 2px; +} + +/* linked button shadows (vertical) */ +.linked.vertical .button, +.inline-toolbar.toolbar.vertical .button, +.inline-toolbar.toolbar.vertical GtkToolButton > .button { + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8), + inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); +} + +.linked.vertical .button:active, +.inline-toolbar.toolbar.vertical .button:active, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:active { + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.8), + inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); +} + +.linked.vertical .button:insensitive, +.inline-toolbar.toolbar.vertical .button:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.8); +} + +/* remove box shadow from last-child and only-child */ +.linked.vertical .button:active *:insensitive:last-child, +.linked.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { + box-shadow: none; +} + +/* add back the inset shadow effect */ +.linked.vertical .button:last-child, +.linked.vertical .button:only-child, +.linked.vertical .button:insensitive:last-child, +.linked.vertical .button:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:last-child, +.inline-toolbar.toolbar.vertical .button:only-child, +.inline-toolbar.toolbar.vertical .button:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:insensitive:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive { + box-shadow: inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); +} + +.linked.vertical .button:active:last-child, +.linked.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical .button:active:last-child, +.inline-toolbar.toolbar.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active { + box-shadow: inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); +} + +/* middle button (vertical) */ +.linked.vertical .entry, +.linked.vertical .button, +.linked.vertical .button:active, +.linked.vertical .button:active:hover, +.linked.vertical .button:insensitive { + border-width: 1px; + border-radius: 0; + border-top-width: 0; + border-bottom-width: 0; +} + +/* top button (vertical) */ +.linked.vertical .entry:first-child, +.linked.vertical .button:first-child, +.linked.vertical .button:active:first-child, +.linked.vertical .button:active:hover:first-child, +.linked.vertical .button:insensitive:first-child { + border-width: 1px; + border-radius: 2px; + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +/* bottom button (vertical) */ +.linked.vertical .entry:last-child, +.linked.vertical .button:last-child, +.linked.vertical .button:active:last-child, +.linked.vertical .button:active:hover:last-child, +.linked.vertical .button:insensitive:last-child { + border-width: 1px; + border-radius: 2px; + border-top-width: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +/* linked single button (vertical) */ +.linked.vertical .entry:only-child, +.linked.vertical .button:only-child, +.linked.vertical .button:active:only-child, +.linked.vertical .button:active:hover:only-child, +.linked.vertical .button:insensitive:only-child { + border-width: 1px; + border-radius: 2px; +} + +/* linked toolbar buttons */ +.primary-toolbar .button.raised.linked, +.primary-toolbar .raised.linked .button, +.toolbar .button.raised.linked, +.toolbar .raised.linked .button, +.toolbar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button, +.header-bar .linked .button { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8), + inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); +} + +.primary-toolbar .button.raised.linked:active, +.primary-toolbar .raised.linked .button:active, +.toolbar .button.raised.linked:active, +.toolbar .raised.linked .button:active, +.toolbar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active, +.header-bar .linked .button:active { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8), + inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); +} + +.primary-toolbar .button.raised.linked:insensitive, +.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8); +} + +/* remove box shadow from last-child and only-child */ +.primary-toolbar .button:active *:insensitive.raised.linked:last-child, +.primary-toolbar .button:active *:insensitive.raised.linked:only-child, +.primary-toolbar .raised.linked .button:active *:insensitive:last-child, +.primary-toolbar .raised.linked .button:active *:insensitive:only-child +.toolbar .button:active *:insensitive.raised.linked:last-child, +.toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:active *:insensitive:last-child, +.toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .linked .button:active *:insensitive:last-child, +.toolbar .linked .button:active *:insensitive:only-child, +.header-bar .button:active *:insensitive.raised.linked:last-child, +.header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:active *:insensitive:last-child, +.header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .linked .button:active *:insensitive:last-child, +.header-bar .linked .button:active *:insensitive:only-child { + box-shadow: none; +} + +/* add back the inset shadow effect */ +.primary-toolbar .button.raised.linked:last-child, +.primary-toolbar .button.raised.linked:only-child, +.primary-toolbar .button:insensitive.raised.linked:last-child, +.primary-toolbar .button:insensitive.raised.linked:only-child, +.primary-toolbar .raised.linked .button:last-child, +.primary-toolbar .raised.linked .button:only-child, +.primary-toolbar .raised.linked .button:insensitive:last-child, +.primary-toolbar .raised.linked .button:insensitive:only-child, +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:only-child, +.toolbar .button:insensitive.raised.linked:last-child, +.toolbar .button:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:insensitive:last-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button:insensitive.raised.linked:last-child, +.header-bar .button:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:insensitive:only-child { + box-shadow: inset 1px 1px alpha(@light_shadow, 0.3), + inset -1px 1px alpha(@light_shadow, 0.3); +} + +.primary-toolbar .button:active.raised.linked:last-child, +.primary-toolbar .button:active.raised.linked:only-child, +.primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:active:only-child, +.toolbar .button:active.raised.linked:last-child, +.toolbar .button:active.raised.linked:only-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:active:only-child, +.header-bar .button:active.raised.linked:last-child, +.header-bar .button:active.raised.linked:only-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:active:only-child { + box-shadow: inset 1px 1px alpha(@dark_shadow, 0.1), + inset -1px -1px alpha(@dark_shadow, 0.1); +} + +/* middle button */ +.primary-toolbar .button.raised.linked, +.primary-toolbar .button.raised.linked:active, +.primary-toolbar .button.raised.linked:insensitive, +.primary-toolbar .raised.linked .button, +.primary-toolbar .raised.linked .button:active, +.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.raised.linked, +.toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button, +.toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button, +.toolbar .linked .button:active, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked, +.header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:insensitive, { + border-width: 1px; + border-radius: 0; + border-right-width: 0; + border-left-width: 0; +} + +/* leftmost button */ +.primary-toolbar .button.raised.linked:first-child, +.primary-toolbar .button.raised.linked:active:first-child, +.primary-toolbar .button.raised.linked:insensitive:first-child, +.primary-toolbar .raised.linked .button:first-child, +.primary-toolbar .raised.linked .button:active:first-child, +.primary-toolbar .raised.linked .button:insensitive:first-child, +.toolbar .button.raised.linked:first-child, +.toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:insensitive:first-child, +.toolbar .raised.linked .button:first-child, +.toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:insensitive:first-child, +.toolbar .linked .button:first-child, +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:insensitive:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .button.raised.linked:active:first-child, +.header-bar .button.raised.linked:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:insensitive:first-child { + border-width: 1px; + border-radius: 2px; + border-right-width: 0; + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} + +/* rightmost button */ +.primary-toolbar .button.raised.linked:last-child, +.primary-toolbar .button.raised.linked:active:last-child, +.primary-toolbar .button.raised.linked:insensitive:last-child, +.primary-toolbar .raised.linked .button:last-child, +.primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:insensitive:last-child, +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:insensitive:last-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:insensitive:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:insensitive:last-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:insensitive:last-child { + border-width: 1px; + border-radius: 2px; + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +/* linked single button */ +.primary-toolbar .button.raised.linked:only-child, +.primary-toolbar .button.raised.linked:active:only-child, +.primary-toolbar .button.raised.linked:insensitive:only-child, +.primary-toolbar .raised.linked .button:only-child, +.primary-toolbar .raised.linked .button:active:only-child, +.primary-toolbar .raised.linked .button:insensitive:only-child, +.toolbar .button.raised.linked:only-child, +.toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:insensitive:only-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:active:only-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:insensitive:only-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:insensitive:only-child { + border-width: 1px; + border-radius: 2px; +} + +/*********** + * tooltip * + ***********/ +.tooltip { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_tooltip_bg_color, 0.7); + border-radius: 2px; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@theme_tooltip_bg_color, 1.09)), + color-stop (0.50, shade(@theme_tooltip_bg_color, 1.01)), + to (shade(@theme_tooltip_bg_color, 0.91))); + + color: @theme_tooltip_fg_color; +} + +.tooltip * { + background-color: transparent; +} + +/************ + * treeview * + ************/ +GtkTreeView { + -GtkTreeView-vertical-separator: 0; + -GtkWidget-focus-line-width: 1; + -GtkWidget-focus-padding: 1; +} + +GtkTreeView.dnd { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.9); + border-radius: 0; +} + +GtkTreeView .entry { + border-radius: 0; + background-color: @theme_base_color; + background-image: none; +} + +GtkTreeView row:nth-child(even) { + background-color: mix(@theme_selected_bg_color, shade(@theme_base_color, 0.93), 0.98); +} + +GtkTreeView row:nth-child(odd) { + background-color: shade(@theme_base_color, 1.0); +} + +/************ + * viewport * + ************/ +GtkViewport.frame { + border-width: 0; +} + +.view { + background-color: @theme_base_color; + color: @theme_text_color; +} + +.view:insensitive, +.view:insensitive:insensitive { + background-color: shade(@theme_base_color, 0.9); + color: mix(@theme_fg_color, @theme_bg_color, 0.5); +} + +.view:selected, +.view:selected:focus { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +/********************* + * app notifications * + *********************/ +.app-notification { + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + border-width: 0 1px 1px 1px; + border-radius: 0 0 2px 2px; + padding: 8px; + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +/******* + * osd * + *******/ +.background.osd { + color: @osd_fg; + background-color: @osd_bg; +} + +GtkOverlay.osd { + background-color: transparent; +} + +.osd.frame { + background-clip: border-box; + background-origin: border-box; +} + +.osd.button, +.osd .button { + padding: 4px; + border-width: 1px; + border-style: solid; + border-color: shade(@osd_bg, 0.8); + border-radius: 2px; + background-color: shade(@osd_bg, 1.08); + background-image: none; + color: @osd_fg; +} + +.osd.button:prelight, +.osd.button:hover, +.osd .button:hover { + border-color: shade(@osd_bg, 0.7); + background-color: shade(@osd_bg, 1.10); + background-image: none; +} + +.osd.button:active, +.osd .button:active, +.osd GtkMenuButton.button:active { + border-color: shade(@osd_bg, 0.8); + background-color: shade(@osd_bg, 0.95); + background-image: none; +} + +.osd.button:active:hover, +.osd .button:active:hover, +.osd GtkMenuButton.button:active:hover { + border-color: shade(@osd_bg, 0.7); +} + +.osd.button:insensitive, +.osd .button:insensitive { + border-color: shade(@osd_bg, 0.85); + background-color: shade(@osd_bg, 0.9); + background-image: none; +} + +.osd.button:active *:insensitive, +.osd .button:active *:insensitive { + background-color: shade(@osd_bg, 0.80); + background-image: none; +} + +.osd.toolbar { + -GtkToolbar-button-relief: normal; + + padding: 4px; + border-width: 1px; + border-style: solid; + border-radius: 2px; + border-color: shade(@osd_bg, 0.8); + background-color: @osd_bg; + background-image: none; + color: @osd_fg; +} + +.osd.toolbar .button { + padding: 4px; + border-width: 1px; + border-style: solid; + border-color: shade(@osd_bg, 0.8); + border-radius: 2px; + background-color: shade(@osd_bg, 1.08); + background-image: none; + color: @osd_fg; +} + +.osd.toolbar .button:hover { + border-color: shade(@osd_bg, 0.7); + background-color: shade(@osd_bg, 1.10); + background-image: none; +} + +.osd.toolbar .button:active { + border-color: shade(@osd_bg, 0.8); + background-color: shade(@osd_bg, 0.95); + background-image: none; +} + +.osd.toolbar .button:active:hover { + border-color: shade(@osd_bg, 0.7); +} + +.osd.toolbar .button:focus, +.osd.toolbar .button:hover:focus, +.osd.toolbar .button:active:focus, +.osd.toolbar .button:active:hover:focus { + border-color: shade(@osd_bg, 0.7); +} + +.osd.toolbar .button:insensitive { + border-color: shade(@osd_bg, 0.85); + background-color: shade(@osd_bg, 0.9); + background-image: none; +} + +.osd.toolbar .button:active *:insensitive { + border-color: shade(@osd_bg, 0.75); + background-color: shade(@osd_bg, 0.80); + background-image: none; +} + +.osd.toolbar .button:first-child { + border-radius: 2px 0 0 2px; + border-width: 1px 0 1px 1px; + box-shadow: inset -1px 0 shade(@osd_bg, 0.9); +} + +.osd.toolbar .button:last-child { + box-shadow: none; + border-radius: 0 2px 2px 0; + border-width: 1px 1px 1px 0; +} + +.osd.toolbar .button:only-child, +.osd.toolbar GtkToolButton .button, +.osd.toolbar GtkToolButton:only-child .button, +.osd.toolbar GtkToolButton:last-child .button, +.osd.toolbar GtkToolButton:first-child .button { + border-width: 1px; + border-radius: 2px; + border-style: solid; +} + +.osd.toolbar .separator { + color: shade(@osd_bg, 0.9); +} + +/* used by gnome-settings-daemon's media-keys OSD */ +.osd.trough { + background-color: shade(@osd_bg, 0.8); +} + +.osd.progressbar { + background-color: @osd_fg; +} + +.osd .scale.slider { + border-radius: 7px; + background-color: shade(@osd_bg, 1.08); + background-image: none; + /* we will draw the border using box shadow for now */ + box-shadow: inset 1px 0 shade(@osd_bg, 0.8), + inset 0 1px shade(@osd_bg, 0.8), + inset -1px 0 shade(@osd_bg, 0.8), + inset 0 -1px shade(@osd_bg, 0.8); +} + +.osd .scale.slider:hover { + box-shadow: inset 1px 0 shade(@osd_bg, 0.7), + inset 0 1px shade(@osd_bg, 0.7), + inset -1px 0 shade(@osd_bg, 0.7), + inset 0 -1px shade(@osd_bg, 0.7); +} + +.osd .scale.slider:insensitive { + background-color: shade(@osd_bg, 0.9); + background-image: none; + box-shadow: inset 1px 0 shade(@osd_bg, 0.85), + inset 0 1px shade(@osd_bg, 0.85), + inset -1px 0 shade(@osd_bg, 0.85), + inset 0 -1px shade(@osd_bg, 0.85); +} + +.osd .scale.trough { + border-color: shade(@osd_bg, 0.8); + background-color: shade(@osd_bg, 1.08); + background-image: none; +} + +.osd .scale.trough.highlight { + border-color: @theme_selected_bg_color; + background-color: @theme_selected_bg_color; + background-image: none; +} + +.osd .scale.trough:insensitive, +.osd .scale.trough.highlight:insensitive { + border-color: shade(@osd_bg, 0.85); + background-color: shade(@osd_bg, 0.9); + background-image: none; +} + +.osd GtkProgressBar, +GtkProgressBar.osd { + padding: 0; + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 2px; + -GtkProgressBar-min-horizontal-bar-height: 2px; +} + +.osd GtkProgressBar.trough, +GtkProgressBar.osd.trough { + padding: 0; + border-style: none; + border-radius: 0; + background-image: none; + background-color: transparent; } -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, -.primary-toolbar .button:hover, -.primary-toolbar .button:active, -.primary-toolbar .button:insensitive { +.osd GtkProgressBar.progressbar, +GtkProgressBar.osd.progressbar { + border-style: none; + border-radius: 0; + background-color: @theme_selected_bg_color; + background-image: none; +} + +.osd .view, +.osd.view { + background-color: @osd_base; +} + +.osd .scrollbar.trough { + background-color: @osd_bg; +} + +.osd .scrollbar.slider { border-width: 1px; + border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.21); + border-radius: 0; + background-color: mix(@osd_base, @osd_fg, 0.21); } -.primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, -.primary-toolbar .button:hover { +.osd .scrollbar.slider:hover { + border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.31); + background-color: mix(@osd_base, @osd_fg, 0.31); +} + +.osd .scrollbar.slider:active { + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; +} + +.osd GtkIconView.cell:selected, +.osd GtkIconView.cell:selected:focus { + background-color: transparent; + border-style: solid; + border-radius: 2px; + border-width: 3px; + border-color: @osd_fg; + outline-color: transparent; +} + +/* used by Documents */ +.osd .page-thumbnail { + border-style: solid; + border-width: 1px; + border-color: shade(@osd_bg, 0.9); + /* when there's no pixbuf yet */ + background-color: @osd_bg; +} + +/****************************** + * destructive action buttons * + ******************************/ +.destructive-action.button { + padding: 3px 2px; + border-width: 1px; + border-style: solid; + border-color: shade(@error_color, 0.7); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), - color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), - color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), - to (shade(@theme_selected_bg_color, 1.09))); - border-color: shade(@theme_bg_color, 0.7); + from (shade(shade(@error_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@error_color, 1.21), 1.04)), + color-stop (0.50, shade(@error_color, 1.21)), + to (shade(@error_color, 1.09))); + + color: shade(@error_color, 0.6); } -.primary-toolbar .button:active { +.destructive-action.button:hover { + border-color: shade(@error_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.98), 1.04)), - color-stop (0.49, shade(shade(@theme_bg_color, 0.91), 1.04)), - color-stop (0.50, shade(@theme_bg_color, 0.91)), - to (shade(@theme_bg_color, 0.82))); - border-color: shade(@theme_bg_color, 0.7); + from (shade(shade(@error_color, 1.41), 1.04)), + color-stop (0.49, shade(shade(@error_color, 1.31), 1.04)), + color-stop (0.50, shade(@error_color, 1.31)), + to (shade(@error_color, 1.09))); +} + +.destructive-action.button:active { + border-color: shade(@error_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@error_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@error_color, 1.08), 1.04)), + color-stop (0.50, shade(@error_color, 1.08)), + to (shade(@error_color, 1.09))); +} + +.destructive-action.button:hover:active { + border-color: shade(@error_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@error_color, 1.41), 1.04)), + color-stop (0.49, shade(shade(@error_color, 1.31), 1.04)), + color-stop (0.50, shade(@error_color, 1.31)), + to (shade(@error_color, 1.09))); +} + +/****************** + * selection mode * + ******************/ +.selection-mode.header-bar, +.selection-mode.toolbar { + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.7); + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_bg_color; +} + +.selection-mode.header-bar { + border-top-color: @theme_selected_bg_color; + border-bottom-color: shade(@theme_selected_bg_color, 0.7);; +} + +.selection-mode.toolbar { + padding: 4px; } -.primary-toolbar .button:active:hover { +/* regular button */ +.selection-mode.header-bar .button, +.selection-mode.toolbar .button, +.selection-mode.toolbar GtkToolButton .button { + padding: 3px 2px; + border-width: 1px; + border-style: solid; + border-color: shade(@theme_selected_bg_color, 0.7); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.21), 1.04)), color-stop (0.50, shade(@theme_selected_bg_color, 1.21)), to (shade(@theme_selected_bg_color, 1.09))); -} -.primary-toolbar .button:active:insensitive, -.primary-toolbar .button:insensitive { - border-color: shade(@theme_bg_color, 0.8); + color: shade(@theme_selected_bg_color, 0.6); } -.primary-toolbar .button:insensitive { +.selection-mode.header-bar .button:hover, +.selection-mode.toolbar .button:hover, +.selection-mode.toolbar GtkToolButton .button:hover { + border-color: shade(@theme_selected_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.09), 1.04)), - color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), - color-stop (0.50, shade(@theme_bg_color, 1.01)), - to (shade(@theme_bg_color, 0.91))); + from (shade(shade(@theme_selected_bg_color, 1.41), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.31)), + to (shade(@theme_selected_bg_color, 1.09))); } -.primary-toolbar .button:active:insensitive { +.selection-mode.header-bar .button:active, +.selection-mode.toolbar .button:active, +.selection-mode.toolbar GtkToolButton .button:active { + border-color: shade(@theme_selected_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.98), 1.04)), - color-stop (0.49, shade(shade(@theme_bg_color, 0.91), 1.04)), - color-stop (0.50, shade(@theme_bg_color, 0.91)), - to (shade(@theme_bg_color, 0.82))); + from (shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.08), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.08)), + to (shade(@theme_selected_bg_color, 1.09))); } -.primary-toolbar .entry, -.primary-toolbar .entry:active, -.primary-toolbar .entry:focus { - border-radius: 2px; +.selection-mode.header-bar .button:hover:active, +.selection-mode.toolbar .button:hover:active, +.selection-mode.toolbar GtkToolButton .button:hover:active { + border-color: shade(@theme_selected_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.41), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.31)), + to (shade(@theme_selected_bg_color, 1.09))); } -.primary-toolbar GtkSeparatorToolItem, -.primary-toolbar .separator, -.primary-toolbar .separator:insensitive { - border-color: alpha(shade(@theme_bg_color, 0.9), 0.5); +/* suggested button */ +.selection-mode.header-bar .suggested-action.button, +.selection-mode.toolbar .suggested-action.button, +.selection-mode.toolbar GtkToolButton.suggested-action .button { + border-width: 1px; border-style: solid; -} - -/* inline-toolbar */ -.inline-toolbar.toolbar { - -GtkToolbar-button-relief: normal; - + border-color: shade(@theme_selected_bg_color, 0.7); + border-radius: 2px; background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.93)), - to (@theme_bg_color)); - border-radius: 0; - border-style: solid; - border-width: 1px; - padding: 3px 4px 4px 4px; + from (shade(shade(@theme_selected_bg_color, 1.41), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.31), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.31)), + to (shade(@theme_selected_bg_color, 1.09))); + + color: shade(@theme_selected_bg_color, 0.6); } -.inline-toolbar.toolbar:last-child { - border-bottom-color: shade(@theme_bg_color, 0.76); - border-color: shade(@theme_bg_color, 0.7); - border-radius: 0 0 2px 2px; - border-width: 0 1px 1px 1px; +.selection-mode.header-bar .suggested-action.button:hover, +.selection-mode.toolbar .suggested-action.button:hover, +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover { + border-color: shade(@theme_selected_bg_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@theme_selected_bg_color, 1.51), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.41), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.41)), + to (shade(@theme_selected_bg_color, 1.09))); } -.inline-toolbar.toolbar .button { +.selection-mode.header-bar .suggested-action.button:active, +.selection-mode.toolbar .suggested-action.button:active, +.selection-mode.toolbar GtkToolButton.suggested-action:active { + border-color: shade(@theme_selected_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.09), 1.04)), - color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), - color-stop (0.50, shade(@theme_bg_color, 1.01)), - to (shade(@theme_bg_color, 0.91))); - border-radius: 0; - border-style: solid; - border-width: 1px 0 1px 1px; - padding: 1px; + from (shade(shade(@theme_selected_bg_color, 1.41), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.18), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.18)), + to (shade(@theme_selected_bg_color, 1.09))); } -.inline-toolbar.toolbar .button *:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { +.selection-mode.header-bar .suggested-action.button:hover:active, +.selection-mode.toolbar .suggested-action.button:hover:active, +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { + border-color: shade(@theme_selected_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.09), 1.04)), - color-stop (0.49, shade(shade(@theme_bg_color, 1.01), 1.04)), - color-stop (0.50, shade(@theme_bg_color, 1.01)), - to (shade(@theme_bg_color, 0.91))); - border-color: shade(@theme_bg_color, 0.8); + from (shade(shade(@theme_selected_bg_color, 1.51), 1.04)), + color-stop (0.49, shade(shade(@theme_selected_bg_color, 1.41), 1.04)), + color-stop (0.50, shade(@theme_selected_bg_color, 1.41)), + to (shade(@theme_selected_bg_color, 1.09))); } -/* middle button */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .button.raised.linked:focus, -.primary-toolbar .button.raised.linked:focus:active, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button, -.primary-toolbar .raised.linked .button:active, -.primary-toolbar .raised.linked .button:focus, -.primary-toolbar .raised.linked .button:focus:active, -.primary-toolbar .raised.linked .button:insensitive, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:focus, -.inline-toolbar.toolbar .button:focus:active, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button, -.inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton .button:focus, -.inline-toolbar.toolbar GtkToolButton .button:focus:active, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { - border-right-width: 0; - border-left-width: 1px; - border-radius: 0; +/* menu button */ +.selection-mode.header-bar .selection-menu.button, +.selection-mode.toolbar .selection-menu.button { + border-style: none; + background-color: transparent; + background-image: none; + color: shade(@theme_selected_bg_color, 0.6); + box-shadow: none; } -/* leftmost button */ -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .button.raised.linked:active:first-child, -.primary-toolbar .button.raised.linked:focus:first-child, -.primary-toolbar .button.raised.linked:focus:active:first-child, -.primary-toolbar .button.raised.linked:insensitive:first-child, -.primary-toolbar .raised.linked .button:first-child, -.primary-toolbar .raised.linked .button:active:first-child, -.primary-toolbar .raised.linked .button:focus:first-child, -.primary-toolbar .raised.linked .button:focus:active:first-child, -.primary-toolbar .raised.linked .button:insensitive:first-child, -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar .button:active:first-child, -.inline-toolbar.toolbar .button:focus:first-child, -.inline-toolbar.toolbar .button:focus:active:first-child, -.inline-toolbar.toolbar .button:insensitive:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive { - border-left-width: 1px; - border-right-width: 1px; - border-radius: 2px 0 0 2px; +.selection-mode.toolbar .dim-label, +.selection-mode.toolbar .selection-menu.button .dim-label { + color: shade(@theme_selected_bg_color, 0.5); } -/* rightmost button */ -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .button.raised.linked:active:last-child, -.primary-toolbar .button.raised.linked:focus:last-child, -.primary-toolbar .button.raised.linked:focus:active:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, -.primary-toolbar .raised.linked .button:last-child, -.primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:focus:last-child, -.primary-toolbar .raised.linked .button:focus:active:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar .button:focus:last-child, -.inline-toolbar.toolbar .button:focus:active:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive { - border-left-width: 0; - border-right-width: 1px; - border-radius: 0 2px 2px 0; +.selection-mode.header-bar .selection-menu.button:hover, +.selection-mode.toolbar .dim-label:hover, +.selection-mode.toolbar .selection-menu.button:hover, +.selection-mode.toolbar .selection-menu.button .dim-label:hover { + color: shade(@theme_selected_bg_color, 0.5); } -/* single button */ -.primary-toolbar.toolbar .button:only-child, -.primary-toolbar.toolbar .button:active:only-child, -.primary-toolbar.toolbar .button:focus:only-child, -.primary-toolbar.toolbar .button:focus:active:only-child, -.primary-toolbar.toolbar .button:insensitive:only-child, -.primary-toolbar.toolbar GtkToolButton:only-child .button, -.primary-toolbar.toolbar GtkToolButton:only-child .button:active, -.primary-toolbar.toolbar GtkToolButton:only-child .button:focus, -.primary-toolbar.toolbar GtkToolButton:only-child .button:focus:active, -.primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive, -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar .button:focus:only-child, -.inline-toolbar.toolbar .button:focus:active:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive { - border-right-width: 1px; - border-left-width: 1px; +.selection-mode.header-bar .selection-menu.button:active, +.selection-mode.toolbar .selection-menu.button:active { + color: shade(@theme_selected_bg_color, 0.6); + box-shadow: none; } -/*********** - * tooltip * - ***********/ -.tooltip { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_tooltip_bg_color, 1.09)), - color-stop (0.50, shade(@theme_tooltip_bg_color, 1.01)), - to (shade(@theme_tooltip_bg_color, 0.91))); - border-color: shade(@theme_tooltip_bg_color, 0.7); +/************************* + * touch text selections * + *************************/ +GtkBubbleWindow { border-radius: 2px; - border-style: solid; - border-width: 1px; + background-clip: border-box; +} - color: @theme_tooltip_fg_color; +GtkBubbleWindow.osd.background { + background-color: @osd_bg; } -.tooltip * { +GtkBubbleWindow .toolbar { background-color: transparent; } -/************ - * treeview * - ************/ -GtkTreeView { +/******* + * CSD * + *******/ +.titlebar { + border-radius: 2px 2px 0 0; + background-image: none; + background-color: @toolbar_bg_color; + text-shadow: none; } -GtkTreeView.dnd { - border-color: shade(@theme_selected_bg_color, 1.12); - border-radius: 2px; - border-width: 1px; - border-style: solid; +/* 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; } -GtkTreeView .entry { +.titlebar .title { + font: bold; +} + +.titlebar:backdrop { background-image: none; - border-radius: 0; + background-color: @toolbar_bg_color; + text-shadow: none; } -GtkTreeView row:nth-child(even) { - background-color: mix(@theme_selected_bg_color, shade(@theme_base_color, 0.93), 0.98); +.titlebar .titlebutton { + border-style: none; + padding: 4px; + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.3); + box-shadow: none; } -GtkTreeView row:nth-child(odd) { - background-color: shade(@theme_base_color, 1.0); +.titlebar .titlebutton:hover { + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.2); + box-shadow: none; } -/************ - * viewport * - ************/ -GtkViewport { - background-color: transparent; +.titlebar .titlebutton:active, +.titlebar .titlebutton:active:hover { + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.1); + box-shadow: none; } -GtkViewport.frame { - border-width: 0; +/* +.titlebar .right .titlebutton:first-child { + border-left: 1px solid shade(@toolbar_bg_color, 0.9); } -.view { - background-color: @theme_base_color; +.titlebar .right .titlebutton:last-child { } -.view:selected, -.view:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; +.titlebar .left .titlebutton:last-child { + border-right: 1px solid shade(@toolbar_bg_color, 0.9); +} + +.titlebar .left .titlebutton:first-child { +} +*/ + +.titlebar .titlebutton:backdrop { + background-image: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5); +} + +.window-frame { + border-style: none; + border-radius: 2px 2px 0 0; + box-shadow: 0 3px 7px alpha(black, 0.7), + 0 0 0 1px alpha(black, 0.2); + + /* this is used for the resize cursor area */ + margin: 10px; +} + +.window-frame:backdrop { + box-shadow: 0 3px 5px alpha(black, 0.5), + 0 0 0 1px alpha(black, 0.2); } diff -Nru shimmer-themes-1.6.1/albatross/gtk-3.0/settings.ini shimmer-themes-1.6.2/albatross/gtk-3.0/settings.ini --- shimmer-themes-1.6.1/albatross/gtk-3.0/settings.ini 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/gtk-3.0/settings.ini 2013-09-13 18:24:14.000000000 -0400 @@ -1,4 +1,4 @@ [Settings] -gtk-color-scheme = "base_color:#ffffff\nbg_color:#ededed\ntooltip_bg_color:#d6dce4\nselected_bg_color:#a9b7c4\ntext_color:#444444\nfg_color:#202020\ntooltip_fg_color:#222222\nselected_fg_color:#333333\ndark_bg_color:#292b2c\ndark_fg_color:#ffffff" +gtk-color-scheme = "base_color:#ffffff\nbg_color:#ededed\ntooltip_bg_color:#d6dce4\nselected_bg_color:#a9b7c4\ntext_color:#444444\nfg_color:#202020\ntooltip_fg_color:#222222\nselected_fg_color:#333333" gtk-auto-mnemonics = 1 gtk-visible-focus = automatic Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/close_unfocused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/close_unfocused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/close_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/close_unfocused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/maximize_unfocused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/maximize_unfocused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/maximize_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/maximize_unfocused_pressed.png differ diff -Nru shimmer-themes-1.6.1/albatross/metacity-1/metacity-theme-1.xml shimmer-themes-1.6.2/albatross/metacity-1/metacity-theme-1.xml --- shimmer-themes-1.6.1/albatross/metacity-1/metacity-theme-1.xml 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/metacity-1/metacity-theme-1.xml 1969-12-31 19:00:00.000000000 -0500 @@ -1,464 +0,0 @@ - - - - Albatross - Satyajit Sahoo - GPL, CC - 29 May 2012 - Albatross Metacity Theme - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -</draw_ops> - -<draw_ops name="title_unfocused"> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="#626262" /> -</draw_ops> - -<!-- menu icon --> -<draw_ops name="menu"></draw_ops> - -<!-- close icon --> -<draw_ops name="close_focused_normal"> - <image filename="close_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_focused_prelight"> - <image filename="close_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_focused_pressed"> - <image filename="close_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_unfocused_normal"> - <image filename="close_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_unfocused_prelight"> - <image filename="close_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_unfocused_pressed"> - <image filename="close_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- maximize icon --> -<draw_ops name="maximize_focused_normal"> - <image filename="maximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_focused_prelight"> - <image filename="maximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_focused_pressed"> - <image filename="maximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_normal"> - <image filename="maximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_prelight"> - <image filename="maximize_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_unfocused_pressed"> - <image filename="maximize_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- unmaximize icon --> -<draw_ops name="unmaximize_focused_normal"> - <image filename="unmaximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_focused_prelight"> - <image filename="unmaximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_focused_pressed"> - <image filename="unmaximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_normal"> - <image filename="unmaximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_prelight"> - <image filename="unmaximize_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_unfocused_pressed"> - <image filename="unmaximize_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - - -<!-- minimize icon --> -<draw_ops name="minimize_focused_normal"> - <image filename="minimize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_focused_prelight"> - <image filename="minimize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_focused_pressed"> - <image filename="minimize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_normal"> - <image filename="minimize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_prelight"> - <image filename="minimize_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_unfocused_pressed"> - <image filename="minimize_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="blank"></draw_ops> - -<!-- ::: FRAME STYLES ::: --> -<frame_style name="normal" geometry="normal"> - <piece position="entire_background" draw_ops="round_titlebar_unfocused"/> - <piece position="title" draw_ops="title_unfocused"/> - <button function="close" state="normal" draw_ops="close_unfocused_normal"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused_normal"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="menu" state="normal" draw_ops="menu"/> - <button function="menu" state="pressed" draw_ops="menu"/> - <button function="menu" state="prelight" draw_ops="menu"/> -</frame_style> - -<frame_style name="normal_shaded" geometry="shaded" parent="normal"> - <piece position="entire_background" draw_ops="round_titlebar"/> -</frame_style> - -<frame_style name="focused" geometry="normal" parent="normal"> - <piece position="entire_background" draw_ops="round_titlebar"/> - <piece position="title" draw_ops="title"/> - <button function="close" state="normal" draw_ops="close_focused_normal"/> - <button function="close" state="pressed" draw_ops="close_focused_pressed"/> - <button function="close" state="prelight" draw_ops="close_focused_prelight"/> - <button function="maximize" state="normal" draw_ops="maximize_focused_normal"/> - <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed"/> - <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight"/> - <button function="minimize" state="normal" draw_ops="minimize_focused_normal"/> - <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/> - <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight"/> - <button function="menu" state="normal" draw_ops="menu"/> - <button function="menu" state="pressed" draw_ops="menu"/> - <button function="menu" state="prelight" draw_ops="menu"/> -</frame_style> - -<frame_style name="focused_shaded" geometry="shaded" parent="focused"> - <piece position="entire_background" draw_ops="round_titlebar_shaded"/> -</frame_style> - -<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal"> - <piece position="entire_background" draw_ops="titlebar_maximized_unfocused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/> -</frame_style> - -<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused"> - <piece position="entire_background" draw_ops="titlebar_maximized"/> - <button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/> -</frame_style> - -<frame_style name="border" geometry="border" parent="normal"> - <piece position="entire_background" draw_ops="border"/> - <piece position="title" draw_ops="blank"/> -</frame_style> - -<frame_style name="utility_normal" geometry="utility" parent="normal"></frame_style> - -<frame_style name="utility_focused" geometry="utility" parent="focused"></frame_style> - -<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded"> - <piece position="entire_background" draw_ops="titlebar_shaded"/> -</frame_style> - -<frame_style_set name="normal"> - <frame focus="yes" state="normal" resize="both" style="focused"/> - <frame focus="no" state="normal" resize="both" style="normal"/> - <frame focus="yes" state="maximized" style="focused_maximized"/> - <frame focus="no" state="maximized" style="normal_maximized"/> - <frame focus="yes" state="shaded" style="focused_shaded"/> - <frame focus="no" state="shaded" style="normal_shaded"/> - <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/> - <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/> -</frame_style_set> - -<frame_style_set name="utility" parent="normal"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_normal"/> - <!-- this is a bunch of crap since utility windows shouldn't be maximized --> - <frame focus="yes" state="maximized" style="focused"/> - <frame focus="no" state="maximized" style="normal"/> - <frame focus="yes" state="shaded" style="utility_focused_shaded"/> - <frame focus="no" state="shaded" style="utility_normal"/> - <frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/> - <frame focus="no" state="maximized_and_shaded" style="normal"/> -</frame_style_set> - -<frame_style_set name="border"> - <frame focus="yes" state="normal" resize="both" style="border"/> - <frame focus="no" state="normal" resize="both" style="border"/> - <frame focus="yes" state="maximized" style="border"/> - <frame focus="no" state="maximized" style="border"/> - <frame focus="yes" state="shaded" style="border"/> - <frame focus="no" state="shaded" style="border"/> - <frame focus="yes" state="maximized_and_shaded" style="border"/> - <frame focus="no" state="maximized_and_shaded" style="border"/> -</frame_style_set> - -<window type="normal" style_set="normal"/> -<window type="dialog" style_set="normal"/> -<window type="modal_dialog" style_set="normal"/> -<window type="menu" style_set="normal"/> -<window type="utility" style_set="utility"/> -<window type="border" style_set="border"/> - -<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/> -<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> -<menu_icon function="unmaximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> -<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/> - -</metacity_theme> diff -Nru shimmer-themes-1.6.1/albatross/metacity-1/metacity-theme-2.xml shimmer-themes-1.6.2/albatross/metacity-1/metacity-theme-2.xml --- shimmer-themes-1.6.1/albatross/metacity-1/metacity-theme-2.xml 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/albatross/metacity-1/metacity-theme-2.xml 2013-09-13 18:24:14.000000000 -0400 @@ -0,0 +1,1116 @@ +<?xml version="1.0"?> +<metacity_theme> +<info> + <name>Albatross</name> + <author>Satyajit Sahoo</author> + <copyright>GPL, CC</copyright> + <date>8 September 2013</date> + <description>Albatross Metacity Theme</description> +</info> + +<!-- ::: CONSTANTS ::: --> +<constant name="C_titlebar" value="#1e1e1e" /> +<constant name="C_border_focused" value="#3f3f3f" /> +<constant name="C_border_unfocused" value="#3f3f3f" /> +<constant name="C_title_focused" value="#ededed" /> +<constant name="C_title_unfocused" value="#626262" /> + +<!-- ::: GEOMETRY ::: --> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1"> + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="left_titlebar_edge" value="4" /> + <distance name="right_titlebar_edge" value="4" /> + <distance name="title_vertical_pad" value="0" /> + <aspect_ratio name="button" value="1.0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal" /> + +<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> +</frame_geometry> + +<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="right_width" value="1" /> +</frame_geometry> + +<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="left_width" value="1" /> +</frame_geometry> + +<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="1" rounded_top_right="1"> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="small_unfocused" parent="small"> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> +</frame_geometry> + +<frame_geometry name="nobuttons" hide_buttons="true" parent="normal" /> + +<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> +</frame_geometry> + +<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_right="1" rounded_bottom_left="1" parent="small"> +</frame_geometry> + +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> +</frame_geometry> + +<!-- ::: TITLES ::: --> +<draw_ops name="title_focused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_focused" /> +</draw_ops> + +<draw_ops name="title_unfocused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_unfocused" /> +</draw_ops> + +<!-- ::: WINDOW DECORATIONS ::: --> +<draw_ops name="entire_background_focused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="entire_background_unfocused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_focused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="titlebar_fill_attached_focused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_unfocused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="titlebar_focused"> + <include name="titlebar_fill_focused" /> +</draw_ops> + +<draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs --> + <include name="titlebar_fill_attached_focused" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused"> + <include name="titlebar_fill_focused" /> +</draw_ops> + +<draw_ops name="border_focused"> + <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="border_unfocused"> + <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_focused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_unfocused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="border_right_focused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_right_unfocused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<draw_ops name="border_left_focused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_left_unfocused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<!-- ::: BUTTON ICONS ::: --> +<!-- note: negative values in x or y causes gnome-shell to crash --> +<!-- close icon --> +<draw_ops name="close_focused"> + <image filename="close_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_focused_prelight"> + <image filename="close_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_focused_pressed"> + <image filename="close_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_unfocused"> + <image filename="close_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_unfocused_prelight"> + <include name="close_focused_prelight" /> +</draw_ops> + +<draw_ops name="close_unfocused_pressed"> + <include name="close_focused_pressed" /> +</draw_ops> + +<!-- maximize icon --> +<draw_ops name="maximize_focused"> + <image filename="maximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_focused_prelight"> + <image filename="maximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_focused_pressed"> + <image filename="maximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_unfocused"> + <image filename="maximize_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_prelight"> + <include name="maximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_pressed"> + <include name="maximize_focused_pressed" /> +</draw_ops> + +<!-- unmaximize icon --> +<draw_ops name="unmaximize_focused"> + <image filename="unmaximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_prelight"> + <image filename="unmaximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_pressed"> + <image filename="unmaximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused"> + <image filename="unmaximize_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_prelight"> + <include name="unmaximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_pressed"> + <include name="unmaximize_focused_pressed" /> +</draw_ops> + +<!-- minimize icon --> +<draw_ops name="minimize_focused"> + <image filename="minimize_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_focused_prelight"> + <image filename="minimize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_focused_pressed"> + <image filename="minimize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_unfocused"> + <image filename="minimize_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_prelight"> + <include name="minimize_focused_prelight" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_pressed"> + <include name="minimize_focused_pressed" /> +</draw_ops> + +<!-- menu icon --> +<draw_ops name="menu_focused"></draw_ops> + +<draw_ops name="menu_focused_prelight"></draw_ops> + +<draw_ops name="menu_focused_pressed"></draw_ops> + +<draw_ops name="menu_unfocused"></draw_ops> + +<draw_ops name="menu_unfocused_prelight"></draw_ops> + +<draw_ops name="menu_unfocused_pressed"></draw_ops> + +<!-- shade icon --> +<draw_ops name="shade_focused"> + <image filename="shade_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_focused_prelight"> + <image filename="shade_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_focused_pressed"> + <image filename="shade_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_unfocused"> + <image filename="shade_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_unfocused_prelight"> + <include name="shade_focused_prelight" /> +</draw_ops> + +<draw_ops name="shade_unfocused_pressed"> + <include name="shade_focused_pressed" /> +</draw_ops> + +<!-- unshade icon --> +<draw_ops name="unshade_focused"> + <image filename="unshade_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_focused_prelight"> + <image filename="unshade_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_focused_pressed"> + <image filename="unshade_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_unfocused"> + <image filename="unshade_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_prelight"> + <include name="unshade_focused_prelight" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_pressed"> + <include name="unshade_focused_pressed" /> +</draw_ops> + +<!-- ::: FRAME STYLES ::: --> +<frame_style name="normal_focused" geometry="normal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_unfocused" geometry="normal_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_focused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_unfocused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_focused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_unfocused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_focused" geometry="small"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_unfocused" geometry="small_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_focused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_unfocused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="borderless" geometry="borderless"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_focused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_unfocused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_focused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_right_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_unfocused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_right_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_focused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_left_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_unfocused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_left_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- placeholder for unimplementated styles--> +<frame_style name="blank" geometry="normal"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- ::: FRAME STYLE SETS ::: --> +<frame_style_set name="normal_style_set"> + <frame focus="yes" state="normal" resize="both" style="normal_focused" /> + <frame focus="no" state="normal" resize="both" style="normal_unfocused" /> + <frame focus="yes" state="maximized" style="normal_max_focused" /> + <frame focus="no" state="maximized" style="normal_max_unfocused" /> + <frame focus="yes" state="shaded" style="normal_focused" /> + <frame focus="no" state="shaded" style="normal_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused" /> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused" /> +</frame_style_set> + +<frame_style_set name="dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="dialog_focused" /> + <frame focus="no" state="shaded" style="dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="modal_dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="modal_dialog_focused" /> + <frame focus="no" state="shaded" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="utility_style_set"> + <frame focus="yes" state="normal" resize="both" style="utility_focused" /> + <frame focus="no" state="normal" resize="both" style="utility_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="utility_focused" /> + <frame focus="no" state="shaded" style="utility_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="border_style_set"> + <frame focus="yes" state="normal" resize="both" style="border_focused" /> + <frame focus="no" state="normal" resize="both" style="border_unfocused" /> + <frame focus="yes" state="maximized" style="borderless" /> + <frame focus="no" state="maximized" style="borderless" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<!-- ::: WINDOWS ::: --> +<window type="normal" style_set="normal_style_set" /> +<window type="dialog" style_set="dialog_style_set" /> +<window type="modal_dialog" style_set="modal_dialog_style_set" /> +<window type="menu" style_set="utility_style_set" /> +<window type="utility" style_set="utility_style_set" /> +<window type="border" style_set="border_style_set" /> + +</metacity_theme> diff -Nru shimmer-themes-1.6.1/albatross/metacity-1/metacity-theme-3.xml shimmer-themes-1.6.2/albatross/metacity-1/metacity-theme-3.xml --- shimmer-themes-1.6.1/albatross/metacity-1/metacity-theme-3.xml 2013-07-12 20:15:37.000000000 -0400 +++ shimmer-themes-1.6.2/albatross/metacity-1/metacity-theme-3.xml 2013-09-13 18:24:14.000000000 -0400 @@ -4,126 +4,111 @@ <name>Albatross</name> <author>Satyajit Sahoo</author> <copyright>GPL, CC</copyright> - <date>29 May 2012</date> + <date>8 September 2013</date> <description>Albatross Mutter Theme</description> </info> -<!-- meaningfull constants --> - -<constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.7)" /> -<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.8)" /> -<constant name="C_titlebar_focused" value="gtk:custom(wm_bg,gtk:bg[NORMAL])" /> -<constant name="C_titlebar_unfocused" value="gtk:custom(wm_bg,gtk:bg[NORMAL])" /> -<constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1)" /> -<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)" /> - -<!-- geometries --> - -<frame_geometry name="normal" title_scale="medium" rounded_top_left="2" rounded_top_right="2"> - <distance name="left_width" value="2" /> - <distance name="right_width" value="2" /> - <distance name="bottom_height" value="2" /> - <distance name="left_titlebar_edge" value="5"/> - <distance name="right_titlebar_edge" value="5"/> - <distance name="title_vertical_pad" value="5"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <aspect_ratio name="button" value="1"/> +<!-- ::: CONSTANTS ::: --> +<constant name="C_titlebar" value="gtk:custom(wm_bg,#1e1e1e)" /> +<constant name="C_border_focused" value="gtk:custom(wm_border_focused,#3f3f3f)" /> +<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,#3f3f3f)" /> +<constant name="C_title_focused" value="gtk:custom(wm_title_focused,#ededed)" /> +<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,#626262)" /> + +<!-- ::: GEOMETRY ::: --> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1"> + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="left_titlebar_edge" value="4" /> + <distance name="right_titlebar_edge" value="4" /> + <distance name="title_vertical_pad" value="0" /> + <aspect_ratio name="button" value="1.0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="2" rounded_top_right="2" parent="normal"> - <distance name="left_titlebar_edge" value="5"/> - <distance name="right_titlebar_edge" value="5"/> -</frame_geometry> +<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal" /> <frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> <distance name="bottom_height" value="0" /> - <distance name="left_titlebar_edge" value="5"/> - <distance name="right_titlebar_edge" value="5"/> - <distance name="title_vertical_pad" value="5"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> <frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="right_width" value="2" /> + <distance name="right_width" value="1" /> </frame_geometry> <frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> - <distance name="left_width" value="2" /> + <distance name="left_width" value="1" /> </frame_geometry> -<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="title_vertical_pad" value="5"/> - <border name="title_border" left="10" right="10" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> +<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="1" rounded_top_right="1"> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> <frame_geometry name="small_unfocused" parent="small"> - <distance name="left_titlebar_edge" value="5"/> - <distance name="right_titlebar_edge" value="5"/> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> </frame_geometry> -<frame_geometry name="nobuttons" hide_buttons="true" parent="normal"> -</frame_geometry> +<frame_geometry name="nobuttons" hide_buttons="true" parent="normal" /> <frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > - <distance name="left_width" value="2" /> - <distance name="right_width" value="2" /> - <distance name="bottom_height" value="2" /> - <distance name="title_vertical_pad" value="2" /> + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> -<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > +<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> <distance name="bottom_height" value="0" /> + <distance name="title_vertical_pad" value="0" /> <border name="title_border" left="0" right="0" top="0" bottom="0" /> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small"> - <distance name="title_vertical_pad" value="5"/> +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_right="1" rounded_bottom_left="1" parent="small"> </frame_geometry> -<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small"> - <distance name="title_vertical_pad" value="0"/> +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> </frame_geometry> -<!-- drawing operations --> - - <!-- title --> - +<!-- ::: TITLES ::: --> <draw_ops name="title_focused"> <title version="< 3.1" x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="C_title_focused"/> + y="(0 `max` ((height - title_height) / 2))" + color="C_title_focused" /> <title version=">= 3.1" x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" + y="(0 `max` ((height - title_height) / 2))" ellipsize_width="width" - color="C_title_focused"/> + color="C_title_focused" /> </draw_ops> <draw_ops name="title_unfocused"> <title version="< 3.1" x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" - color="C_title_unfocused"/> + y="(0 `max` ((height - title_height) / 2))" + color="C_title_unfocused" /> <title version=">= 3.1" x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2" - y="(0 `max` ((height - title_height) / 2)) + 1" + y="(0 `max` ((height - title_height) / 2))" ellipsize_width="width" - color="C_title_unfocused"/> + color="C_title_unfocused" /> </draw_ops> - <!-- window decorations --> - +<!-- ::: WINDOW DECORATIONS ::: --> <draw_ops name="entire_background_focused"> - <rectangle color="C_titlebar_focused" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="entire_background_unfocused"> @@ -131,16 +116,15 @@ </draw_ops> <draw_ops name="titlebar_fill_focused"> - <rectangle color="C_titlebar_focused" x="0" y="0" width="width" height="top_height" filled="true" /> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> - <draw_ops name="titlebar_fill_attached_focused"> - <rectangle color="C_titlebar_focused" x="0" y="0" width="width" height="top_height" filled="true" /> + <include name="entire_background_focused" /> </draw_ops> <draw_ops name="titlebar_fill_unfocused"> - <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="top_height" filled="true" /> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="titlebar_focused"> @@ -155,10 +139,6 @@ <include name="titlebar_fill_focused" /> </draw_ops> -<draw_ops name="rounded_titlebar_focused_alt"> - <include name="titlebar_fill_focused" /> -</draw_ops> - <draw_ops name="border_focused"> <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> </draw_ops> @@ -167,20 +147,16 @@ <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> </draw_ops> -<draw_ops name="border_attached_focused"> - <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> -</draw_ops> - <draw_ops name="rounded_border_focused"> <line color="C_border_focused" x1="2" y1="0" x2="width-3" y2="0" /> <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> <line color="C_border_focused" x1="0" y1="2" x2="0" y2="height-2" /> <line color="C_border_focused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> - <arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> - <arc color="C_border_focused" x="width-6" y="0" width="5" height="5" start_angle="0" extent_angle="90" /> + <arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> <!-- double arcs for darker borders --> - <arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> - <arc color="C_border_focused" x="width-6" y="0" width="5" height="5" start_angle="0" extent_angle="90" /> + <arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> </draw_ops> <draw_ops name="rounded_border_unfocused"> @@ -188,24 +164,24 @@ <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> <line color="C_border_unfocused" x1="0" y1="2" x2="0" y2="height-2" /> <line color="C_border_unfocused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> - <arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> - <arc color="C_border_unfocused" x="width-6" y="0" width="5" height="5" start_angle="0" extent_angle="90" /> + <arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> <!-- double arcs for darker borders --> - <arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> - <arc color="C_border_unfocused" x="width-6" y="0" width="5" height="5" start_angle="0" extent_angle="90" /> + <arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> </draw_ops> <draw_ops name="border_right_focused"> <line - x1="width-1" y1="0" - x2="width-1" y2="height" + x1="width-1" y1="0" + x2="width-1" y2="height" color="C_border_focused" /> </draw_ops> <draw_ops name="border_right_unfocused"> <line - x1="width" y1="0" - x2="width" y2="height" + x1="width-1" y1="0" + x2="width-1" y2="height" color="C_border_unfocused" /> </draw_ops> @@ -223,311 +199,172 @@ color="C_border_unfocused" /> </draw_ops> -<!-- button icons--> - +<!-- ::: BUTTON ICONS ::: --> <!-- note: negative values in x or y causes gnome-shell to crash --> +<!-- close icon --> <draw_ops name="close_focused"> - <image filename="close_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="close_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_focused_prelight"> - <image filename="close_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="close_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_focused_pressed"> - <image filename="close_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="close_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="close_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="close_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused_prelight"> - <image filename="close_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="close_focused_prelight" /> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="close_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="close_focused_pressed" /> </draw_ops> +<!-- maximize icon --> <draw_ops name="maximize_focused"> - <image filename="maximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="maximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_focused_prelight"> - <image filename="maximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="maximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_focused_pressed"> - <image filename="maximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="maximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="maximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="maximize_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused_prelight"> - <image filename="maximize_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="maximize_focused_prelight" /> </draw_ops> <draw_ops name="maximize_unfocused_pressed"> - <image filename="maximize_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="maximize_focused_pressed" /> </draw_ops> +<!-- unmaximize icon --> <draw_ops name="unmaximize_focused"> - <image filename="unmaximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unmaximize_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_focused_prelight"> - <image filename="unmaximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unmaximize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_focused_pressed"> - <image filename="unmaximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unmaximize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_unfocused"> - <image filename="unmaximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unmaximize_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_unfocused_prelight"> - <image filename="unmaximize_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="unmaximize_focused_prelight" /> </draw_ops> <draw_ops name="unmaximize_unfocused_pressed"> - <image filename="unmaximize_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="unmaximize_focused_pressed" /> </draw_ops> +<!-- minimize icon --> <draw_ops name="minimize_focused"> - <image filename="minimize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="minimize_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_focused_prelight"> - <image filename="minimize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="minimize_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_focused_pressed"> - <image filename="minimize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="minimize_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="minimize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="minimize_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused_prelight"> - <image filename="minimize_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="minimize_focused_prelight" /> </draw_ops> <draw_ops name="minimize_unfocused_pressed"> - <image filename="minimize_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="minimize_focused_pressed" /> </draw_ops> +<!-- menu icon --> +<draw_ops name="menu_focused"></draw_ops> + +<draw_ops name="menu_focused_prelight"></draw_ops> + +<draw_ops name="menu_focused_pressed"></draw_ops> + +<draw_ops name="menu_unfocused"></draw_ops> + +<draw_ops name="menu_unfocused_prelight"></draw_ops> + +<draw_ops name="menu_unfocused_pressed"></draw_ops> + +<!-- shade icon --> <draw_ops name="shade_focused"> - <image filename="shade_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="shade_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_focused_prelight"> - <image filename="shade_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="shade_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_focused_pressed"> - <image filename="shade_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="shade_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused"> - <image filename="shade_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="shade_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused_prelight"> - <image filename="shade_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="shade_focused_prelight" /> </draw_ops> <draw_ops name="shade_unfocused_pressed"> - <image filename="shade_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="shade_focused_pressed" /> </draw_ops> +<!-- unshade icon --> <draw_ops name="unshade_focused"> - <image filename="unshade_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unshade_focused_normal.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_focused_prelight"> - <image filename="unshade_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unshade_focused_prelight.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_focused_pressed"> - <image filename="unshade_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unshade_focused_pressed.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused"> - <image filename="unshade_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <image filename="unshade_unfocused.png" x="0" y="0" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused_prelight"> - <image filename="unshade_unfocused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="unshade_focused_prelight" /> </draw_ops> <draw_ops name="unshade_unfocused_pressed"> - <image filename="unshade_unfocused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2 - 3" - width="object_width" - height="object_height"/> + <include name="unshade_focused_pressed" /> </draw_ops> -<draw_ops name="menu_focused"></draw_ops> - -<draw_ops name="menu_focused_prelight"></draw_ops> - -<draw_ops name="menu_focused_pressed"></draw_ops> - -<draw_ops name="menu_unfocused"></draw_ops> - -<draw_ops name="menu_unfocused_prelight"></draw_ops> - -<draw_ops name="menu_unfocused_pressed"></draw_ops> - -<!-- frame styles --> - +<!-- ::: FRAME STYLES ::: --> <frame_style name="normal_focused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> @@ -546,8 +383,8 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> - <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> <button function="unshade" state="normal" draw_ops="unshade_focused" /> <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> @@ -567,15 +404,15 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -632,15 +469,15 @@ <piece position="entire_background" draw_ops="entire_background_unfocused" /> <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -699,15 +536,15 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -766,21 +603,23 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="rounded_border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -830,15 +669,15 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -897,15 +736,15 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -937,8 +776,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -962,8 +803,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -985,8 +828,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -1001,7 +846,8 @@ <frame_style name="attached_focused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_focused" /> <piece position="titlebar" draw_ops="titlebar_attached_focused" /> - <piece position="overlay" draw_ops="border_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> <button function="maximize" state="normal"><draw_ops></draw_ops></button> @@ -1011,8 +857,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -1026,6 +874,8 @@ <frame_style name="attached_unfocused" geometry="attached"> <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_unfocused" /> <button function="close" state="normal"><draw_ops></draw_ops></button> <button function="close" state="pressed"><draw_ops></draw_ops></button> @@ -1036,8 +886,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -1067,8 +919,10 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> @@ -1086,15 +940,15 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_right_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -1132,8 +986,10 @@ <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> <button function="above" state="normal"><draw_ops></draw_ops></button> @@ -1151,15 +1007,15 @@ <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> <piece position="title" draw_ops="title_unfocused" /> <piece position="overlay" draw_ops="border_left_unfocused" /> - <button function="close" state="normal" draw_ops="close_unfocused"/> - <button function="close" state="prelight" draw_ops="close_unfocused_prelight"/> - <button function="close" state="pressed" draw_ops="close_unfocused_pressed"/> - <button function="maximize" state="normal" draw_ops="maximize_unfocused"/> - <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/> - <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/> - <button function="minimize" state="normal" draw_ops="minimize_unfocused"/> - <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/> - <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> <button function="menu" state="normal" draw_ops="menu_unfocused" /> <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> @@ -1190,8 +1046,10 @@ <button function="menu" state="normal"><draw_ops></draw_ops></button> <button function="menu" state="pressed"><draw_ops></draw_ops></button> <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> <button function="shade" state="pressed"><draw_ops></draw_ops></button> <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> <button function="unshade" state="pressed"><draw_ops></draw_ops></button> <button function="above" state="normal"><draw_ops></draw_ops></button> <button function="above" state="pressed"><draw_ops></draw_ops></button> @@ -1203,91 +1061,88 @@ <button function="unstick" state="pressed"><draw_ops></draw_ops></button> </frame_style> -<!-- frame style sets --> - +<!-- ::: FRAME STYLE SETS ::: --> <frame_style_set name="normal_style_set"> - <frame focus="yes" state="normal" resize="both" style="normal_focused"/> - <frame focus="no" state="normal" resize="both" style="normal_unfocused"/> - <frame focus="yes" state="maximized" style="normal_max_focused"/> - <frame focus="no" state="maximized" style="normal_max_unfocused"/> - <frame focus="yes" state="shaded" style="normal_focused"/> - <frame focus="no" state="shaded" style="normal_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/> - <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_left" style="tiled_left_focused"/> - <frame version=">= 3.3"focus="no" state="tiled_left" style="tiled_left_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_right" style="tiled_right_focused"/> - <frame version=">= 3.3"focus="no" state="tiled_right" style="tiled_right_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/> - <frame version=">= 3.3"focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/> - <frame version=">= 3.3"focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/> - <frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/> + <frame focus="yes" state="normal" resize="both" style="normal_focused" /> + <frame focus="no" state="normal" resize="both" style="normal_unfocused" /> + <frame focus="yes" state="maximized" style="normal_max_focused" /> + <frame focus="no" state="maximized" style="normal_max_unfocused" /> + <frame focus="yes" state="shaded" style="normal_focused" /> + <frame focus="no" state="shaded" style="normal_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused" /> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused" /> + <frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused" /> + <frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused" /> </frame_style_set> <frame_style_set name="dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="dialog_focused"/> - <frame focus="no" state="shaded" style="dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="dialog_focused" /> + <frame focus="no" state="shaded" style="dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="modal_dialog_style_set"> - <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/> - <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="modal_dialog_focused"/> - <frame focus="no" state="shaded" style="modal_dialog_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="modal_dialog_focused" /> + <frame focus="no" state="shaded" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="utility_style_set"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="utility_focused"/> - <frame focus="no" state="shaded" style="utility_unfocused"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="utility_focused" /> + <frame focus="no" state="normal" resize="both" style="utility_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="utility_focused" /> + <frame focus="no" state="shaded" style="utility_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="border_style_set"> - <frame focus="yes" state="normal" resize="both" style="border_focused"/> - <frame focus="no" state="normal" resize="both" style="border_unfocused"/> - <frame focus="yes" state="maximized" style="borderless"/> - <frame focus="no" state="maximized" style="borderless"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="border_focused" /> + <frame focus="no" state="normal" resize="both" style="border_unfocused" /> + <frame focus="yes" state="maximized" style="borderless" /> + <frame focus="no" state="maximized" style="borderless" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> <frame_style_set name="attached_style_set"> - <frame focus="yes" state="normal" resize="both" style="attached_focused"/> - <frame focus="no" state="normal" resize="both" style="attached_unfocused"/> - <frame focus="yes" state="maximized" style="blank"/> - <frame focus="no" state="maximized" style="blank"/> - <frame focus="yes" state="shaded" style="blank"/> - <frame focus="no" state="shaded" style="blank"/> - <frame focus="yes" state="maximized_and_shaded" style="blank"/> - <frame focus="no" state="maximized_and_shaded" style="blank"/> + <frame focus="yes" state="normal" resize="both" style="attached_focused" /> + <frame focus="no" state="normal" resize="both" style="attached_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> </frame_style_set> - -<!-- windows --> - -<window type="normal" style_set="normal_style_set"/> -<window type="dialog" style_set="dialog_style_set"/> -<window type="modal_dialog" style_set="modal_dialog_style_set"/> -<window type="menu" style_set="utility_style_set"/> -<window type="utility" style_set="utility_style_set"/> -<window type="border" style_set="border_style_set"/> -<window version=">= 3.2" type="attached" style_set="attached_style_set"/> +<!-- ::: WINDOWS ::: --> +<window type="normal" style_set="normal_style_set" /> +<window type="dialog" style_set="dialog_style_set" /> +<window type="modal_dialog" style_set="modal_dialog_style_set" /> +<window type="menu" style_set="utility_style_set" /> +<window type="utility" style_set="utility_style_set" /> +<window type="border" style_set="border_style_set" /> +<window version=">= 3.2" type="attached" style_set="attached_style_set" /> </metacity_theme> Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/minimize_unfocused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/minimize_unfocused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/minimize_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/minimize_unfocused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/shade_unfocused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/shade_unfocused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/shade_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/shade_unfocused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/unmaximize_unfocused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/unmaximize_unfocused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/unmaximize_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/unmaximize_unfocused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/unshade_unfocused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/unshade_unfocused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/albatross/metacity-1/unshade_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/albatross/metacity-1/unshade_unfocused_pressed.png differ diff -Nru shimmer-themes-1.6.1/bluebird/gtk-2.0/gtkrc shimmer-themes-1.6.2/bluebird/gtk-2.0/gtkrc --- shimmer-themes-1.6.1/bluebird/gtk-2.0/gtkrc 2013-07-12 17:00:40.000000000 -0400 +++ shimmer-themes-1.6.2/bluebird/gtk-2.0/gtkrc 2013-09-13 18:24:37.000000000 -0400 @@ -4,13 +4,13 @@ # Description: As is the original theme, this theme is 100% free and open source. # These are the defined colors for the theme, you can change them in GNOME's appearance preferences. -gtk_color_scheme = "bg_color:#DCDCDC\nselected_bg_color:#7E9EBD\nbase_color:#F7F7F7" # Background, base. -gtk_color_scheme = "fg_color:#3C3C3C\nselected_fg_color:#f5f5f5\ntext_color:#3C3C3C" # Foreground, text. -gtk_color_scheme = "tooltip_bg_color:#000000\ntooltip_fg_color:#E1E1E1" # Tooltips. -gtk_color_scheme = "link_color:#08c" # Hyperlinks -gtk_color_scheme = "panel_bg:#303030" # Panel bg color. Not used here though. -gtk_color_scheme = "fm_color:#F7F7F7" # Color used in Nautilus and Thunar. -gtk_color_scheme = "frame_color:#CDCDCD\ninactive_frame_color:#CDCDCD" # Fix for Chrome +gtk-color-scheme = "bg_color:#DCDCDC\nselected_bg_color:#7E9EBD\nbase_color:#F7F7F7" # Background, base. +gtk-color-scheme = "fg_color:#3C3C3C\nselected_fg_color:#f5f5f5\ntext_color:#3C3C3C" # Foreground, text. +gtk-color-scheme = "tooltip_bg_color:#000000\ntooltip_fg_color:#E1E1E1" # Tooltips. +gtk-color-scheme = "link_color:#08c" # Hyperlinks +gtk-color-scheme = "panel_bg:#303030" # Panel bg color. Not used here though. +gtk-color-scheme = "fm_color:#F7F7F7" # Color used in Nautilus and Thunar. +gtk-color-scheme = "frame_color:#CDCDCD\ninactive_frame_color:#CDCDCD" # Fix for Chrome ### EXTERNAL FILES ### include "panel.rc" # This includes the file that handles panel theming. diff -Nru shimmer-themes-1.6.1/bluebird/gtk-3.0/apps/gnome-applications.css shimmer-themes-1.6.2/bluebird/gtk-3.0/apps/gnome-applications.css --- shimmer-themes-1.6.1/bluebird/gtk-3.0/apps/gnome-applications.css 2013-07-12 17:00:40.000000000 -0400 +++ shimmer-themes-1.6.2/bluebird/gtk-3.0/apps/gnome-applications.css 2013-09-13 18:24:37.000000000 -0400 @@ -97,8 +97,8 @@ } .nautilus-desktop.nautilus-canvas-item { - color: #fff; - text-shadow: 1px 1px #000; + color: white; + text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:active { @@ -115,44 +115,42 @@ text-shadow: none; } -NautilusWindow .sidebar .frame { - border-width: 1px 0 0 0; +NautilusWindow .toolbar { + border-width: 0 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; + border-color: shade(@toolbar_bg_color, 0.8); +} + +NautilusWindow .sidebar .frame { + border-style: none; } NautilusWindow > GtkGrid > .pane-separator, NautilusWindow > GtkGrid > .pane-separator:hover { - border-width: 1px 1px 0 0; + border-width: 0 1px 0 0; border-style: solid; border-color: shade(@theme_bg_color, 0.8); background-color: @theme_bg_color; } -NautilusView.frame, NautilusNotebook.notebook { border-right-width: 0; - border-bottom-width: 0; border-left-width: 0; + border-bottom-width: 0; } NautilusNotebook .frame { - border-width: 1px 0 0 0; + border-width: 0; } NautilusQueryEditor .primary-toolbar.toolbar { - padding: 4px; - border-top-width: 1px; + border-top-width: 0; border-bottom-width: 0; } -NautilusQueryEditor .primary-toolbar.toolbar .button { - padding: 0; -} - NautilusQueryEditor .toolbar { - padding: 4px 4px 3px 4px; + padding-top: 3px; + padding-bottom: 2px; border-width: 1px 0 0 0; border-style: solid; border-color: @toolbar_bg_color; @@ -163,20 +161,12 @@ border-color: shade(@toolbar_bg_color, 0.8); } -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar { - border-top-width: 0; -} - -NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child, -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child { +NautilusQueryEditor .toolbar:last-child, +NautilusQueryEditor .primary-toolbar.toolbar:only-child { border-bottom-width: 1px; border-bottom-color: shade(@toolbar_bg_color, 0.8); } -.toolbar NautilusPathBar .button { - padding: 1px 5px; -} - /****************** * gnome terminal * ******************/ diff -Nru shimmer-themes-1.6.1/bluebird/gtk-3.0/apps/xfce.css shimmer-themes-1.6.2/bluebird/gtk-3.0/apps/xfce.css --- shimmer-themes-1.6.1/bluebird/gtk-3.0/apps/xfce.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/bluebird/gtk-3.0/apps/xfce.css 2013-09-13 18:24:37.000000000 -0400 @@ -0,0 +1,59 @@ +XfceHeading { + background-color: @theme_base_color; + background-image: none; + padding: 0; + border-width: 0; +} + +.xfce4-panel { + background-color: @panel_bg_color; +} + +.xfce4-panel .button { + border-radius: 0; + padding: 1px; + color: @panel_fg_color; +} + +.xfce4-panel .button:active { + border-color: shade(@panel_bg_color, 1.2); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@selected_bg_color, 0.6)), + to (shade(@selected_bg_color, 0.68))); + + box-shadow: inset 0 -1px alpha(white, 0.15), + inset 0 1px alpha(black, 0.25); +} + +.xfce4-panel .button:hover, +.xfce4-panel .button:active:hover { + border-color: shade(@selected_bg_color, 0.95); + border-radius: 0; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@selected_bg_color, 0.8)), + to (shade(@selected_bg_color, 0.88))); + + transition: none; +} + +/* menu-styling, e.g. for indicators */ +.xfce4-panel .menu, +.xfce4-panel .menu GtkLabel, +.xfce4-panel .menu GtkImage { + background-color: shade(@menu_bg_color, 1.18); + color: @menu_fg_color; +} + +.xfce4-panel .menu *:hover { + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@theme_selected_bg_color, 1.2)), + to (shade(@theme_selected_bg_color, 1.0))); + + transition: none; +} + +.xfce4-panel .menu GtkLabel:hover, +.xfce4-panel .menu GtkImage:hover { + background-image: none; + background-color: transparent; +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/bluebird/gtk-3.0/assets/pane-separator.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/bluebird/gtk-3.0/assets/pane-separator.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/bluebird/gtk-3.0/assets/pane-separator-vertical.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/bluebird/gtk-3.0/assets/pane-separator-vertical.png differ diff -Nru shimmer-themes-1.6.1/bluebird/gtk-3.0/gtk.css shimmer-themes-1.6.2/bluebird/gtk-3.0/gtk.css --- shimmer-themes-1.6.1/bluebird/gtk-3.0/gtk.css 2013-07-12 17:00:40.000000000 -0400 +++ shimmer-themes-1.6.2/bluebird/gtk-3.0/gtk.css 2013-09-13 18:24:37.000000000 -0400 @@ -42,8 +42,8 @@ @define-color toolbar_fg_color @theme_fg_color; @define-color menu_bg_color @theme_bg_color; @define-color menu_fg_color @theme_fg_color; -@define-color panel_bg_color @theme_bg_color; -@define-color panel_fg_color @theme_fg_color; +@define-color panel_bg_color #212936; +@define-color panel_fg_color #f7f7f7; /* osd */ @define-color osd_base #333; @@ -55,7 +55,8 @@ @define-color backdrop_selected_fg_color @theme_fg_color; /* window manager colors */ -@define-color wm_bg @theme_bg_color; +@define-color wm_bg_a shade(@theme_bg_color, 1.07); +@define-color wm_bg_b @theme_bg_color; @define-color wm_title_focused mix(@theme_fg_color, @theme_bg_color, 0.1); @define-color wm_title_unfocused mix(@theme_fg_color, @theme_bg_color, 0.6); @define-color wm_border_focused shade(@theme_bg_color, 0.7); @@ -66,3 +67,4 @@ @import url("gtk-widgets-assets.css"); @import url("apps/gnome-applications.css"); @import url("apps/unity.css"); +@import url("apps/xfce.css"); diff -Nru shimmer-themes-1.6.1/bluebird/gtk-3.0/gtk-widgets-assets.css shimmer-themes-1.6.2/bluebird/gtk-3.0/gtk-widgets-assets.css --- shimmer-themes-1.6.1/bluebird/gtk-3.0/gtk-widgets-assets.css 2013-07-12 17:00:40.000000000 -0400 +++ shimmer-themes-1.6.2/bluebird/gtk-3.0/gtk-widgets-assets.css 2013-09-13 18:24:37.000000000 -0400 @@ -142,3 +142,18 @@ .grip { background-image: url("assets/resize-grip.png"); } + +/****************** + * pane separator * + ******************/ +.pane-separator.horizontal { + background-image: url("assets/pane-separator.png"); + background-repeat: no-repeat; + background-position: center center; +} + +.pane-separator.vertical { + background-image: url("assets/pane-separator-vertical.png"); + background-repeat: no-repeat; + background-position: center center; +} diff -Nru shimmer-themes-1.6.1/bluebird/gtk-3.0/gtk-widgets.css shimmer-themes-1.6.2/bluebird/gtk-3.0/gtk-widgets.css --- shimmer-themes-1.6.1/bluebird/gtk-3.0/gtk-widgets.css 2013-07-12 17:00:40.000000000 -0400 +++ shimmer-themes-1.6.2/bluebird/gtk-3.0/gtk-widgets.css 2013-09-13 18:24:37.000000000 -0400 @@ -89,6 +89,15 @@ color: mix(@theme_fg_color, @theme_bg_color, 0.5); } +/* apply effects to insensitive and prelit images */ +*:insensitive { + -gtk-image-effect: dim; +} + +*:hover { + -gtk-image-effect: highlight; +} + .gtkstyle-fallback { background-color: @theme_bg_color; color: @theme_fg_color; @@ -132,25 +141,28 @@ /* inset shadows */ .button, -.toolbar .button, .primary-toolbar .raised .button, .primary-toolbar .raised.button, +.toolbar .button, +.header-bar .button, GtkSwitch.slider { box-shadow: inset 1px 1px alpha(@light_shadow, 0.4), inset -1px 0 alpha(@light_shadow, 0.4); } .button:active, +.primary-toolbar .button:active, .toolbar .button:active, -.primary-toolbar .button:active { +.header-bar .button:active { box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } .button:insensitive, -.toolbar .button:insensitive, .primary-toolbar .raised .button:insensitive, .primary-toolbar .raised.button:insensitive, +.toolbar .button:insensitive, +.header-bar .button:insensitive, GtkSwitch.slider:insensitive { box-shadow: inset 1px 1px alpha(@light_shadow, 0.2), inset -1px 0 alpha(@light_shadow, 0.2); @@ -168,9 +180,12 @@ inset 0 -1px alpha(@dark_shadow, 0.05); } -.button:active:insensitive, -.primary-toolbar .button:active:insensitive, -.entry:insensitive { +/* disable box shadow */ +.primary-toolbar GtkComboBox, +.primary-toolbar .button *, +.primary-toolbar .button, +column-header .button, +GtkCalendar.button { box-shadow: none; } @@ -245,7 +260,7 @@ to (shade(shade(@theme_bg_color, 0.95), 0.95))); } -.button:active:insensitive { +.button:active *:insensitive { border-color: shade(@theme_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@theme_bg_color, 0.97)), @@ -290,6 +305,7 @@ } row:selected, +row:selected:hover, row:selected:focus { border-width: 1px 0; border-style: solid; @@ -589,6 +605,7 @@ color: @theme_selected_fg_color; } +.content-view.view.rubberband, .view.rubberband, .rubberband { border-width: 1px; @@ -635,6 +652,24 @@ color: @info_fg_color; } +.info .button.close { + color: @info_fg_color; +} + +.info .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.info .button.close:active { + color: @info_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .warning { border-width: 1px; border-style: solid; @@ -646,6 +681,24 @@ color: @warning_fg_color; } +.warning .button.close { + color: @warning_fg_color; +} + +.warning .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.warning .button.close:active { + color: @warning_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .question { border-width: 1px; border-style: solid; @@ -657,6 +710,24 @@ color: @question_fg_color; } +.question .button.close { + color: @question_fg_color; +} + +.question .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.question .button.close:active { + color: @question_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .error { border-width: 1px; border-style: solid; @@ -668,6 +739,24 @@ color: @error_fg_color; } +.error .button.close { + color: @error_fg_color; +} + +.error .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.error .button.close:active { + color: @error_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + /******************* * symbolic images * *******************/ @@ -737,15 +826,8 @@ } .view.dim-label, -.dim-label, -.dim-label:hover, -.dim-label:focus { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -.dim-label:selected, -.dim-label:selected:focus { - color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.5); +.dim-label { + color: alpha(currentColor, 0.5); } .dnd { @@ -771,9 +853,12 @@ background-color: @menu_bg_color; } +.primary-toolbar .menu, .primary-toolbar .button .menu, .toolbar .menu, .toolbar .primary-toolbar .menu, +.header-bar .menu, +.header-bar .primary-toolbar .menu, .menu { padding: 0; border-radius: 0; @@ -786,7 +871,7 @@ .menu.button:hover, .menu.button:active, -.menu.button:active:insensitive, +.menu.button:active *:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -794,6 +879,16 @@ background-image: none; } +.context-menu { + font: initial; +} + +/* ubuntu software center menu */ +#toolbar-popup { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + /*********** * menubar * ***********/ @@ -824,10 +919,11 @@ .menubar .menuitem:hover { border-color: shade(@menubar_bg_color, 1.3); background-color: shade(@menubar_bg_color, 1.3); + color: @menubar_fg_color; } .menubar .menuitem *:hover { - color: @theme_selected_fg_color; + color: @menubar_fg_color; } /************ @@ -838,10 +934,6 @@ border-width: 0; } -GtkTreeMenu .menuitem * { - color: @menu_fg_color; -} - .menuitem, .menu .menuitem { padding: 2px; @@ -931,6 +1023,10 @@ color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6); } +GtkModelMenuItem GtkBox GtkImage { + padding-right: 4px; +} + /************ * notebook * ************/ @@ -1220,6 +1316,15 @@ to (shade(shade(@theme_bg_color, 0.95), 0.95))); } +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + .scale.mark { border-color: shade(@theme_bg_color, 0.4); } @@ -1327,6 +1432,12 @@ background-color: @theme_selected_bg_color; } +.scrollbar.slider.fine-tune:prelight:active { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + /* overlay scrollbar */ OsThumb { color: shade(@theme_bg_color, 0.7); @@ -1371,21 +1482,32 @@ .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, -.primary-toolbar .separator:insensitive { +.primary-toolbar .separator:insensitive, +.toolbar GtkSeparatorToolItem, +.toolbar .separator, +.toolbar .separator:insensitive +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { border-color: transparent; + color: transparent; } +.primary-toolbar .button .separator, +.primary-toolbar .button.separator, .toolbar .button .separator, .toolbar .button.separator, -.primary-toolbar .button .separator, -.primary-toolbar .button.separator { +.header-bar .button .separator, +.header-bar .button.separator { border-color: transparent; } +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive, .toolbar .button .separator:insensitive, .toolbar .button.separator:insensitive, -.primary-toolbar .button .separator:insensitive, -.primary-toolbar .button.separator:insensitive { +.header-bar .button .separator:insensitive, +.header-bar .button.separator:insensitive { border-color: transparent; } @@ -1394,8 +1516,7 @@ -GtkWidget-separator-height: 1; border-style: none; - background-color: transparent; - color: @menu_bg_color; + color: shade(@menu_bg_color, 0.9); } GtkComboBox .separator { @@ -1824,26 +1945,36 @@ * header-bar * **************/ .header-bar { + padding: 6px; border-width: 0 0 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.9); - padding: 0 2px; - background-color: @theme_bg_color; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@toolbar_bg_color, 1.0)), + to (shade(@toolbar_bg_color, 0.9))); } .header-bar .button.text-button { - padding: 2px 4px; + padding: 4px; } .header-bar .button.image-button { - padding: 4px 3px 3px 4px; + padding: 6px; +} + +.header-bar .title { + font: bold; +} + +.header-bar .subtitle { + font: smaller; } /*********** * toolbar * ***********/ .toolbar { - padding: 2px; + padding: 6px; border-style: none; background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@toolbar_bg_color, 1.0)), @@ -1867,7 +1998,6 @@ background-color: shade(@toolbar_bg_color, 0.9); } - /* menubar toolbars */ .toolbar.menubar { -GtkToolbar-button-relief: normal; @@ -1908,7 +2038,9 @@ .primary-toolbar .raised .button, .primary-toolbar .raised.button, .toolbar GtkComboBox, -.toolbar .button { +.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { border-color: shade(@toolbar_bg_color, 0.8); background-color: transparent; background-image: -gtk-gradient(linear, left top, left bottom, @@ -1919,15 +2051,17 @@ } .primary-toolbar .button:hover, -.toolbar .button:hover { +.toolbar .button:hover, +.header-bar .button:hover { + border-color: shade(@toolbar_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 1.45), 1.1)), to (shade(shade(@theme_selected_bg_color, 1.45), 0.95))); - border-color: shade(@toolbar_bg_color, 0.7); } .primary-toolbar .button:active, -.toolbar .button:active { +.toolbar .button:active, +.header-bar .button:active { border-color: shade(@toolbar_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@toolbar_bg_color, 1.02), 0.9)), @@ -1935,7 +2069,8 @@ } .primary-toolbar .button:active:hover, -.toolbar .button:active:hover { +.toolbar .button:active:hover, +.header-bar .button:active:hover { border-color: shade(@toolbar_bg_color, 0.7); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(shade(@theme_selected_bg_color, 1.45), 1.1)), @@ -1949,27 +2084,35 @@ .toolbar .button:focus, .toolbar .button:hover:focus, .toolbar .button:active:focus, -.toolbar .button:active:hover:focus { +.toolbar .button:active:hover:focus, +.header-bar .button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:active:hover:focus { border-color: shade(@toolbar_bg_color, 0.7); } .primary-toolbar .button:insensitive, -.toolbar .button:insensitive { +.toolbar .button:insensitive, +.header-bar .button:insensitive { border-color: shade(@toolbar_bg_color, 0.9); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@toolbar_bg_color, 1.04)), to (shade(@toolbar_bg_color, 0.96))); } -.primary-toolbar .button:active:insensitive, -.toolbar .button:active:insensitive { +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive { border-color: shade(@toolbar_bg_color, 0.8); background-image: -gtk-gradient(linear, left top, left bottom, from (shade(@toolbar_bg_color, 0.97)), to (shade(@toolbar_bg_color, 1.0))); } -.primary-toolbar .entry { +.primary-toolbar .entry, +.toolbar .entry, +.header-bar .entry { border-top-color: shade(@toolbar_bg_color, 0.7); border-right-color: shade(@toolbar_bg_color, 0.76); border-left-color: shade(@toolbar_bg_color, 0.76); @@ -1977,7 +2120,11 @@ } .primary-toolbar .entry:active, -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.toolbar .entry:active, +.toolbar .entry:focus, +.header-bar .entry:active, +.header-bar .entry:focus { border-color: shade(@theme_selected_bg_color, 0.8); } @@ -2058,7 +2205,7 @@ .inline-toolbar.toolbar GtkToolButton .button, .inline-toolbar.toolbar GtkToolButton > .button { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), - inset 1px 1px alpha(@light_shadow, 0.4); + inset 1px 1px alpha(@light_shadow, 0.4); } .linked .button:active, @@ -2079,12 +2226,12 @@ } /* remove box shadow from last-child and only-child */ -.linked .button:active:insensitive:last-child, -.linked .button:active:insensitive:only-child, -.inline-toolbar.toolbar .button:active:insensitive:last-child, -.inline-toolbar.toolbar .button:active:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive { +.linked .button:active *:insensitive:last-child, +.linked .button:active *:insensitive:only-child, +.inline-toolbar.toolbar .button:active *:insensitive:last-child, +.inline-toolbar.toolbar .button:active *:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2218,12 +2365,12 @@ } /* remove box shadow from last-child and only-child */ -.linked.vertical .button:active:insensitive:last-child, -.linked.vertical .button:active:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive { +.linked.vertical .button:active *:insensitive:last-child, +.linked.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2309,14 +2456,24 @@ /* linked toolbar buttons */ .primary-toolbar .button.raised.linked, .primary-toolbar .raised.linked .button, -.toolbar .button.linked { +.toolbar .button.raised.linked, +.toolbar .raised.linked .button, +.toolbar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button, +.header-bar .linked .button { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 1px alpha(@light_shadow, 0.4); } .primary-toolbar .button.raised.linked:active, .primary-toolbar .raised.linked .button:active, -.toolbar .button.linked:active { +.toolbar .button.raised.linked:active, +.toolbar .raised.linked .button:active, +.toolbar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active, +.header-bar .linked .button:active { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); @@ -2324,18 +2481,33 @@ .primary-toolbar .button.raised.linked:insensitive, .primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.linked:insensitive { +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 1px alpha(@light_shadow, 0.2); } /* remove box shadow from last-child and only-child */ -.primary-toolbar .button:active:insensitive.raised.linked:last-child, -.primary-toolbar .button:active:insensitive.raised.linked:only-child, -.primary-toolbar .raised.linked .button:active:insensitive:last-child, -.primary-toolbar .raised.linked .button:active:insensitive:only-child, -.toolbar .button:active:insensitive.raised.linked:last-child, -.toolbar .button:active:insensitive.raised.linked:only-child { +.primary-toolbar .button:active *:insensitive.raised.linked:last-child, +.primary-toolbar .button:active *:insensitive.raised.linked:only-child, +.primary-toolbar .raised.linked .button:active *:insensitive:last-child, +.primary-toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .button:active *:insensitive.raised.linked:last-child, +.toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:active *:insensitive:last-child, +.toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .linked .button:active *:insensitive:last-child, +.toolbar .linked .button:active *:insensitive:only-child, +.header-bar .button:active *:insensitive.raised.linked:last-child, +.header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:active *:insensitive:last-child, +.header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .linked .button:active *:insensitive:last-child, +.header-bar .linked .button:active *:insensitive:only-child { box-shadow: none; } @@ -2344,8 +2516,18 @@ .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:only-child { +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:only-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:only-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:only-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:only-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:only-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:only-child { box-shadow: inset 1px 1px alpha(@light_shadow, 0.4), inset -1px 0 alpha(@light_shadow, 0.4); } @@ -2355,7 +2537,17 @@ .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:insensitive:only-child, .toolbar .button:insensitive.raised.linked:last-child, -.toolbar .button:insensitive.raised.linked:only-child { +.toolbar .button:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:insensitive:last-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button:insensitive.raised.linked:last-child, +.header-bar .button:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:insensitive:only-child { box-shadow: inset 1px 1px alpha(@light_shadow, 0.2), inset -1px 0 alpha(@light_shadow, 0.2); } @@ -2365,7 +2557,17 @@ .primary-toolbar .raised.linked .button:active:last-child, .primary-toolbar .raised.linked .button:active:only-child, .toolbar .button:active.raised.linked:last-child, -.toolbar .button:active.raised.linked:only-child { +.toolbar .button:active.raised.linked:only-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:active:only-child, +.header-bar .button:active.raised.linked:last-child, +.header-bar .button:active.raised.linked:only-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:active:only-child { box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } @@ -2377,9 +2579,24 @@ .primary-toolbar .raised.linked .button, .primary-toolbar .raised.linked .button:active, .primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.linked, -.toolbar .button.linked:active, -.toolbar .button.linked:insensitive { +.toolbar .button.raised.linked, +.toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button, +.toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button, +.toolbar .linked .button:active, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked, +.header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:insensitive { border-width: 3px; border-radius: 0; border-right-width: 0; @@ -2393,9 +2610,24 @@ .primary-toolbar .raised.linked .button:first-child, .primary-toolbar .raised.linked .button:active:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, -.toolbar .button.linked:first-child, -.toolbar .button.linked:active:first-child, -.toolbar .button.linked:insensitive:first-child { +.toolbar .button.raised.linked:first-child, +.toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:insensitive:first-child, +.toolbar .raised.linked .button:first-child, +.toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:insensitive:first-child, +.toolbar .linked .button:first-child, +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:insensitive:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .button.raised.linked:active:first-child, +.header-bar .button.raised.linked:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:insensitive:first-child { border-width: 3px; border-radius: 5px; border-right-width: 0; @@ -2410,9 +2642,24 @@ .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:active:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:active:last-child, -.toolbar .button.linked:insensitive:last-child { +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:insensitive:last-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:insensitive:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:insensitive:last-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:insensitive:last-child { border-width: 3px; border-radius: 5px; border-left-width: 0; @@ -2427,9 +2674,24 @@ .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:active:only-child, .primary-toolbar .raised.linked .button:insensitive:only-child, -.toolbar .button.linked:only-child, -.toolbar .button.linked:active:only-child, -.toolbar .button.linked:insensitive:only-child { +.toolbar .button.raised.linked:only-child, +.toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:insensitive:only-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:active:only-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:insensitive:only-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:insensitive:only-child { border-width: 3px; border-radius: 5px; } @@ -2569,8 +2831,8 @@ background-image: none; } -.osd.button:active:insensitive, -.osd .button:active:insensitive { +.osd.button:active *:insensitive, +.osd .button:active *:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -2628,7 +2890,7 @@ background-image: none; } -.osd.toolbar .button:active:insensitive { +.osd.toolbar .button:active *:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; @@ -2785,6 +3047,43 @@ background-color: @osd_bg; } +/****************************** + * destructive action buttons * + ******************************/ +.destructive-action.button { + border-width: 3px; + border-style: solid; + border-color: shade(@error_color, 0.8); + border-radius: 5px; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@error_color, 1.2), 1.05)), + to (shade(shade(@error_color, 1.2), 0.97))); + + color: @theme_selected_fg_color; + box-shadow: none; +} + +.destructive-action.button:hover { + border-color: shade(@error_color, 0.8); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(mix(@theme_base_color, @error_color, 0.7), 1.05)), + to (shade(mix(@theme_base_color, @error_color, 0.7), 0.97))); +} + +.destructive-action.button:active { + border-color: shade(@error_color, 0.8); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(shade(@error_color, 1.2), 1.05)), + to (shade(shade(@error_color, 1.2), 0.97))); +} + +.destructive-action.button:hover:active { + border-color: shade(@error_color, 0.7); + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(mix(@theme_base_color, @error_color, 0.7), 1.05)), + to (shade(mix(@theme_base_color, @error_color, 0.7), 0.97))); +} + /****************** * selection mode * ******************/ @@ -2936,3 +3235,97 @@ GtkBubbleWindow .toolbar { background-color: transparent; } + +/******* + * CSD * + *******/ +.titlebar { + border-radius: 5px 5px 0 0; + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@toolbar_bg_color, 1.0)), + to (shade(@toolbar_bg_color, 0.9))); + + text-shadow: none; +} + +/* 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 .title { + font: bold; +} + +.titlebar:backdrop { + background-image: -gtk-gradient(linear, left top, left bottom, + from (shade(@toolbar_bg_color, 0.97)), + to (shade(@@toolbar_bg_color, 0.9))); + + text-shadow: none; +} + +.titlebar .titlebutton { + padding: 4px; + border-style: none; + border-image: none; + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.3); + box-shadow: none; +} + +.titlebar .titlebutton:hover, +.titlebar .titlebutton:hover:focus { + border-image: none; + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.2); + box-shadow: none; +} + +.titlebar .titlebutton:active, +.titlebar .titlebutton:active:hover { + border-image: none; + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.1); + box-shadow: none; +} + +/* +.titlebar .right .titlebutton:first-child { + border-left: 1px solid shade(@toolbar_bg_color, 0.9); +} + +.titlebar .right .titlebutton:last-child { +} + +.titlebar .left .titlebutton:last-child { + border-right: 1px solid shade(@toolbar_bg_color, 0.9); +} + +.titlebar .left .titlebutton:first-child { +} +*/ + +.titlebar .titlebutton:backdrop { + background-image: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5); +} + +.window-frame { + border-style: none; + border-radius: 5px 5px 0 0; + box-shadow: 0 3px 7px alpha(black, 0.7), + 0 0 0 1px alpha(black, 0.2); + + /* this is used for the resize cursor area */ + margin: 10px; +} + +.window-frame:backdrop { + box-shadow: 0 3px 5px alpha(black, 0.5), + 0 0 0 1px alpha(black, 0.2); +} diff -Nru shimmer-themes-1.6.1/debian/changelog shimmer-themes-1.6.2/debian/changelog --- shimmer-themes-1.6.1/debian/changelog 2013-08-29 04:54:47.000000000 -0400 +++ shimmer-themes-1.6.2/debian/changelog 2013-09-18 18:58:05.000000000 -0400 @@ -1,3 +1,13 @@ +shimmer-themes (1.6.2-0ubuntu1) saucy; urgency=low + + * New release of all themes (Albatross:v1.5.1, Bluebird:v0.9, + Greybird:v1.2.2, Numix:v2.0, Orion:v1.3). + - Add support for Granite widgets + - Add support for Gtk3.9 + - Add support for Client-side decorations + + -- Sean Davis <smd.seandavis@gmail.com> Wed, 18 Sep 2013 18:55:28 -0400 + shimmer-themes (1.6.1-0ubuntu1) saucy; urgency=low * New releases of all themes (Albatross:v1.4, Bluebird:v0.8, diff -Nru shimmer-themes-1.6.1/greybird/gtk-2.0/gtkrc shimmer-themes-1.6.2/greybird/gtk-2.0/gtkrc --- shimmer-themes-1.6.1/greybird/gtk-2.0/gtkrc 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-2.0/gtkrc 2013-09-17 04:27:47.000000000 -0400 @@ -4,7 +4,7 @@ # Description: As is the original theme, this theme is 100% free and open source. gtk-color-scheme = "bg_color:#CECECE\nselected_bg_color:#398ee7\nbase_color:#fcfcfc" # Background, base. -gtk-color-scheme = "fg_color:#3C3C3C\nselected_fg_color:#ffffff\ntext_color:#000000" # Foreground, text. +gtk-color-scheme = "fg_color:#3C3C3C\nselected_fg_color:#ffffff\ntext_color:#212121" # Foreground, text. gtk-color-scheme = "tooltip_bg_color:#000000\ntooltip_fg_color:#E1E1E1" # Tooltips. gtk-color-scheme = "link_color:#2c82dd" # Hyperlinks gtk-color-scheme = "panel_bg:#686868" # Panel bg color diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/apps/gnome-applications.css shimmer-themes-1.6.2/greybird/gtk-3.0/apps/gnome-applications.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/apps/gnome-applications.css 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/apps/gnome-applications.css 2013-09-17 04:27:47.000000000 -0400 @@ -5,9 +5,10 @@ PanelApplet, PanelToplevel { padding: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.5)), - to (shade(@panel_bg_color, 1.05))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.5), + shade(@panel_bg_color, 1.05) + ); color: @panel_fg_color; } @@ -18,9 +19,10 @@ PanelSeparator { border-width: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.5)), - to (shade(@panel_bg_color, 1.05))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.5), + shade(@panel_bg_color, 1.05) + ); color: @panel_fg_color; } @@ -33,17 +35,19 @@ -PanelMenuBar-icon-visible: true; border-width: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.5)), - to (shade(@panel_bg_color, 1.05))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.5), + shade(@panel_bg_color, 1.05) + ); } PanelAppletFrame { border-width: 0; - background-color: @panel_bg_color; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.5)), - to (shade(@panel_bg_color, 1.05))); + background-color: @panel_bg_color; + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.5), + shade(@panel_bg_color, 1.05) + ); } PanelApplet .button { @@ -52,9 +56,10 @@ border-width: 0 1px; border-radius: 0; border-color: transparent; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.5)), - to (shade(@panel_bg_color, 1.05))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.5), + shade(@panel_bg_color, 1.05) + ); color: @panel_fg_color; @@ -66,27 +71,30 @@ border-width: 0 1px; border-radius: 0; border-color: shade(@panel_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 0.85)), - to (shade(@panel_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 0.85), + shade(@panel_bg_color, 1.0) + ); } PanelApplet .button:prelight { border-width: 0 1px; border-radius: 0; border-color: shade(@panel_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.7)), - to (shade(@panel_bg_color, 1.25))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.7), + shade(@panel_bg_color, 1.25) + ); } PanelApplet .button:active:prelight { border-width: 0 1px; border-radius: 0; border-color: shade(@panel_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 0.85)), - to (shade(@panel_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 0.85), + shade(@panel_bg_color, 1.0) + ); } WnckPager, WnckTasklist { @@ -101,8 +109,8 @@ } .nautilus-desktop.nautilus-canvas-item { - color: #fff; - text-shadow: 1px 1px #000; + color: white; + text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:active { @@ -119,44 +127,42 @@ text-shadow: none; } -NautilusWindow .sidebar .frame { - border-width: 1px 0 0 0; +NautilusWindow .toolbar { + border-width: 0 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.7); - border-radius: 0; + border-color: shade(@toolbar_bg_color, 0.8); +} + +NautilusWindow .sidebar .frame { + border-style: none; } NautilusWindow > GtkGrid > .pane-separator, NautilusWindow > GtkGrid > .pane-separator:hover { - border-width: 1px 1px 0 0; + border-width: 0 1px 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.7); + border-color: shade(@theme_bg_color, 0.8); background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1); } -NautilusView.frame, NautilusNotebook.notebook { border-right-width: 0; - border-bottom-width: 0; border-left-width: 0; + border-bottom-width: 0; } NautilusNotebook .frame { - border-width: 1px 0 0 0; + border-width: 0; } NautilusQueryEditor .primary-toolbar.toolbar { - padding: 4px; - border-top-width: 1px; + border-top-width: 0; border-bottom-width: 0; } -NautilusQueryEditor .primary-toolbar.toolbar .button { - padding: 0; -} - NautilusQueryEditor .toolbar { - padding: 4px 4px 3px 4px; + padding-top: 3px; + padding-bottom: 2px; border-width: 1px 0 0 0; border-style: solid; border-color: @toolbar_bg_color; @@ -167,20 +173,12 @@ border-color: shade(@toolbar_bg_color, 0.8); } -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar { - border-top-width: 0; -} - -NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child, -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child { +NautilusQueryEditor .toolbar:last-child, +NautilusQueryEditor .primary-toolbar.toolbar:only-child { border-bottom-width: 1px; border-bottom-color: shade(@toolbar_bg_color, 0.8); } -.toolbar NautilusPathBar .button { - padding: 1px 5px; -} - /****************** * gnome terminal * ******************/ diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/apps/granite-widgets.css shimmer-themes-1.6.2/greybird/gtk-3.0/apps/granite-widgets.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/apps/granite-widgets.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/apps/granite-widgets.css 2013-09-17 04:27:47.000000000 -0400 @@ -0,0 +1,687 @@ +/******************** + * dynamic notebook * + ********************/ +.dynamic-notebook { + background-color: shade(@theme_bg_color, 1.05); + background-image: none; +} + +.dynamic-notebook GtkLabel, +.dynamic-notebook GtkImage { + color: alpha(@theme_fg_color, 0.5); +} + +.dynamic-notebook .notebook { + -GtkNotebook-tab-overlap: 3px; + -GtkNotebook-initial-gap: 12px; + + border-width: 1px 0 0 0; + border-color: shade(@theme_bg_color, 0.8); + border-radius: 0; + padding: 0; +} + +.dynamic-notebook .notebook tab { + padding: 3px; + border-width: 1px; + border-color: shade(@theme_bg_color, 0.9); + border-radius: 3px; + background-color: @theme_bg_color; + background-image: none; + color: @theme_fg_color; +} + +.dynamic-notebook .notebook tab:active { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 1.05); + color: @theme_fg_color; +} + +.dynamic-notebook .notebook tab .entry { + border-radius: 3px; + padding: 3px; +} + +.dynamic-notebook .button:hover, +.dynamic-notebook .button:hover:active, +.dynamic-notebook .notebook .button, +.dynamic-notebook .notebook .button:hover, +.dynamic-notebook .notebook .button:hover:active { + border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 1.10); + background-image: none; +} + +.dynamic-notebook .button:hover:active, +.dynamic-notebook .notebook .button:hover:active { + border-color: shade(@theme_bg_color, 0.6); + background-color: shade(@theme_bg_color, 0.85); + color: shade(@theme_fg_color, 0.7); +} + +.dynamic-notebook .menu GtkLabel { + color: @menu_fg; +} + +/**************** + * content view * + ****************/ +.content-view-window { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + border-radius: 2px; + background-color:@theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.content-view, +.content-view GtkViewport { + background-color: @theme_base_color; + background-image: none; +} + +.content-view * { + background-color: transparent; + background-image: none; +} + +.content-view .entry { + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.content-view .button { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + border-radius: 2px; + background-color: shade(@theme_base_color, 1.02); + background-image: none; + color: @theme_text_color; +} + +.content-view .button:hover { + border-color: shade(@theme_base_color, 0.7); + background-color: shade(@theme_base_color, 1.10); + background-image: none; +} + +.content-view .button:active { + border-color: shade(@theme_base_color, 0.6); + background-color: shade(@theme_base_color, 0.85); + background-image: none; +} + +.content-view .button:active:hover { + border-color: shade(@theme_base_color, 0.7); + color: shade(@theme_text_color, 1.10); +} + +.content-view .button:insensitive { + border-color: shade(@theme_base_color, 0.8); + background-color: shade(@theme_base_color, 0.95); + background-image: none; +} + +.content-view .help_button * { + color: @theme_text_color; +} + +.content-view .toolbar { + -GtkWidget-window-dragging: true; + + padding: 1px; + border-width: 0 0 1px 0; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + background-color: @theme_base_color; + background-image: none; +} + +.content-view .menu { + padding: 0; + border-radius: 0; + border-style: none; + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +/************** + * sourcelist * + **************/ +.source-list, +.source-list.view { + border-radius: 0; + background-color: @theme_bg_color; + background-image: none; + color: mix(@theme_fg_color, @theme_bg_color, 0.1); +} + +.source-list { + -GtkTreeView-horizontal-separator: 1; + -GtkTreeView-vertical-separator: 1; +} + +.source-list.view:selected, +.source-list.view:prelight:selected { + border-width: 1px 0; + border-style: solid; + border-top-color: shade(@theme_bg_color, 0.85); + border-bottom-color: shade(@theme_bg_color, 1.12); + background-image: linear-gradient(to bottom, + shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.87), + shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.95) 10%, + shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.99) 92%, + shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.92) + ); + + color: mix(@theme_text_color, @theme_base_color, 0.3); +} + +.source-list.view:prelight { + border-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3); + background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3); + background-image: none; +} + +.source-list.badge, +.source-list.badge:prelight, +.source-list.badge:selected, +.source-list.badge:prelight:selected { + margin: 0 3px; + padding: 0 6px; + border-width: 0; + border-radius: 10px; + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); + color: @theme_selected_fg_color; +} + +/****************** + * no undo button * + ******************/ +.button.noundo, +.content-view .button.noundo { + border-color: shade(@error_bg_color, 0.8); + background-color: shade(@error_bg_color, 1.05); + background-image: none; + color: @error_fg_color; +} + +.button.noundo:hover, +.content-view .button.noundo:hover { + border-color: shade(@error_bg_color, 0.7); + background-color: @error_bg_color; + background-image: none; +} + +.button.noundo:active, +.content-view .button.noundo:active { + border-color: shade(@error_bg_color, 0.8); + background-color: shade(@error_bg_color, 0.95); + background-image: none; +} + +.button.noundo:active:hover, +.content-view .button.noundo:active:hover { + border-color: shade(@error_bg_color, 0.7); + background-color: shade(@error_bg_color, 0.97); + background-image: none; +} + +.button.noundo GtkLabel, +.button.noundo Gtklabel:prelight { + color: @error_fg_color; +} + +/********************** + * affirmative button * + **********************/ +.button.affirmative, +.content-view .button.affirmative { + border-color: shade(@theme_selected_bg_color, 0.8); + background-color: shade(@theme_selected_bg_color, 1.05); + background-image: none; + color: @theme_selected_fg_color; +} + +.button.affirmative:hover, +.content-view .button.affirmative:hover { + border-color: shade(@theme_selected_bg_color, 0.7); + background-color: @theme_selected_bg_color; + background-image: none; +} + +.button.affirmative:active, +.content-view .button.affirmative:active { + border-color: shade(@theme_selected_bg_color, 0.8); + background-color: shade(@theme_selected_bg_color, 0.95); + background-image: none; +} + +.button.affirmative:active:hover, +.content-view .button.affirmative:active:hover { + border-color: shade(@theme_selected_bg_color, 0.7); + background-color: shade(@theme_selected_bg_color, 0.97); + background-image: none; +} + +.button.affirmative GtkLabel, +.button.affirmative Gtklabel:prelight { + color: @theme_selected_fg_color; +} + +/********************** + * secondary toolbars * + **********************/ +.secondary-toolbar.toolbar { + padding: 2px; + border-color: shade(@toolbar_bg_color, 0.8); + background-color: @toolbar_bg_color; + background-image: none; +} + +.secondary-toolbar.toolbar .button { + border-color: shade(@toolbar_bg_color, 0.8); + background-color: shade(@toolbar_bg_color, 1.05); + background-image: none; + color: @toolbar_fg_color; +} + +.secondary-toolbar.toolbar .button:hover { + border-color: shade(@toolbar_bg_color, 0.7); + background-color: shade(@toolbar_bg_color, 1.10); + background-image: none; +} + +.secondary-toolbar.toolbar .button:active { + border-color: shade(@toolbar_bg_color, 0.8); + background-color: shade(@toolbar_bg_color, 0.95); + background-image: none; +} + +.secondary-toolbar.toolbar .button:active:hover { + border-color: shade(@toolbar_bg_color, 0.7); +} + +.secondary-toolbar.toolbar .button:focus, +.secondary-toolbar.toolbar .button:hover:focus, +.secondary-toolbar.toolbar .button:active:focus, +.secondary-toolbar.toolbar .button:active:hover:focus { + border-color: shade(@toolbar_bg_color, 0.7); +} + +.secondary-toolbar.toolbar .button:insensitive { + border-color: shade(@toolbar_bg_color, 0.85); + background-color: shade(@toolbar_bg_color, 0.9); + background-image: none; +} + +.secondary-toolbar.toolbar .button:active *:insensitive { + border-color: shade(@toolbar_bg_color, 0.75); + background-color: shade(@toolbar_bg_color, 0.80); + background-image: none; +} + +/******************* + * bottom toolbars * + *******************/ +.bottom-toolbar.toolbar { + padding: 6px; + border-width: 1px 0 0 0; + border-color: shade(@theme_bg_color, 0.8); + background-color: @theme_bg_color; + background-image: none; +} + +.bottom-toolbar.toolbar .button { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 1.05); + background-image: none; + color: @theme_fg_color; +} + +.bottom-toolbar.toolbar .button:hover { + border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 1.10); + background-image: none; +} + +.bottom-toolbar.toolbar .button:active { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 0.95); + background-image: none; +} + +.bottom-toolbar.toolbar .button:active:hover { + border-color: shade(@theme_bg_color, 0.7); +} + +.bottom-toolbar.toolbar .button:focus, +.bottom-toolbar.toolbar .button:hover:focus, +.bottom-toolbar.toolbar .button:active:focus, +.bottom-toolbar.toolbar .button:active:hover:focus { + border-color: shade(@theme_bg_color, 0.7); +} + +.bottom-toolbar.toolbar .button:insensitive { + border-color: shade(@theme_bg_color, 0.85); + background-color: shade(@theme_bg_color, 0.9); + background-image: none; +} + +.bottom-toolbar.toolbar .button:active *:insensitive { + border-color: shade(@theme_bg_color, 0.75); + background-color: shade(@theme_bg_color, 0.80); + background-image: none; +} + +/************* + * statusbar * + *************/ +GraniteWidgetsStatusBar { + padding: 1px; + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.0), + shade(@theme_bg_color, 0.88) + ); + + box-shadow: inset 0 1px shade(@theme_bg_color, 0.8); +} + +/*********** + * popover * + ***********/ +GraniteWidgetsPopOver { + -GraniteWidgetsPopOver-arrow-width: 21; + -GraniteWidgetsPopOver-arrow-height: 12; + -GraniteWidgetsPopOver-border-radius: 5px; + -GraniteWidgetsPopOver-border-width: 1; + -GraniteWidgetsPopOver-shadow-size: 15; + + margin: 0; + border-style: solid; + border-color: shade(@menu_bg_color, 0.8); + color: @menu_fg_color; +} + +.popover_bg { + background-color: transparent; + background-image: linear-gradient(to bottom, + @menu_bg_color, + shade(@menu_bg_color, 0.98) + ); +} + +GraniteWidgetsPopOver .sidebar.view, +GraniteWidgetsPopOver * { + background-color: transparent; + background-image: none; + color: @menu_fg_color; +} + +GraniteWidgetsPopOver .sidebar.view:selected, +GraniteWidgetsPopOver .sidebar.view:selected:focus, +GraniteWidgetsPopOver *:selected, +GraniteWidgetsPopOver *:selected:focus { + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +GraniteWidgetsPopOver .button { + border-color: shade(@menu_bg_color, 0.8); + background-color: shade(@menu_bg_color, 1.08); + background-image: none; + color: @menu_fg_color; +} + +GraniteWidgetsPopOver .button:hover { + border-color: shade(@menu_bg_color, 0.7); + background-color: shade(@menu_bg_color, 1.10); + background-image: none; + color: shade(@menu_fg_color, 0.7); +} + +GraniteWidgetsPopOver .button:active { + border-color: shade(@menu_bg_color, 0.8); + background-color: shade(@menu_bg_color, 0.95); + background-image: none; +} + +GraniteWidgetsPopOver .button:active:hover { + border-color: shade(@menu_bg_color, 0.7); + color: shade(@menu_fg_color, 0.7); +} + +/* linked buttons */ +GraniteWidgetsPopOver .linked .button { + box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9); +} + +GraniteWidgetsPopOver .linked .button:active { + box-shadow: inset -1px 0 shade(@menu_bg_color, 0.8), + inset 1px 1px alpha(@dark_shadow, 0.06), + inset -1px -1px alpha(@dark_shadow, 0.06); +} + +GraniteWidgetsPopOver .linked .button:insensitive { + box-shadow: inset -1px 0 shade(@menu_bg_color, 0.8), + inset 1px 1px alpha(@light_shadow, 0.2); +} + +GraniteWidgetsPopOver .linked .button:last-child, +GraniteWidgetsPopOver .linked .button:only-child, +GraniteWidgetsPopOver .linked .button:insensitive:last-child, +GraniteWidgetsPopOver .linked .button:insensitive:only-child, +GraniteWidgetsPopOver .linked .button:active *:insensitive:last-child, +GraniteWidgetsPopOver .linked .button:active *:insensitive:only-child { + box-shadow: inset 1px 1px alpha(@light_shadow, 0.4), + inset -1px 0 alpha(@light_shadow, 0.4); +} + +GraniteWidgetsPopOver .linked .button:active:last-child, +GraniteWidgetsPopOver .linked .button:active:only-child { + box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06), + inset -1px -1px alpha(@dark_shadow, 0.06); +} + +GraniteWidgetsPopOver .entry { + border-color: shade(@menu_bg_color, 0.7); + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +GraniteWidgetsPopOver .entry:active, +GraniteWidgetsPopOver .entry:focus { + border-color: shade(@menu_bg_color, 0.7); +} + +GraniteWidgetsPopOver *.separator { + border-color: shade(@menu_bg_color, 0.9); + color: transparent; +} + +.button.app { + border-width: 0; + border-radius: 2px; + background-color: transparent; + background-image: none; +} + +.button.app:hover { + border-color: shade(@theme_selected_bg_color, 0.8); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); + + color: @theme_selected_fg_color; +} + +.button.app:focus { + border-color: shade(@theme_selected_bg_color, 0.8); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); + + color: @theme_selected_fg_color; +} + +/******** + * gala * + ********/ +.gala-workspaces-background { + border-width: 1px 0 0 0; + border-color: shade(@panel_bg_color, 0.8); + background-color: @panel_bg_color; + background-image: none; +} + +.gala-workspace-selected { + border-width: 1px; + border-radius: 2px; + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; + background-image: none; +} + +/********* + * files * + *********/ +.files-overlay-bar { + margin: 3px; + padding: 3px 6px; + border-width: 1px; + border-color: shade(@theme_base_color, 0.7); + border-radius: 2px; + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.1), + shade(@theme_bg_color, 0.9) + ); +} + +.files-overlay-bar GtkLabel { + color: @theme_text_color; +} + +/********* + * noise * + *********/ +.album-list-view, +.album-list-view * { + border-color: shade(@theme_base_color, 0.7); + border-radius: 0; + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.album-list-view GtkTreeView { + -GtkTreeView-vertical-separator: 1; + -GtkTreeView-grid-line-width: 0; + + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.album-list-view GtkTreeView row:nth-child(even) { + border-width: 0; + border-style: none; + background-color: shade(@theme_base_color, 0.9); + background-image: none; +} + + +.album-list-view GtkTreeView row:nth-child(odd) { + border-width: 0; + border-style: none; + background-color: shade(@theme_base_color, 1.0); + background-image: none; +} + +.album-list-view GtkTreeView row:selected { + background-color: @selected_bg_color; + background-image: none; + color: @selected_fg_color; +} + +/********** + * birdie * + **********/ +BirdieWidgetsTweetList * { + background-color: transparent; + background-image: none; +} + +/********* + * tweet * + *********/ +.tweet { + padding: 0; +} + +/********** + * notify * + **********/ +.notify { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.7); + border-radius: 2px; + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.notify .low { +} + +.notify .critical { +} + +/********* + * panel * + *********/ +.panel { + background-color: @panel_bg_color; + background-image: none; + color: @panel_fg_color; + font: bold; +} + +.panel .menubar .menuitem { + padding: 1px 3px; +} + +.shadow { + background-color: transparent; + background-image: linear-gradient(to bottom, + rgba(0, 0, 0, 0.3), + transparent + ); +} + +.composited-indicator, +.wingpanel-app-button, +.wingpanel-indicator-button { + padding: 0 2px; + background-color: transparent; + background-image: none; + color: @panel_fg_color; +} + +.composited-indicator.menuitem:active, +.composited-indicator.menuitem:prelight { + border-style: none; + background-image: none; +} diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/apps/lightdm-gtk-greeter.css shimmer-themes-1.6.2/greybird/gtk-3.0/apps/lightdm-gtk-greeter.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/apps/lightdm-gtk-greeter.css 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/apps/lightdm-gtk-greeter.css 2013-09-17 04:27:47.000000000 -0400 @@ -60,9 +60,10 @@ #panel_window .menubar.menuitem:hover { background-color: shade(@selected_bg_color, 0.9); border-color: shade(@theme_selected_bg_color, 1.1); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.2)), - to (shade(@theme_selected_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.2), + shade(@theme_selected_bg_color, 1.0) + ); } #message_label { @@ -76,7 +77,6 @@ #restart_button { background-color: shade(@lightdm_bg_color, 0.9); background-image: none; - border-top-color: alpha(@dark_shadow, 0.9); border-bottom-color: alpha(@dark_shadow, 0.9); border-left-color: alpha (@dark_shadow, 0.9); diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/apps/unity.css shimmer-themes-1.6.2/greybird/gtk-3.0/apps/unity.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/apps/unity.css 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/apps/unity.css 2013-09-17 04:27:47.000000000 -0400 @@ -3,9 +3,10 @@ border-width: 0 0 1px 0; border-style: solid; border-color: shade(@panel_bg_color, 1.0); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.2)), - to (shade(@panel_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.2), + shade(@panel_bg_color, 1.0) + ); } .unity-panel.menubar, @@ -21,9 +22,10 @@ .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-color: shade(@panel_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.2)), - to (shade(@theme_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.2), + shade(@theme_bg_color, 1.0) + ); color: @theme_fg_color; } diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/apps/xfce.css shimmer-themes-1.6.2/greybird/gtk-3.0/apps/xfce.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/apps/xfce.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/apps/xfce.css 2013-09-17 04:27:47.000000000 -0400 @@ -0,0 +1,61 @@ +XfceHeading { + background-color: @theme_base_color; + background-image: none; + padding: 0; + border-width: 0; +} + +.xfce4-panel { + background-color: shade(@panel_bg_color, 0.35); +} + +.xfce4-panel .button { + border-radius: 0; + padding: 1px; + color: @panel_fg_color; +} + +.xfce4-panel .button:active { + background-image: none; + background-color: shade(@panel_bg_color, 0.7); + border-color: shade(@panel_bg_color, 0.6); + transition: none; +} + +.xfce4-panel .button:hover, +.xfce4-panel .button:active:hover { + background-image: linear-gradient(to bottom, + shade(@selected_bg_color, 0.88), + shade(@selected_bg_color, 0.85) + ); + + border-color: shade(@selected_bg_color, 0.6); + box-shadow: inset 0 -1px alpha(white, 0.0), + inset 1px 0 alpha(white, 0.15), + inset -1px 0 alpha(white, 0.15), + inset 0 1px alpha(white, 0.15); + transition: none; +} + +/* menu-styling, e.g. for indicators */ +.xfce4-panel .menu, +.xfce4-panel .menu GtkLabel, +.xfce4-panel .menu GtkImage { + background-color: shade(@menu_bg_color, 1.18); + color: @menu_fg_color; +} + +.xfce4-panel .menu *:hover { + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.2), + shade(@theme_selected_bg_color, 1.0) + ); + + transition: none; +} + +.xfce4-panel .menu GtkLabel:hover, +.xfce4-panel .menu GtkImage:hover { + background-image: none; + background-color: transparent; +} diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/gtk.css shimmer-themes-1.6.2/greybird/gtk-3.0/gtk.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/gtk.css 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/gtk.css 2013-09-17 04:27:47.000000000 -0400 @@ -2,7 +2,7 @@ @define-color bg_color #cecece; @define-color fg_color #3c3c3c; @define-color base_color #fcfcfc; -@define-color text_color #000; +@define-color text_color #212121; @define-color selected_bg_color #398ee7; @define-color selected_fg_color #fff; @define-color tooltip_bg_color #000; @@ -43,8 +43,8 @@ @define-color toolbar_fg_color @theme_fg_color; @define-color menu_bg_color shade(@theme_bg_color, 1.18); @define-color menu_fg_color @theme_fg_color; -@define-color panel_bg_color @theme_bg_color; -@define-color panel_fg_color @theme_fg_color; +@define-color panel_bg_color #686868; +@define-color panel_fg_color #fcfcfc; /* osd */ @define-color osd_base #333; @@ -55,9 +55,9 @@ @define-color wm_bg_a shade(@theme_bg_color, 1.07); @define-color wm_bg_b @theme_bg_color; @define-color wm_title_focused shade(@theme_fg_color, 1.2); -@define-color wm_title_focused_shadow shade(@theme_bg_color, 1.4); +@define-color wm_title_focused_shadow shade(@theme_bg_color, 1.2); @define-color wm_title_unfocused shade(@theme_fg_color, 2.0); -@define-color wm_title_unfocused_shadow shade(@theme_bg_color, 1.2); +@define-color wm_title_unfocused_shadow shade(@theme_bg_color, 1.1); @define-color wm_border_focused shade(@theme_bg_color, 0.7); @define-color wm_border_unfocused shade(@theme_bg_color, 0.8); @@ -68,6 +68,8 @@ @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); @import url("apps/gnome-applications.css"); +@import url("apps/granite-widgets.css"); @import url("apps/unity.css"); @import url("apps/lightdm-unity-greeter.css"); @import url("apps/lightdm-gtk-greeter.css"); +@import url("apps/xfce.css"); diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/gtk-widgets-assets.css shimmer-themes-1.6.2/greybird/gtk-3.0/gtk-widgets-assets.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/gtk-widgets-assets.css 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/gtk-widgets-assets.css 2013-09-17 04:27:47.000000000 -0400 @@ -152,14 +152,16 @@ background-image: url("assets/resize-grip.png"); } -.pane-separator.horizontal, -.separator.horizontal { +/****************** + * pane separator * + ******************/ +.pane-separator.horizontal { background-image: url("assets/pane-separator.png"); background-repeat: no-repeat; background-position: center center; } -.pane-separator.vertical, -.separator.vertical { + +.pane-separator.vertical { background-image: url("assets/pane-separator-vertical.png"); background-repeat: no-repeat; background-position: center center; diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/gtk-widgets.css shimmer-themes-1.6.2/greybird/gtk-3.0/gtk-widgets.css --- shimmer-themes-1.6.1/greybird/gtk-3.0/gtk-widgets.css 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/gtk-widgets.css 2013-09-17 04:27:47.000000000 -0400 @@ -89,6 +89,15 @@ color: mix(@theme_fg_color, @theme_bg_color, 0.4); } +/* apply effects to insensitive and prelit images */ +*:insensitive { + -gtk-image-effect: dim; +} + +*:hover { + -gtk-image-effect: highlight; +} + .gtkstyle-fallback { background-color: @theme_bg_color; color: @theme_fg_color; @@ -132,9 +141,10 @@ /* inset shadows */ .button, -.toolbar .button, .primary-toolbar .raised .button, .primary-toolbar .raised.button, +.toolbar .button, +.header-bar .button, GtkSwitch.slider { box-shadow: inset 1px 1px alpha(@light_shadow, 0.4), inset -1px 0 alpha(@light_shadow, 0.4); @@ -146,16 +156,18 @@ } .button:active, +.primary-toolbar .button:active, .toolbar .button:active, -.primary-toolbar .button:active { +.header-bar .button:active { box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } .button:insensitive, -.toolbar .button:insensitive, .primary-toolbar .raised .button:insensitive, .primary-toolbar .raised.button:insensitive, +.toolbar .button:insensitive, +.header-bar .button:insensitive, GtkSwitch.slider:insensitive { box-shadow: inset 1px 1px alpha(@light_shadow, 0.2), inset -1px 0 alpha(@light_shadow, 0.2); @@ -206,9 +218,10 @@ border-left-color: shade(@theme_bg_color, 0.72); border-bottom-color: shade(@theme_bg_color, 0.7); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.05)), - to (shade(shade(@theme_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.05), + shade(shade(@theme_bg_color, 1.02), 0.97) + ); color: @theme_fg_color; } @@ -218,16 +231,18 @@ border-right-color: shade(@theme_bg_color, 0.78); border-left-color: shade(@theme_bg_color, 0.78); border-bottom-color: shade(@theme_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .button:active { border-color: shade(@theme_bg_color, 0.6); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.85), 1.05)), - to (shade(shade(@theme_bg_color, 0.85), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.85), 1.05), + shade(shade(@theme_bg_color, 0.85), 0.97) + ); } .button:active:hover { @@ -235,9 +250,10 @@ border-right-color: shade(@theme_bg_color, 0.78); border-left-color: shade(@theme_bg_color, 0.78); border-bottom-color: shade(@theme_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .button:focus, @@ -249,45 +265,51 @@ .button:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); } -.button:active:insensitive { +.button:active *:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); } /* default button */ .button.default { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(alpha(@theme_selected_bg_color, 0.7), 1.05)), - to (shade(alpha(@theme_selected_bg_color, 0.7), 0.97))); + background-image: linear-gradient(to bottom, + shade(alpha(@theme_selected_bg_color, 0.7), 1.05), + shade(alpha(@theme_selected_bg_color, 0.7), 0.97) + ); } .button.default:hover { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05)), - to (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97))); + background-image: linear-gradient(to bottom, + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05), + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97) + ); } .button.default:active { border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(alpha(@theme_selected_bg_color, 0.7), 1.05)), - to (shade(alpha(@theme_selected_bg_color, 0.7), 0.97))); + background-image: linear-gradient(to bottom, + shade(alpha(@theme_selected_bg_color, 0.7), 1.05), + shade(alpha(@theme_selected_bg_color, 0.7), 0.97) + ); } .button.default:active:hover { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05)), - to (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97))); + background-image: linear-gradient(to bottom, + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05), + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97) + ); } /**************** @@ -305,13 +327,15 @@ } row:selected, +row:selected:hover, row:selected:focus { border-width: 1px 0; border-style: solid; border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.2)), - to (shade(@theme_selected_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.2), + shade(@theme_selected_bg_color, 1.0) + ); color: @theme_selected_fg_color; @@ -352,9 +376,10 @@ column-header .button:active:focus { border-color: shade(@theme_bg_color, 0.97); border-bottom-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.14), 0.98)), - to (shade(shade(@theme_bg_color, 1.14), 1.35))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.14), 0.98), + shade(shade(@theme_bg_color, 1.14), 1.35) + ); } column-header .button:hover, @@ -363,9 +388,10 @@ column-header .button:active:hover:focus { border-color: shade(@theme_bg_color, 0.97); border-bottom-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.98), 0.98)), - to (shade(shade(@theme_bg_color, 0.98), 1.35))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.98), 0.98), + shade(shade(@theme_bg_color, 0.98), 1.35) + ); } column-header:last-child .button { @@ -459,9 +485,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.05)), - to (shade(shade(@theme_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.05), + shade(shade(@theme_bg_color, 1.02), 0.97) + ); } GtkCalendar.button, @@ -520,9 +547,10 @@ border-left-color: shade(@theme_bg_color, 0.7); border-bottom-color: shade(@theme_bg_color, 0.72); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_base_color, 0.99)), - to (@theme_base_color)); + background-image: linear-gradient(to bottom, + shade(@theme_base_color, 0.99), + @theme_base_color + ); color: @theme_text_color; } @@ -548,9 +576,10 @@ .entry.progressbar { border-width: 0; border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.15)), - to (shade(@theme_selected_bg_color, 0.95))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.15), + shade(@theme_selected_bg_color, 0.95) + ); color: @theme_selected_fg_color; } @@ -601,13 +630,15 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.8); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.2)), - to (shade(@theme_selected_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.2), + shade(@theme_selected_bg_color, 1.0) + ); color: @theme_selected_fg_color; } +.content-view.view.rubberband, .view.rubberband, .rubberband { border-width: 1px; @@ -647,46 +678,122 @@ border-width: 1px; border-style: solid; border-color: shade(@info_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@info_bg_color, 1.1)), - to (shade(@info_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@info_bg_color, 1.1), + shade(@info_bg_color, 1.0) + ); + + color: @info_fg_color; +} +.info .button.close { color: @info_fg_color; } +.info .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.info .button.close:active { + color: @info_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .warning { border-width: 1px; border-style: solid; border-color: shade(@warning_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@warning_bg_color, 1.1)), - to (shade(@warning_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@warning_bg_color, 1.1), + shade(@warning_bg_color, 1.0) + ); + + color: @warning_fg_color; +} +.warning .button.close { color: @warning_fg_color; } +.warning .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.warning .button.close:active { + color: @warning_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .question { border-width: 1px; border-style: solid; border-color: shade(@question_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@question_bg_color, 1.1)), - to (shade(@question_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@question_bg_color, 1.1), + shade(@question_bg_color, 1.0) + ); + + color: @question_fg_color; +} + +.question .button.close { + color: @question_fg_color; +} + +.question .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} +.question .button.close:active { color: @question_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); } .error { border-width: 1px; border-style: solid; border-color: shade(@error_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@error_bg_color, 1.1)), - to (shade(@error_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@error_bg_color, 1.1), + shade(@error_bg_color, 1.0) + ); color: @error_fg_color; } +.error .button.close { + color: @error_fg_color; +} + +.error .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.error .button.close:active { + color: @error_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + /******************* * symbolic images * *******************/ @@ -715,9 +822,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.7); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.2)), - to (shade(@theme_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.1), + shade(@theme_bg_color, 0.9) + ); color: @theme_fg_color; } @@ -756,15 +864,8 @@ } .view.dim-label, -.dim-label, -.dim-label:hover, -.dim-label:focus { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -.dim-label:selected, -.dim-label:selected:focus { - color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.5); +.dim-label { + color: alpha(currentColor, 0.5); } .dnd { @@ -790,9 +891,12 @@ background-color: @menu_bg_color; } +.primary-toolbar .menu, .primary-toolbar .button .menu, .toolbar .menu, .toolbar .primary-toolbar .menu, +.header-bar .menu, +.header-bar .primary-toolbar .menu, .menu { padding: 0; border-radius: 0; @@ -805,7 +909,7 @@ .menu.button:hover, .menu.button:active, -.menu.button:active:insensitive, +.menu.button:active *:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -813,6 +917,16 @@ background-image: none; } +.context-menu { + font: initial; +} + +/* ubuntu software center menu */ +#toolbar-popup { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + /*********** * menubar * ***********/ @@ -842,9 +956,12 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { border-color: shade(@theme_selected_bg_color, 1.1); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.2)), - to (shade(@theme_selected_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.2), + shade(@theme_selected_bg_color, 1.0) + ); + + color: @theme_selected_fg_color; } .menubar .menuitem *:hover { @@ -859,10 +976,6 @@ border-width: 0; } -GtkTreeMenu .menuitem * { - color: @menu_fg_color; -} - .menuitem, .menu .menuitem { padding: 3px; @@ -880,9 +993,10 @@ .menu .menuitem:active, .menu .menuitem:hover { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.2)), - to (shade(@theme_selected_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.2), + shade(@theme_selected_bg_color, 1.0) + ); } .menu .menuitem:active, @@ -952,6 +1066,10 @@ color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.7); } +GtkModelMenuItem GtkBox GtkImage { + padding-right: 4px; +} + /************ * notebook * ************/ @@ -1054,15 +1172,17 @@ border-width: 1px; border-style: solid; border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.15)), - to (shade(@theme_selected_bg_color, 0.95))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.15), + shade(@theme_selected_bg_color, 0.95) + ); } .progressbar.vertical { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_selected_bg_color, 1.15)), - to (shade(@theme_selected_bg_color, 0.95))); + background-image: linear-gradient(to right, + shade(@theme_selected_bg_color, 1.15), + shade(@theme_selected_bg_color, 0.95) + ); } .trough, @@ -1073,15 +1193,17 @@ border-width: 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.95)), - to (shade(@theme_bg_color, 1.15))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.95), + shade(@theme_bg_color, 1.15) + ); } .trough.vertical { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 0.95)), - to (shade(@theme_bg_color, 1.15))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.95), + shade(@theme_bg_color, 1.15) + ); } /* level bars as used for password quality or remaining power */ @@ -1104,9 +1226,10 @@ border-width: 1px; border-style: solid; border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.15)), - to (shade(@theme_selected_bg_color, 0.95))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.15), + shade(@theme_selected_bg_color, 0.95) + ); } .level-bar.indicator-continuous.fill-block { @@ -1179,9 +1302,10 @@ .scale.slider { border-radius: 7px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.30), 1.2)), - to (shade(shade(@theme_bg_color, 1.30), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.30), 1.2), + shade(shade(@theme_bg_color, 1.30), 0.97) + ); /* we will draw the border using box shadow for now */ box-shadow: inset 1px 0 shade(@theme_bg_color, 0.7), @@ -1191,9 +1315,10 @@ } .scale.slider:hover { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4), 1.2)), - to (shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4),0.97))); + background-image: linear-gradient(to bottom, + shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4), 1.2), + shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4),0.97) + ); box-shadow: inset 1px 0 shade(@theme_bg_color, 0.6), inset 0 1px shade(@theme_bg_color, 0.6), @@ -1202,9 +1327,10 @@ } .scale.slider:insensitive { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.99)), - to (shade(@theme_bg_color, 0.95))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.99), + shade(@theme_bg_color, 0.95) + ); box-shadow: inset 1px 0 shade(@theme_bg_color, 0.8), inset 0 1px shade(@theme_bg_color, 0.8), @@ -1213,21 +1339,33 @@ } .scale.slider.vertical { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_bg_color, 1.30), 1.2)), - to (shade(shade(@theme_bg_color, 1.30), 0.97))); + background-image: linear-gradient(to right, + shade(shade(@theme_bg_color, 1.30), 1.2), + shade(shade(@theme_bg_color, 1.30), 0.97) + ); } .scale.slider.vertical:hover { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4), 1.2)), - to (shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4),0.97))); + background-image: linear-gradient(to right, + shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4), 1.2), + shade(mix(@theme_bg_color, shade(@theme_selected_bg_color, 0.9), 0.4),0.97) + ); } .scale.slider.vertical:insensitive { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 0.99)), - to (shade(@theme_bg_color, 0.95))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.99), + shade(@theme_bg_color, 0.95) + ); +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; } .scale.mark { @@ -1238,56 +1376,63 @@ margin: 5px 0; border-color: shade(@theme_bg_color, 0.7); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.8), 0.9)), - to (shade(shade(@theme_bg_color, 0.8), 1.1))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.8), 0.9), + shade(shade(@theme_bg_color, 0.8), 1.1) + ); } .scale.trough.vertical { margin: 0 5px; border-color: shade(@theme_bg_color, 0.7); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_bg_color, 0.8), 0.9)), - to (shade(shade(@theme_bg_color, 0.8), 1.1))); + background-image: linear-gradient(to right, + shade(shade(@theme_bg_color, 0.8), 0.9), + shade(shade(@theme_bg_color, 0.8), 1.1) + ); } .menubar .menuitem .scale.highlight.left, .scale.highlight.left { border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 0.9), 1.1)), - to (shade(shade(@theme_selected_bg_color, 0.9), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 0.9), 1.1), + shade(shade(@theme_selected_bg_color, 0.9), 0.9) + ); } .menubar .menuitem .scale.highlight.left:hover { border-color: shade(@theme_selected_bg_color, 0.5); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 0.9), 0.9)), - to (shade(shade(@theme_selected_bg_color, 0.9), 0.7))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 0.9), 0.9), + shade(shade(@theme_selected_bg_color, 0.9), 0.7) + ); } .scale.highlight.bottom { border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_selected_bg_color, 0.9), 1.1)), - to (shade(shade(@theme_selected_bg_color, 0.9), 0.9))); + background-image: linear-gradient(to right, + shade(shade(@theme_selected_bg_color, 0.9), 1.1), + shade(shade(@theme_selected_bg_color, 0.9), 0.9) + ); } .scale.trough:insensitive, .scale.highlight.left:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.99)), - to (shade(@theme_bg_color, 0.95))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.99), + shade(@theme_bg_color, 0.95) + ); } .scale.trough.vertical:insensitive, .scale.highlight.bottom:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 0.99)), - to (shade(@theme_bg_color, 0.95))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.99), + shade(@theme_bg_color, 0.95) + ); } /************* @@ -1304,15 +1449,17 @@ .scrollbar.trough.vertical { border-width: 0; border-radius: 0; - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 1.1)), - to (shade(@theme_bg_color, 1.3))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 1.1), + shade(@theme_bg_color, 1.3) + ); } .scrollbar.trough.horizontal { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.1)), - to (shade(@theme_bg_color, 1.3))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.1), + shade(@theme_bg_color, 1.3) + ); } .scrollbar.slider, @@ -1322,44 +1469,56 @@ border-width: 1px; border-color: shade(@theme_bg_color, 0.7); border-radius: 10px; - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_bg_color, 0.9), 1.2)), - to (shade(shade(@theme_bg_color, 0.9), 1.15))); + background-image: linear-gradient(to right, + shade(shade(@theme_bg_color, 0.9), 1.2), + shade(shade(@theme_bg_color, 0.9), 1.15) + ); color: shade(@theme_bg_color, 0.6); } .scrollbar.slider.horizontal, .scrollbar.button.horizontal { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.9), 1.2)), - to (shade(shade(@theme_bg_color, 0.9), 1.15))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.9), 1.2), + shade(shade(@theme_bg_color, 0.9), 1.15) + ); } .scrollbar.slider:hover, .scrollbar.slider.vertical:hover { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_bg_color, 0.8), 1.2)), - to (shade(shade(@theme_bg_color, 0.8), 1.15))); + background-image: linear-gradient(to right, + shade(shade(@theme_bg_color, 0.8), 1.2), + shade(shade(@theme_bg_color, 0.8), 1.15) + ); } .scrollbar.slider.horizontal:hover { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.8), 1.2)), - to (shade(shade(@theme_bg_color, 0.8), 1.15))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.8), 1.2), + shade(shade(@theme_bg_color, 0.8), 1.15) + ); } .scrollbar.button:insensitive, .scrollbar.button.vertical:insensitive { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to right, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); } .scrollbar.button.horizontal:insensitive { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); +} + +.scrollbar.slider.fine-tune:prelight:active { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; } /* overlay scrollbar */ @@ -1406,21 +1565,32 @@ .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, -.primary-toolbar .separator:insensitive { +.primary-toolbar .separator:insensitive, +.toolbar GtkSeparatorToolItem, +.toolbar .separator, +.toolbar .separator:insensitive +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { border-color: transparent; + color: transparent; } +.primary-toolbar .button .separator, +.primary-toolbar .button.separator, .toolbar .button .separator, .toolbar .button.separator, -.primary-toolbar .button .separator, -.primary-toolbar .button.separator { +.header-bar .button .separator, +.header-bar .button.separator { border-color: transparent; } +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive, .toolbar .button .separator:insensitive, .toolbar .button.separator:insensitive, -.primary-toolbar .button .separator:insensitive, -.primary-toolbar .button.separator:insensitive { +.header-bar .button .separator:insensitive, +.header-bar .button.separator:insensitive { border-color: transparent; } @@ -1452,13 +1622,23 @@ color: mix(@theme_text_color, @theme_base_color, 0.3); } +.sidebar .scrollbar.trough { + background-image: linear-gradient(to right, + shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.9), + shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 1.1) + ); +} + .sidebar .frame { border-width: 0; } .sidebar row:selected, .sidebar row:selected:hover, -.sidebar row:selected:focus { +.sidebar row:selected:focus, +.sidebar .view row:selected, +.sidebar .view row:selected:hover, +.sidebar .view row:selected:focus { border-width: 1px 0; border-style: solid; border-top-color: shade(@theme_bg_color, 0.85); @@ -1473,17 +1653,11 @@ color: mix(@theme_text_color, @theme_base_color, 0.3); } -.sidebar .view:selected, -.sidebar .view:selected:hover, -.sidebar .view:selected:focus { - background-image: linear-gradient(to bottom, - shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.87), - shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.95) 10%, - shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.99) 92%, - shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.92) - ); - - color: mix(@theme_text_color, @theme_base_color, 0.3); +.sidebar row:prelight, +.sidebar .view row:prelight { + border-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3); + background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3); + background-image: none; } /************** @@ -1531,9 +1705,10 @@ border-left-color: shade(@theme_bg_color, 0.72); border-bottom-color: shade(@theme_bg_color, 0.7); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.05)), - to (shade(shade(@theme_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.05), + shade(shade(@theme_bg_color, 1.02), 0.97) + ); color: @theme_fg_color; box-shadow: none; @@ -1544,16 +1719,18 @@ border-right-color: shade(@theme_bg_color, 0.78); border-left-color: shade(@theme_bg_color, 0.78); border-bottom-color: shade(@theme_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .spinbutton.vertical .button:active { border-color: shade(@theme_bg_color, 0.6); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.85), 1.05)), - to (shade(shade(@theme_bg_color, 0.85), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.85), 1.05), + shade(shade(@theme_bg_color, 0.85), 0.97) + ); } .spinbutton.vertical .button:active:hover { @@ -1561,9 +1738,10 @@ border-right-color: shade(@theme_bg_color, 0.78); border-left-color: shade(@theme_bg_color, 0.78); border-bottom-color: shade(@theme_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .spinbutton.vertical .button:focus, @@ -1575,9 +1753,10 @@ .spinbutton.vertical .button:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); color: mix(@theme_fg_color, @theme_bg_color, 0.4); } @@ -1746,41 +1925,46 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.05)), - to (shade(shade(@theme_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.05), + shade(shade(@theme_bg_color, 1.02), 0.97) + ); } GtkSwitch.slider:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); } GtkSwitch.trough { border-color: shade(@theme_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.95)), - to (shade(@theme_bg_color, 1.15))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.95), + shade(@theme_bg_color, 1.15) + ); color: @theme_fg_color; } GtkSwitch.trough:active { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 0.95)), - to (shade(@theme_selected_bg_color, 1.15))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 0.95), + shade(@theme_selected_bg_color, 1.15) + ); color: @theme_selected_fg_color; } GtkSwitch.trough:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 0.95)), - to (shade(shade(@theme_bg_color, 0.95), 1.15))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 0.95), + shade(shade(@theme_bg_color, 0.95), 1.15) + ); color: mix(@theme_fg_color, @theme_bg_color, 0.4); } @@ -1899,30 +2083,42 @@ * header-bar * **************/ .header-bar { + padding: 6px; border-width: 0 0 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.7); - padding: 0 2px; - background-color: @theme_bg_color; + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 1.0), + shade(@toolbar_bg_color, 0.88) + ); } .header-bar .button.text-button { - padding: 2px 4px; + padding: 4px; } .header-bar .button.image-button { - padding: 4px 3px 3px 4px; + padding: 6px; +} + +.header-bar .title { + font: bold; +} + +.header-bar .subtitle { + font: smaller; } /*********** * toolbar * ***********/ .toolbar { - padding: 2px; + padding: 6px; border-style: none; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 1.0)), - to (shade(@toolbar_bg_color, 0.88))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 1.0), + shade(@toolbar_bg_color, 0.88) + ); } .toolbar .button { @@ -1942,7 +2138,6 @@ background-color: shade(@toolbar_bg_color, 0.9); } - /* menubar toolbars */ .toolbar.menubar { -GtkToolbar-button-relief: normal; @@ -1960,9 +2155,10 @@ border-width: 0 0 1px 0; border-style: solid; border-color: shade(@toolbar_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 1.0)), - to (shade(@toolbar_bg_color, 0.88))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 1.0), + shade(@toolbar_bg_color, 0.88) + ); color: @toolbar_fg_color; } @@ -1981,46 +2177,55 @@ .primary-toolbar .raised .button, .primary-toolbar .raised.button, .toolbar GtkComboBox, -.toolbar .button { +.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { border-top-color: shade(@toolbar_bg_color, 0.8); border-right-color: shade(@toolbar_bg_color, 0.72); border-left-color: shade(@toolbar_bg_color, 0.72); border-bottom-color: shade(@toolbar_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@toolbar_bg_color, 1.02), 1.05)), - to (shade(shade(@toolbar_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@toolbar_bg_color, 1.02), 1.05), + shade(shade(@toolbar_bg_color, 1.02), 0.97) + ); color: @toolbar_fg_color; } .primary-toolbar .button:hover, -.toolbar .button:hover { +.toolbar .button:hover, +.header-bar .button:hover { border-top-color: shade(@toolbar_bg_color, 0.85); border-right-color: shade(@toolbar_bg_color, 0.78); border-left-color: shade(@toolbar_bg_color, 0.78); border-bottom-color: shade(@toolbar_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 1.15)), - to (shade(@toolbar_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 1.15), + shade(@toolbar_bg_color, 1.07) + ); } .primary-toolbar .button:active, -.toolbar .button:active { +.toolbar .button:active, +.header-bar .button:active { border-color: shade(@toolbar_bg_color, 0.6); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@toolbar_bg_color, 0.85), 1.05)), - to (shade(shade(@toolbar_bg_color, 0.85), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@toolbar_bg_color, 0.85), 1.05), + shade(shade(@toolbar_bg_color, 0.85), 0.97) + ); } .primary-toolbar .button:active:hover, -.toolbar .button:active:hover { +.toolbar .button:active:hover, +.header-bar .button:active:hover { border-top-color: shade(@toolbar_bg_color, 0.85); border-right-color: shade(@toolbar_bg_color, 0.78); border-left-color: shade(@toolbar_bg_color, 0.78); border-bottom-color: shade(@toolbar_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 1.15)), - to (shade(@toolbar_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 1.15), + shade(@toolbar_bg_color, 1.07) + ); } .primary-toolbar .button:focus, @@ -2030,27 +2235,37 @@ .toolbar .button:focus, .toolbar .button:hover:focus, .toolbar .button:active:focus, -.toolbar .button:active:hover:focus { +.toolbar .button:active:hover:focus, +.header-bar .button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:active:hover:focus { border-color: shade(@theme_selected_bg_color, 0.8); } .primary-toolbar .button:insensitive, -.toolbar .button:insensitive { +.toolbar .button:insensitive, +.header-bar .button:insensitive { border-color: shade(@toolbar_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@toolbar_bg_color, 0.95), 1.05)), - to (shade(shade(@toolbar_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@toolbar_bg_color, 0.95), 1.05), + shade(shade(@toolbar_bg_color, 0.95), 0.97) + ); } -.primary-toolbar .button:active:insensitive, -.toolbar .button:active:insensitive { +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive { border-color: shade(@toolbar_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@toolbar_bg_color, 0.95), 1.05)), - to (shade(shade(@toolbar_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@toolbar_bg_color, 0.95), 1.05), + shade(shade(@toolbar_bg_color, 0.95), 0.97) + ); } -.primary-toolbar .entry { +.primary-toolbar .entry, +.toolbar .entry, +.header-bar .entry { border-top-color: shade(@toolbar_bg_color, 0.6); border-right-color: shade(@toolbar_bg_color, 0.7); border-left-color: shade(@toolbar_bg_color, 0.7); @@ -2058,7 +2273,11 @@ } .primary-toolbar .entry:active, -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.toolbar .entry:active, +.toolbar .entry:focus, +.header-bar .entry:active, +.header-bar .entry:focus { border-color: shade(@theme_selected_bg_color, 0.8); } @@ -2071,9 +2290,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.93)), - to (@theme_bg_color)); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.93), + @theme_bg_color + ); } .inline-toolbar.toolbar:last-child { @@ -2089,32 +2309,36 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.05)), - to (shade(shade(@theme_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.05), + shade(shade(@theme_bg_color, 1.02), 0.97) + ); color: @theme_fg_color; } .inline-toolbar.toolbar .button:hover { border-bottom-color: shade(@theme_bg_color, 0.75); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .inline-toolbar.toolbar .button:active { border-color: shade(@theme_bg_color, 0.6); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.85), 1.05)), - to (shade(shade(@theme_bg_color, 0.85), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.85), 1.05), + shade(shade(@theme_bg_color, 0.85), 0.97) + ); } .inline-toolbar.toolbar .button:active:hover { border-bottom-color: shade(@theme_bg_color, 0.75); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .inline-toolbar.toolbar .button:focus, @@ -2127,9 +2351,10 @@ .inline-toolbar.toolbar .button *:insensitive, .inline-toolbar.toolbar GtkToolButton .button:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.95), 1.05)), - to (shade(shade(@theme_bg_color, 0.95), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.95), 1.05), + shade(shade(@theme_bg_color, 0.95), 0.97) + ); } /****************** @@ -2140,15 +2365,15 @@ .inline-toolbar.toolbar .button, .inline-toolbar.toolbar GtkToolButton .button, .inline-toolbar.toolbar GtkToolButton > .button { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), - inset 1px 1px alpha(@light_shadow, 0.4); + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8), + inset 1px 1px alpha(@light_shadow, 0.4); } .linked .button:active, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar GtkToolButton .button:active, .inline-toolbar.toolbar GtkToolButton > .button:active { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8), inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } @@ -2157,17 +2382,17 @@ .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:insensitive, .inline-toolbar.toolbar GtkToolButton > .button:insensitive { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), + box-shadow: inset -1px 0 shade(@theme_bg_color, 0.8), inset 1px 1px alpha(@light_shadow, 0.2); } /* remove box shadow from last-child and only-child */ -.linked .button:active:insensitive:last-child, -.linked .button:active:insensitive:only-child, -.inline-toolbar.toolbar .button:active:insensitive:last-child, -.inline-toolbar.toolbar .button:active:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive { +.linked .button:active *:insensitive:last-child, +.linked .button:active *:insensitive:only-child, +.inline-toolbar.toolbar .button:active *:insensitive:last-child, +.inline-toolbar.toolbar .button:active *:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2279,7 +2504,7 @@ .linked.vertical .button, .inline-toolbar.toolbar.vertical .button, .inline-toolbar.toolbar.vertical GtkToolButton > .button { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.8), inset 1px 1px alpha(@light_shadow, 0.4), inset -1px 0 alpha(@light_shadow, 0.4); } @@ -2287,7 +2512,7 @@ .linked.vertical .button:active, .inline-toolbar.toolbar.vertical .button:active, .inline-toolbar.toolbar.vertical GtkToolButton > .button:active { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.8), inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } @@ -2295,18 +2520,18 @@ .linked.vertical .button:insensitive, .inline-toolbar.toolbar.vertical .button:insensitive, .inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), + box-shadow: inset 0 -1px shade(@theme_bg_color, 0.8), inset 1px 1px alpha(@light_shadow, 0.2), inset -1px 0 alpha(@light_shadow, 0.2); } /* remove box shadow from last-child and only-child */ -.linked.vertical .button:active:insensitive:last-child, -.linked.vertical .button:active:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive { +.linked.vertical .button:active *:insensitive:last-child, +.linked.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2392,33 +2617,58 @@ /* linked toolbar buttons */ .primary-toolbar .button.raised.linked, .primary-toolbar .raised.linked .button, -.toolbar .button.linked { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), +.toolbar .button.raised.linked, +.toolbar .raised.linked .button, +.toolbar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button, +.header-bar .linked .button { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8), inset 1px 1px alpha(@light_shadow, 0.4); } .primary-toolbar .button.raised.linked:active, .primary-toolbar .raised.linked .button:active, -.toolbar .button.linked:active { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), +.toolbar .button.raised.linked:active, +.toolbar .raised.linked .button:active, +.toolbar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active, +.header-bar .linked .button:active { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8), inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } .primary-toolbar .button.raised.linked:insensitive, .primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.linked:insensitive { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive { + box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8), inset 1px 1px alpha(@light_shadow, 0.2); } /* remove box shadow from last-child and only-child */ -.primary-toolbar .button:active:insensitive.raised.linked:last-child, -.primary-toolbar .button:active:insensitive.raised.linked:only-child, -.primary-toolbar .raised.linked .button:active:insensitive:last-child, -.primary-toolbar .raised.linked .button:active:insensitive:only-child, -.toolbar .button:active:insensitive.raised.linked:last-child, -.toolbar .button:active:insensitive.raised.linked:only-child { +.primary-toolbar .button:active *:insensitive.raised.linked:last-child, +.primary-toolbar .button:active *:insensitive.raised.linked:only-child, +.primary-toolbar .raised.linked .button:active *:insensitive:last-child, +.primary-toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .button:active *:insensitive.raised.linked:last-child, +.toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:active *:insensitive:last-child, +.toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .linked .button:active *:insensitive:last-child, +.toolbar .linked .button:active *:insensitive:only-child, +.header-bar .button:active *:insensitive.raised.linked:last-child, +.header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:active *:insensitive:last-child, +.header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .linked .button:active *:insensitive:last-child, +.header-bar .linked .button:active *:insensitive:only-child { box-shadow: none; } @@ -2427,8 +2677,18 @@ .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:only-child { +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:only-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:only-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:only-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:only-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:only-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:only-child { box-shadow: inset 1px 1px alpha(@light_shadow, 0.4), inset -1px 0 alpha(@light_shadow, 0.4); } @@ -2438,7 +2698,17 @@ .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:insensitive:only-child, .toolbar .button:insensitive.raised.linked:last-child, -.toolbar .button:insensitive.raised.linked:only-child { +.toolbar .button:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:insensitive:last-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button:insensitive.raised.linked:last-child, +.header-bar .button:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:insensitive:only-child { box-shadow: inset 1px 1px alpha(@light_shadow, 0.2), inset -1px 0 alpha(@light_shadow, 0.2); } @@ -2448,7 +2718,17 @@ .primary-toolbar .raised.linked .button:active:last-child, .primary-toolbar .raised.linked .button:active:only-child, .toolbar .button:active.raised.linked:last-child, -.toolbar .button:active.raised.linked:only-child { +.toolbar .button:active.raised.linked:only-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:active:only-child, +.header-bar .button:active.raised.linked:last-child, +.header-bar .button:active.raised.linked:only-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:active:only-child { box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06), inset -1px -1px alpha(@dark_shadow, 0.06); } @@ -2460,9 +2740,24 @@ .primary-toolbar .raised.linked .button, .primary-toolbar .raised.linked .button:active, .primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.linked, -.toolbar .button.linked:active, -.toolbar .button.linked:insensitive { +.toolbar .button.raised.linked, +.toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button, +.toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button, +.toolbar .linked .button:active, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked, +.header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:insensitive { border-width: 1px; border-radius: 0; border-right-width: 0; @@ -2476,11 +2771,26 @@ .primary-toolbar .raised.linked .button:first-child, .primary-toolbar .raised.linked .button:active:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, -.toolbar .button.linked:first-child, -.toolbar .button.linked:active:first-child, -.toolbar .button.linked:insensitive:first-child { +.toolbar .button.raised.linked:first-child, +.toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:insensitive:first-child, +.toolbar .raised.linked .button:first-child, +.toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:insensitive:first-child, +.toolbar .linked .button:first-child, +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:insensitive:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .button.raised.linked:active:first-child, +.header-bar .button.raised.linked:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:insensitive:first-child { border-width: 1px; - border-radius: 2px; + border-radius: 3px; border-right-width: 0; border-bottom-right-radius: 0; border-top-right-radius: 0; @@ -2493,9 +2803,24 @@ .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:active:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:active:last-child, -.toolbar .button.linked:insensitive:last-child { +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:insensitive:last-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:insensitive:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:insensitive:last-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 3px; border-left-width: 0; @@ -2510,9 +2835,24 @@ .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:active:only-child, .primary-toolbar .raised.linked .button:insensitive:only-child, -.toolbar .button.linked:only-child, -.toolbar .button.linked:active:only-child, -.toolbar .button.linked:insensitive:only-child { +.toolbar .button.raised.linked:only-child, +.toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:insensitive:only-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:active:only-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:insensitive:only-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 3px; } @@ -2660,8 +3000,8 @@ background-image: none; } -.osd.button:active:insensitive, -.osd .button:active:insensitive { +.osd.button:active *:insensitive, +.osd .button:active *:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -2719,7 +3059,7 @@ background-image: none; } -.osd.toolbar .button:active:insensitive { +.osd.toolbar .button:active *:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; @@ -2876,6 +3216,48 @@ background-color: @osd_bg; } +/****************************** + * destructive action buttons * + ******************************/ +.destructive-action.button { + padding: 4px; + border-width: 1px; + border-style: solid; + border-color: shade(@error_color, 0.8); + border-radius: 3px; + background-image: linear-gradient(to bottom, + shade(shade(@error_color, 1.2), 1.05), + shade(shade(@error_color, 1.2), 0.97) + ); + + color: @theme_selected_fg_color; + box-shadow: none; +} + +.destructive-action.button:hover { + border-color: shade(@error_color, 0.8); + background-image: linear-gradient(to bottom, + shade(mix(@theme_base_color, @error_color, 0.7), 1.05), + shade(mix(@theme_base_color, @error_color, 0.7), 0.97) + ); +} + +.destructive-action.button:active { + border-color: shade(@error_color, 0.8); + background-image: linear-gradient(to bottom, + shade(shade(@error_color, 1.2), 1.05), + shade(shade(@error_color, 1.2), 0.97) + ); +} + +.destructive-action.button:hover:active { + border-color: shade(@error_color, 0.7); + background-image: linear-gradient(to bottom, + shade(mix(@theme_base_color, @error_color, 0.7), 1.05), + shade(mix(@theme_base_color, @error_color, 0.7), 0.97) + ); +} + /****************** * selection mode * ******************/ @@ -2883,9 +3265,10 @@ .selection-mode.toolbar { border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.3)), - to (shade(@theme_selected_bg_color, 1.1))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.3), + shade(@theme_selected_bg_color, 1.1) + ); color: shade(@theme_selected_bg_color, 0.9); } @@ -2908,9 +3291,10 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.8); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.2), 1.05)), - to (shade(shade(@theme_selected_bg_color, 1.2), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.2), 1.05), + shade(shade(@theme_selected_bg_color, 1.2), 0.97) + ); color: @theme_selected_fg_color; box-shadow: none; @@ -2920,27 +3304,30 @@ .selection-mode.toolbar .button:hover, .selection-mode.toolbar GtkToolButton .button:hover { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05)), - to (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97))); + background-image: linear-gradient(to bottom, + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05), + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97) + ); } .selection-mode.header-bar .button:active, .selection-mode.toolbar .button:active, .selection-mode.toolbar GtkToolButton .button:active { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.2), 1.05)), - to (shade(shade(@theme_selected_bg_color, 1.2), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.2), 1.05), + shade(shade(@theme_selected_bg_color, 1.2), 0.97) + ); } .selection-mode.header-bar .button:hover:active, .selection-mode.toolbar .button:hover:active, .selection-mode.toolbar GtkToolButton .button:hover:active { border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05)), - to (shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97))); + background-image: linear-gradient(to bottom, + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 1.05), + shade(mix(@theme_base_color, @theme_selected_bg_color, 0.7), 0.97) + ); } /* suggested button */ @@ -2952,9 +3339,10 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.8); border-radius: 3px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.05)), - to (shade(shade(@theme_bg_color, 1.02), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.05), + shade(shade(@theme_bg_color, 1.02), 0.97) + ); color: @theme_fg_color; } @@ -2963,27 +3351,30 @@ .selection-mode.toolbar .suggested-action.button:hover, .selection-mode.toolbar GtkToolButton.suggested-action .button:hover { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } .selection-mode.header-bar .suggested-action.button:active, .selection-mode.toolbar .suggested-action.button:active, .selection-mode.toolbar GtkToolButton.suggested-action:active { border-color: shade(@theme_selected_bg_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 0.85), 1.05)), - to (shade(shade(@theme_bg_color, 0.85), 0.97))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 0.85), 1.05), + shade(shade(@theme_bg_color, 0.85), 0.97) + ); } .selection-mode.header-bar .suggested-action.button:hover:active, .selection-mode.toolbar .suggested-action.button:hover:active, .selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.15)), - to (shade(@theme_bg_color, 1.07))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.15), + shade(@theme_bg_color, 1.07) + ); } /* menu button */ @@ -3028,3 +3419,99 @@ GtkBubbleWindow .toolbar { background-color: transparent; } + +/******* + * CSD * + *******/ +.titlebar { + border-radius: 4px 4px 0 0; + background-image: linear-gradient(to bottom, + @wm_bg_a, + shade(@wm_bg_b, 0.88) + ); +} + +/* 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 .title { + font: bold; + text-shadow: 0 1px @wm_title_focused_shadow; +} + +.titlebar:backdrop { + background-image: linear-gradient(to bottom, + shade(@wm_bg_a, 0.97), + shade(@wm_bg_b, 0.88) + ); +} + +.titlebar .title:backdrop { + text-shadow: 0 1px @wm_title_unfocused_shadow; +} + +.titlebar .titlebutton { + padding: 4px; + border-style: none; + background: none; + color: mix(@wm_title_focused, @wm_bg_a, 0.2); + icon-shadow: 0 1px @wm_title_focused_shadow; + box-shadow: none; +} + +.titlebar .titlebutton:hover, +.titlebar .titlebutton:hover:focus { + background: none; + color: @wm_title_focused; + box-shadow: none; +} + +.titlebar .titlebutton:active, +.titlebar .titlebutton:active:hover { + background: none; + color: @theme_selected_bg_color; + box-shadow: none; +} + +/* +.titlebar .right .titlebutton:first-child { + border-left: 1px solid shade(@wm_bg_a, 0.9); +} + +.titlebar .right .titlebutton:last-child { +} + +.titlebar .left .titlebutton:last-child { + border-right: 1px solid shade(@wm_bg_a, 0.9); +} + +.titlebar .left .titlebutton:first-child { +} +*/ + +.titlebar .titlebutton:backdrop { + background-image: none; + color: @wm_title_unfocused; + icon-shadow: 0 1px @wm_title_unfocused_shadow; +} + +.window-frame { + border-style: none; + border-radius: 4px 4px 0 0; + box-shadow: 0 3px 7px alpha(black, 0.7), + 0 0 0 1px alpha(black, 0.2); + + /* this is used for the resize cursor area */ + margin: 10px; +} + +.window-frame:backdrop { + box-shadow: 0 3px 5px alpha(black, 0.5), + 0 0 0 1px alpha(black, 0.2); +} diff -Nru shimmer-themes-1.6.1/greybird/gtk-3.0/settings.ini shimmer-themes-1.6.2/greybird/gtk-3.0/settings.ini --- shimmer-themes-1.6.1/greybird/gtk-3.0/settings.ini 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/gtk-3.0/settings.ini 2013-09-17 04:27:47.000000000 -0400 @@ -1,4 +1,4 @@ [Settings] -gtk-color-scheme = "base_color:#fcfcfc\nbg_color:#cecece\ntooltip_bg_color:#000000\nselected_bg_color:#398ee7\ntext_color:#000000\nfg_color:#3c3c3c\ntooltip_fg_color:#e1e1e1\nselected_fg_color:#ffffff\nlink_color:#2c82dd" +gtk-color-scheme = "base_color:#fcfcfc\nbg_color:#cecece\ntooltip_bg_color:#000000\nselected_bg_color:#398ee7\ntext_color:#212121\nfg_color:#3c3c3c\ntooltip_fg_color:#e1e1e1\nselected_fg_color:#ffffff\nlink_color:#2c82dd" gtk-auto-mnemonics = 1 gtk-visible-focus = automatic diff -Nru shimmer-themes-1.6.1/greybird/metacity-1/metacity-theme-2.xml shimmer-themes-1.6.2/greybird/metacity-1/metacity-theme-2.xml --- shimmer-themes-1.6.1/greybird/metacity-1/metacity-theme-2.xml 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/metacity-1/metacity-theme-2.xml 2013-09-17 04:27:47.000000000 -0400 @@ -14,9 +14,9 @@ <constant name="C_border_focused" value="shade/gtk:bg[NORMAL]/0.7" /> <constant name="C_border_unfocused" value="shade/gtk:bg[NORMAL]/0.8" /> <constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" /> -<constant name="C_title_focused_shadow" value="shade/gtk:bg[NORMAL]/1.4" /> +<constant name="C_title_focused_shadow" value="shade/gtk:bg[NORMAL]/1.2" /> <constant name="C_title_unfocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" /> -<constant name="C_title_unfocused_shadow" value="shade/gtk:bg[NORMAL]/1.2" /> +<constant name="C_title_unfocused_shadow" value="shade/gtk:bg[NORMAL]/1.1" /> <!-- ::: GEOMETRY ::: --> <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> diff -Nru shimmer-themes-1.6.1/greybird/metacity-1/metacity-theme-3.xml shimmer-themes-1.6.2/greybird/metacity-1/metacity-theme-3.xml --- shimmer-themes-1.6.1/greybird/metacity-1/metacity-theme-3.xml 2013-08-17 22:29:01.000000000 -0400 +++ shimmer-themes-1.6.2/greybird/metacity-1/metacity-theme-3.xml 2013-09-17 04:27:47.000000000 -0400 @@ -14,9 +14,9 @@ <constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.7)" /> <constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.8)" /> <constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1)" /> -<constant name="C_title_focused_shadow" value="gtk:custom(wm_title_focused_shadow,shade/gtk:bg[NORMAL]/1.4)" /> +<constant name="C_title_focused_shadow" value="gtk:custom(wm_title_focused_shadow,shade/gtk:bg[NORMAL]/1.2)" /> <constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)" /> -<constant name="C_title_unfocused_shadow" value="gtk:custom(wm_title_unfocused_shadow,shade/gtk:bg[NORMAL]/1.2)" /> +<constant name="C_title_unfocused_shadow" value="gtk:custom(wm_title_unfocused_shadow,shade/gtk:bg[NORMAL]/1.1)" /> <!-- ::: GEOMETRY ::: --> <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4"> diff -Nru shimmer-themes-1.6.1/numix/gtk-2.0/gtkrc shimmer-themes-1.6.2/numix/gtk-2.0/gtkrc --- shimmer-themes-1.6.1/numix/gtk-2.0/gtkrc 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-2.0/gtkrc 2013-09-17 04:29:50.000000000 -0400 @@ -1,13 +1,10 @@ # Numix GTK Theme -gtk_color_scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d" +gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d" # Default Style style "murrine-default" { - xthickness = 1 - ythickness = 1 - GtkArrow::arrow-scaling= 0.6 GtkButton::child-displacement-x = 0 @@ -15,6 +12,8 @@ GtkButton::default-border = { 0, 0, 0, 0 } + GtkButtonBox::child-min-height = 26 + GtkCheckButton::indicator-size = 16 # The following line hints to gecko (and possibly other appliations) @@ -32,7 +31,6 @@ GtkMenuBar::internal-padding = 0 GtkMenuBar::window-dragging = 1 - GtkMenuBar::shadow-type = GTK_SHADOW_NONE GtkMenuItem::arrow-scaling= 0.5 @@ -42,8 +40,8 @@ GtkProgressBar::min-vertical-bar-width = 12 GtkRange::trough-border = 0 - GtkRange::slider-width = 10 - GtkRange::stepper-size = 10 + GtkRange::slider-width = 12 + GtkRange::stepper-size = 12 GtkRange::stepper_spacing = 0 GtkRange::trough-under-steppers = 1 @@ -56,19 +54,24 @@ GtkScrollbar::has-forward-stepper = 0 GtkScrollbar::has-secondary-backward-stepper = 0 GtkScrollbar::has-secondary-forward-stepper = 0 - GtkScrollbar::min-slider-length = 100 - GtkScrollbar::slider-width = 10 + GtkScrollbar::min-slider-length = 80 + GtkScrollbar::slider-width = 12 GtkScrollbar::trough-border = 0 GtkScrolledWindow::scrollbar-spacing = 0 GtkScrolledWindow::scrollbars-within-bevel = 1 + GtkSeparatorMenuItem::horizontal-padding = 0 + GtkToolbar::internal-padding = 0 GtkTreeView::expander-size = 11 GtkTreeView::vertical-separator = 0 - GtkWidget::focus-padding = 2 + GtkWidget::focus-line-width = 1 + # The following line prevents the Firefox tabs + # from jumping a few pixels when you create a new tab + GtkWidget::focus-padding = 0 GtkWidget::wide-separators = 1 GtkWidget::separator-width = 1 @@ -79,9 +82,19 @@ WnckTasklist::fade-overlay-rect = 0 + GnomeHRef::link_color = @link_color + GtkHTML::link-color = @link_color + GtkIMHtmlr::hyperlink-color = @link_color + GtkIMHtml::hyperlink-color = @link_color GtkWidget::link-color = @link_color GtkWidget::visited-link-color = @text_color + GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified + GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified + + xthickness = 1 + ythickness = 1 + fg[NORMAL] = @fg_color fg[PRELIGHT] = @fg_color fg[SELECTED] = @selected_fg_color @@ -109,16 +122,18 @@ engine "murrine" { animation = FALSE arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows - colorize_scrollbar = FALSE + border_shades = { 1.0, 1.0 } # gradient to draw on border + colorize_scrollbar = FALSE comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow - contrast = 0.8 + contrast = 0.8 # overal contrast with borders focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight - glowstyle = 0 - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } - highlight_shade = 1.0 - lightborder_shade = 1.0 - lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides + glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides + glow_shade = 1.0 # amount of glow + gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets + highlight_shade = 1.0 # amount of highlight + lightborder_shade = 1.0 # amount of inset light border + lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line menubaritemstyle = 0 # 0 = menuitem look, 1 = button look @@ -127,9 +142,9 @@ menustyle = 0 # 0 = none, 1 = vertical striped progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient - roundness = 2 + roundness = 2 # roundness of widgets scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles - sliderstyle = 0 # 0 = none, 1 = handles + sliderstyle = 0 # 0 = none, 1 = handles stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient } @@ -145,6 +160,11 @@ ythickness = 3 } +style "murrine-thin" { + xthickness = 0 + ythickness = 0 +} + # Notebook style "murrine-notebook-bg" { @@ -163,7 +183,7 @@ # Various Standard Widgets -style "murrine-button" { +style "murrine-button" = "murrine-wider" { bg[NORMAL] = shade (1.08, @bg_color) bg[PRELIGHT] = shade (1.10, @bg_color) bg[ACTIVE] = shade (0.95, @bg_color) @@ -174,8 +194,8 @@ } style "murrine-scrollbar" { - bg[NORMAL] = shade (0.90, @bg_color) - bg[PRELIGHT] = shade (0.80, @bg_color) + bg[NORMAL] = mix (0.21, @fg_color, @bg_color) + bg[PRELIGHT] = mix (0.31, @fg_color, @bg_color) bg[ACTIVE] = @selected_bg_color engine "murrine" { @@ -195,15 +215,12 @@ base[INSENSITIVE] = shade (0.85, @base_color) } -style "murrine-scale" = "murrine-default" { - xthickness = 0 - ythickness = 0 - +style "murrine-scale" = "murrine-thin" { bg[NORMAL] = @bg_color bg[ACTIVE] = @bg_color bg[SELECTED] = @selected_bg_color bg[INSENSITIVE] = shade (0.95, @bg_color) - + engine "murrine" { roundness = 7 gradient_shades = { 1.08, 1.08, 1.08, 1.08 } @@ -213,10 +230,7 @@ } } -style "murrine-progressbar" = "murrine-default" { - xthickness = 0 - ythickness = 0 - +style "murrine-progressbar" = "murrine-thin" { bg[NORMAL] = @bg_color bg[ACTIVE] = shade (1.08, @bg_color) @@ -230,9 +244,6 @@ } style "murrine-treeview-header" = "murrine-button" { - xthickness = 0 - ythickness = 0 - engine "murrine" { roundness = 0 } @@ -248,7 +259,7 @@ fg[NORMAL] = lighter (@fg_color) } -style "murrine-tooltips" = "murrine-wider" { +style "murrine-tooltips" { xthickness = 5 ythickness = 5 @@ -295,10 +306,7 @@ # Menus -style "murrine-menu" { - ythickness = 0 - xthickness = 0 - +style "murrine-menu" = "murrine-thin" { bg[NORMAL] = @menu_bg_color bg[PRELIGHT] = @selected_bg_color bg[SELECTED] = @selected_bg_color @@ -339,12 +347,7 @@ } } -style "murrine-separator-menu-item" { - xthickness = 1 - ythickness = 1 - - GtkSeparatorMenuItem::horizontal-padding = 0 -} +style "murrine-separator-menu-item" = "murrine-thin" { } style "murrine-menubar" { bg[NORMAL] = @menubar_bg_color @@ -379,13 +382,12 @@ engine "murrine" { roundness = 0 - border_shades = { 0.8, 0.8 } } } # Toolbars -style "murrine-toolbar" = "murrine-default" { +style "murrine-toolbar" = "murrine-thin" { bg[NORMAL] = @toolbar_bg_color bg[PRELIGHT] = shade (1.02, @toolbar_bg_color) bg[SELECTED] = @selected_bg_color @@ -421,12 +423,12 @@ class "GtkToolbar" style "murrine-toolbar" class "GtkHandleBox" style "murrine-toolbar" +widget_class "*Toolbar*.*Separator*" style "murrine-toolbar" # Panels -style "murrine-panel" { - xthickness = 1 - ythickness = 1 +style "murrine-panel" = "murrine-thin" { + xthickness = 2 bg[NORMAL] = @panel_bg_color bg[PRELIGHT] = mix (0.21, @panel_fg_color, @panel_bg_color) @@ -451,7 +453,7 @@ text[SELECTED] = shade (1.08, @panel_fg_color) text[ACTIVE] = @panel_fg_color text[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color) - + engine "murrine" { roundness = 0 } @@ -528,8 +530,8 @@ Xfwm4TabwinWidget::border-width = 0 Xfwm4TabwinWidget::icon-size = 64 - bg[NORMAL] = @menu_bg_color - fg[NORMAL] = @menu_fg_color + bg[NORMAL] = @menu_bg_color + fg[NORMAL] = @menu_fg_color engine "murrine" { focusstyle = 0 @@ -537,24 +539,24 @@ } style "xfsm-logout" { - bg[NORMAL] = @menu_bg_color - bg[ACTIVE] = @menu_bg_color - bg[PRELIGHT] = shade (1.1, @menu_bg_color) - bg[SELECTED] = shade (0.5, @menu_bg_color) - bg[INSENSITIVE] = shade (1.3, @menu_bg_color) + bg[NORMAL] = @menu_bg_color + bg[ACTIVE] = @menu_bg_color + bg[PRELIGHT] = shade (1.1, @menu_bg_color) + bg[SELECTED] = shade (0.5, @menu_bg_color) + bg[INSENSITIVE] = shade (1.3, @menu_bg_color) - fg[NORMAL] = @menu_fg_color - fg[PRELIGHT] = @menu_fg_color + fg[NORMAL] = @menu_fg_color + fg[PRELIGHT] = @menu_fg_color - text[NORMAL] = @menu_fg_color + text[NORMAL] = @menu_fg_color engine "murrine" { } } style "xfsm-logout-button" { - bg[NORMAL] = shade (1.2, @menu_bg_color) - bg[PRELIGHT] = shade (1.4, @menu_bg_color) + bg[NORMAL] = shade (1.2, @menu_bg_color) + bg[PRELIGHT] = shade (1.4, @menu_bg_color) engine "murrine" { } @@ -606,8 +608,8 @@ ChromeGtkFrame::incognito-frame-gradient-color = @menubar_bg_color ChromeGtkFrame::scrollbar-trough-color = @bg_color - ChromeGtkFrame::scrollbar-slider-prelight-color = shade (0.8, @bg_color) - ChromeGtkFrame::scrollbar-slider-normal-color = shade (0.9, @bg_color) + ChromeGtkFrame::scrollbar-slider-normal-color = mix (0.21, @fg_color, @bg_color) + ChromeGtkFrame::scrollbar-slider-prelight-color = mix (0.31, @fg_color, @bg_color) } class "ChromeGtkFrame" style "chrome-gtk-frame" @@ -620,11 +622,13 @@ class "GtkFrame" style "murrine-wide" class "MetaFrames" style "metacity-frame" -class "GtkSeparator" style "murrine-wide" class "GtkWindow" style "metacity-frame" + +class "GtkSeparator" style "murrine-wide" class "GtkCalendar" style "murrine-wide" class "GtkSpinButton" style "murrine-spinbutton" + class "GtkScale" style "murrine-scale" class "GtkVScale" style "murrine-vscale" class "GtkHScale" style "murrine-hscale" diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/apps/gnome-applications.css shimmer-themes-1.6.2/numix/gtk-3.0/apps/gnome-applications.css --- shimmer-themes-1.6.1/numix/gtk-3.0/apps/gnome-applications.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/apps/gnome-applications.css 2013-09-17 04:29:50.000000000 -0400 @@ -53,21 +53,21 @@ PanelApplet .button:active { border-width: 0 1px; border-radius: 0; - border-color: mix(@panel_bg_color, @panel_fg_color, 0.23); + border-color: mix(@panel_bg_color, @panel_fg_color, 0.21); background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); background-image: none; color: shade(@panel_fg_color, 1.08); } PanelApplet .button:prelight { - border-color: mix(@panel_bg_color, @panel_fg_color, 0.13); + border-color: mix(@panel_bg_color, @panel_fg_color, 0.11); background-color: mix(@panel_bg_color, @panel_fg_color, 0.11); background-image: none; color: shade(@panel_fg_color, 1.08); } PanelApplet .button:active:prelight { - border-color: mix(@panel_bg_color, @panel_fg_color, 0.33); + border-color: mix(@panel_bg_color, @panel_fg_color, 0.31); background-color: mix(@panel_bg_color, @panel_fg_color, 0.31); background-image: none; color: shade(@panel_fg_color, 1.08); @@ -85,8 +85,8 @@ } .nautilus-desktop.nautilus-canvas-item { - color: #fff; - text-shadow: 1px 1px #000; + color: white; + text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:active { @@ -103,44 +103,42 @@ text-shadow: none; } -NautilusWindow .sidebar .frame { - border-width: 1px 0 0 0; +NautilusWindow .toolbar { + border-width: 0 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; + border-color: shade(@toolbar_bg_color, 0.8); +} + +NautilusWindow .sidebar .frame { + border-style: none; } NautilusWindow > GtkGrid > .pane-separator, NautilusWindow > GtkGrid > .pane-separator:hover { - border-width: 1px 1px 0 0; + border-width: 0 1px 0 0; border-style: solid; border-color: shade(@theme_bg_color, 0.8); background-color: @theme_bg_color; } -NautilusView.frame, NautilusNotebook.notebook { border-right-width: 0; - border-bottom-width: 0; border-left-width: 0; + border-bottom-width: 0; } NautilusNotebook .frame { - border-width: 1px 0 0 0; + border-width: 0; } NautilusQueryEditor .primary-toolbar.toolbar { - padding: 4px; - border-top-width: 1px; + border-top-width: 0; border-bottom-width: 0; } -NautilusQueryEditor .primary-toolbar.toolbar .button { - padding: 0; -} - NautilusQueryEditor .toolbar { - padding: 4px 4px 3px 4px; + padding-top: 3px; + padding-bottom: 2px; border-width: 1px 0 0 0; border-style: solid; border-color: @toolbar_bg_color; @@ -151,20 +149,12 @@ border-color: shade(@toolbar_bg_color, 0.8); } -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar { - border-top-width: 0; -} - -NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child, -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child { +NautilusQueryEditor .toolbar:last-child, +NautilusQueryEditor .primary-toolbar.toolbar:only-child { border-bottom-width: 1px; border-bottom-color: shade(@toolbar_bg_color, 0.8); } -.toolbar NautilusPathBar .button { - padding: 1px 5px; -} - /****************** * gnome terminal * ******************/ @@ -191,14 +181,14 @@ } TerminalWindow .scrollbar.slider { - border-color: shade(@osd_base, 0.8); - background-color: shade(@osd_base, 0.9); + border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.21); + background-color: mix(@osd_base, @osd_fg, 0.21); } TerminalWindow .scrollbar.slider:hover, TerminalWindow .scrollbar.slider.vertical:hover { - border-color: shade(@osd_base, 0.7); - background-color: shade(@osd_base, 0.8); + border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.31); + background-color: mix(@osd_base, @osd_fg, 0.31); } TerminalWindow .scrollbar.slider:active, @@ -215,7 +205,7 @@ border-width: 0 1px 1px 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 1.02); + background-color: @theme_bg_color; color: shade(@theme_bg_color, 0.8); } @@ -234,7 +224,7 @@ } GeditDocumentsPanel .view { - background-color: @theme_bg_color; + background-color: @theme_base_color; } GeditPanel.vertical .notebook { diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/apps/granite-widgets.css shimmer-themes-1.6.2/numix/gtk-3.0/apps/granite-widgets.css --- shimmer-themes-1.6.1/numix/gtk-3.0/apps/granite-widgets.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/gtk-3.0/apps/granite-widgets.css 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,671 @@ +/******************** + * dynamic notebook * + ********************/ +.dynamic-notebook { + background-color: shade(@theme_bg_color, 1.08); + background-image: none; +} + +.dynamic-notebook GtkLabel, +.dynamic-notebook GtkImage { + color: alpha(@theme_fg_color, 0.5); +} + +.dynamic-notebook .notebook { + -GtkNotebook-tab-overlap: 3px; + -GtkNotebook-initial-gap: 12px; + + border-width: 1px 0 0 0; + border-color: shade(@theme_bg_color, 0.8); + border-radius: 0; + padding: 0; +} + +.dynamic-notebook .notebook tab { + padding: 3px; + border-color: shade(@theme_bg_color, 0.85); + border-radius: 0; + background-color: shade(@theme_bg_color, 0.9); + background-image: none; + color: @theme_fg_color; +} + +.dynamic-notebook .notebook tab:nth-child(first) { + border-width: 0 1px 0 1px; +} + +.dynamic-notebook .notebook tab:active { + border-width: 1px; + border-color: shade(@theme_bg_color, 0.8); + border-top-color: @theme_selected_bg_color; + background-color: shade(@theme_bg_color, 1.08); + background-image: none; + color: @theme_fg_color; +} + +.dynamic-notebook .notebook tab .entry { + border-radius: 2px; + padding: 4px 3px; +} + +.dynamic-notebook .button:hover, +.dynamic-notebook .button:hover:active, +.dynamic-notebook .notebook .button, +.dynamic-notebook .notebook .button:hover, +.dynamic-notebook .notebook .button:hover:active { + border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 1.10); + background-image: none; +} + +.dynamic-notebook .button:hover:active, +.dynamic-notebook .notebook .button:hover:active { + border-color: shade(@theme_bg_color, 0.7); + color: shade(@theme_fg_color, 0.7); +} + +.dynamic-notebook .menu GtkLabel { + color: @menu_fg; +} + +/**************** + * content view * + ****************/ +.content-view-window { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + border-radius: 2px; + background-color:@theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.content-view, +.content-view GtkViewport { + background-color: @theme_base_color; + background-image: none; +} + +.content-view * { + background-color: transparent; + background-image: none; +} + +.content-view .entry { + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.content-view .button { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + border-radius: 2px; + background-color: shade(@theme_base_color, 1.08); + background-image: none; + color: @theme_text_color; +} + +.content-view .button:hover { + border-color: shade(@theme_base_color, 0.7); + background-color: shade(@theme_base_color, 1.10); + background-image: none; +} + +.content-view .button:active { + border-color: shade(@theme_base_color, 0.8); + background-color: shade(@theme_base_color, 0.95); + background-image: none; +} + +.content-view .button:active:hover { + border-color: shade(@theme_base_color, 0.7); + color: shade(@theme_text_color, 0.7); +} + +.content-view .button:insensitive { + background-color: shade(@theme_base_color, 0.9); + background-image: none; +} + +.content-view .help_button * { + color: @theme_text_color; +} + +.content-view .toolbar { + -GtkWidget-window-dragging: true; + + padding: 1px; + border-width: 0 0 1px 0; + border-style: solid; + border-color: shade(@theme_base_color, 0.8); + background-color: @theme_base_color; + background-image: none; +} + +.content-view .menu { + padding: 0; + border-radius: 0; + border-style: none; + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +/************** + * sourcelist * + **************/ +.source-list, +.source-list.view { + border-radius: 0; + background-color: @theme_bg_color; + background-image: none; + color: mix(@theme_fg_color, @theme_bg_color, 0.1); +} + +.source-list { + -GtkTreeView-horizontal-separator: 1; + -GtkTreeView-vertical-separator: 1; +} + +.source-list.view:selected, +.source-list.view:prelight:selected { + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +.source-list.view:prelight { + background-color: shade(@theme_bg_color, 1.08); + background-image: none; +} + +.source-list.badge, +.source-list.badge:prelight, +.source-list.badge:selected, +.source-list.badge:prelight:selected { + margin: 0 3px; + padding: 0 6px; + border-width: 0; + border-radius: 10px; + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +/****************** + * no undo button * + ******************/ +.button.noundo, +.content-view .button.noundo { + border-color: shade(@error_bg_color, 0.8); + background-color: shade(@error_bg_color, 1.08); + background-image: none; + color: @error_fg_color; +} + +.button.noundo:hover, +.content-view .button.noundo:hover { + border-color: shade(@error_bg_color, 0.7); + background-color: @error_bg_color; + background-image: none; +} + +.button.noundo:active, +.content-view .button.noundo:active { + border-color: shade(@error_bg_color, 0.8); + background-color: shade(@error_bg_color, 0.95); + background-image: none; +} + +.button.noundo:active:hover, +.content-view .button.noundo:active:hover { + border-color: shade(@error_bg_color, 0.7); + background-color: shade(@error_bg_color, 0.97); + background-image: none; +} + +.button.noundo GtkLabel, +.button.noundo Gtklabel:prelight { + color: @error_fg_color; +} + +/********************** + * affirmative button * + **********************/ +.button.affirmative, +.content-view .button.affirmative { + border-color: shade(@theme_selected_bg_color, 0.8); + background-color: shade(@theme_selected_bg_color, 1.08); + background-image: none; + color: @theme_selected_fg_color; +} + +.button.affirmative:hover, +.content-view .button.affirmative:hover { + border-color: shade(@theme_selected_bg_color, 0.7); + background-color: @theme_selected_bg_color; + background-image: none; +} + +.button.affirmative:active, +.content-view .button.affirmative:active { + border-color: shade(@theme_selected_bg_color, 0.8); + background-color: shade(@theme_selected_bg_color, 0.95); + background-image: none; +} + +.button.affirmative:active:hover, +.content-view .button.affirmative:active:hover { + border-color: shade(@theme_selected_bg_color, 0.7); + background-color: shade(@theme_selected_bg_color, 0.97); + background-image: none; +} + +.button.affirmative GtkLabel, +.button.affirmative Gtklabel:prelight { + color: @theme_selected_fg_color; +} + +/********************** + * secondary toolbars * + **********************/ +.secondary-toolbar.toolbar { + padding: 2px; + border-color: shade(@toolbar_bg_color, 0.8); + background-color: @toolbar_bg_color; + background-image: none; +} + +.secondary-toolbar.toolbar .button { + border-color: shade(@toolbar_bg_color, 0.8); + background-color: shade(@toolbar_bg_color, 1.08); + background-image: none; + color: @toolbar_fg_color; +} + +.secondary-toolbar.toolbar .button:hover { + border-color: shade(@toolbar_bg_color, 0.7); + background-color: shade(@toolbar_bg_color, 1.10); + background-image: none; +} + +.secondary-toolbar.toolbar .button:active { + border-color: shade(@toolbar_bg_color, 0.8); + background-color: shade(@toolbar_bg_color, 0.95); + background-image: none; +} + +.secondary-toolbar.toolbar .button:active:hover { + border-color: shade(@toolbar_bg_color, 0.7); +} + +.secondary-toolbar.toolbar .button:focus, +.secondary-toolbar.toolbar .button:hover:focus, +.secondary-toolbar.toolbar .button:active:focus, +.secondary-toolbar.toolbar .button:active:hover:focus { + border-color: shade(@toolbar_bg_color, 0.7); +} + +.secondary-toolbar.toolbar .button:insensitive { + border-color: shade(@toolbar_bg_color, 0.85); + background-color: shade(@toolbar_bg_color, 0.9); + background-image: none; +} + +.secondary-toolbar.toolbar .button:active *:insensitive { + border-color: shade(@toolbar_bg_color, 0.75); + background-color: shade(@toolbar_bg_color, 0.80); + background-image: none; +} + +/******************* + * bottom toolbars * + *******************/ +.bottom-toolbar.toolbar { + padding: 6px; + border-width: 1px 0 0 0; + border-color: shade(@theme_bg_color, 0.8); + background-color: @theme_bg_color; + background-image: none; +} + +.bottom-toolbar.toolbar .button { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 1.08); + background-image: none; + color: @theme_fg_color; +} + +.bottom-toolbar.toolbar .button:hover { + border-color: shade(@theme_bg_color, 0.7); + background-color: shade(@theme_bg_color, 1.10); + background-image: none; +} + +.bottom-toolbar.toolbar .button:active { + border-color: shade(@theme_bg_color, 0.8); + background-color: shade(@theme_bg_color, 0.95); + background-image: none; +} + +.bottom-toolbar.toolbar .button:active:hover { + border-color: shade(@theme_bg_color, 0.7); +} + +.bottom-toolbar.toolbar .button:focus, +.bottom-toolbar.toolbar .button:hover:focus, +.bottom-toolbar.toolbar .button:active:focus, +.bottom-toolbar.toolbar .button:active:hover:focus { + border-color: shade(@theme_bg_color, 0.7); +} + +.bottom-toolbar.toolbar .button:insensitive { + border-color: shade(@theme_bg_color, 0.85); + background-color: shade(@theme_bg_color, 0.9); + background-image: none; +} + +.bottom-toolbar.toolbar .button:active *:insensitive { + border-color: shade(@theme_bg_color, 0.75); + background-color: shade(@theme_bg_color, 0.80); + background-image: none; +} + +/************* + * statusbar * + *************/ +GraniteWidgetsStatusBar { + padding: 1px; + background-color: @theme_bg_color; + background-image: none; + box-shadow: inset 0 1px shade(@theme_bg_color, 0.8); +} + +/*********** + * popover * + ***********/ +GraniteWidgetsPopOver { + -GraniteWidgetsPopOver-arrow-width: 21; + -GraniteWidgetsPopOver-arrow-height: 12; + -GraniteWidgetsPopOver-border-radius: 2px; + -GraniteWidgetsPopOver-border-width: 1; + -GraniteWidgetsPopOver-shadow-size: 12; + + margin: 0; + border-style: solid; + border-color: shade(@menu_bg_color, 0.8); + color: @menu_fg_color; +} + +.popover_bg { + background-color: transparent; + background-image: linear-gradient(to bottom, + @menu_bg_color, + @menu_bg_color + ); +} + +GraniteWidgetsPopOver .sidebar.view, +GraniteWidgetsPopOver * { + background-color: transparent; + background-image: none; + color: @menu_fg_color; +} + +GraniteWidgetsPopOver .sidebar.view:selected, +GraniteWidgetsPopOver .sidebar.view:selected:focus, +GraniteWidgetsPopOver *:selected, +GraniteWidgetsPopOver *:selected:focus { + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +GraniteWidgetsPopOver .button { + border-color: shade(@menu_bg_color, 0.8); + background-color: shade(@menu_bg_color, 1.08); + background-image: none; + color: @menu_fg_color; + +} + +GraniteWidgetsPopOver .button:hover { + border-color: shade(@menu_bg_color, 0.7); + background-color: shade(@menu_bg_color, 1.10); + background-image: none; + color: shade(@menu_fg_color, 0.7); +} + +GraniteWidgetsPopOver .button:active { + border-color: shade(@menu_bg_color, 0.8); + background-color: shade(@menu_bg_color, 0.95); + background-image: none; +} + +GraniteWidgetsPopOver .button:active:hover { + border-color: shade(@menu_bg_color, 0.7); + color: shade(@menu_fg_color, 0.7); +} + +/* linked buttons */ +GraniteWidgetsPopOver .linked .button { + box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9); +} + +GraniteWidgetsPopOver .linked .button:active { + box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9), + inset 1px 0 alpha(@dark_shadow, 0.07), + inset 0 1px alpha(@dark_shadow, 0.08), + inset 0 -1px alpha(@dark_shadow, 0.05); +} + +GraniteWidgetsPopOver .linked .button:insensitive { + box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9); +} + +/* remove box shadow from last-child and only-child */ +GraniteWidgetsPopOver .linked .button:last-child, +GraniteWidgetsPopOver .linked .button:only-child, +GraniteWidgetsPopOver .linked .button:insensitive:last-child, +GraniteWidgetsPopOver .linked .button:insensitive:only-child, +GraniteWidgetsPopOver .linked .button:active *:insensitive:last-child, +GraniteWidgetsPopOver .linked .button:active *:insensitive:only-child { + box-shadow: none; +} + +/* add back the inset shadow effect */ +GraniteWidgetsPopOver .linked .button:active:last-child, +GraniteWidgetsPopOver .linked .button:active:only-child { + box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), + inset 0 1px alpha(@dark_shadow, 0.08), + inset -1px 0 alpha(@dark_shadow, 0.07); +} + +GraniteWidgetsPopOver .entry { + border-color: shade(@menu_bg_color, 0.7); + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +GraniteWidgetsPopOver .entry:active, +GraniteWidgetsPopOver .entry:focus { + border-color: shade(@menu_bg_color, 0.7); +} + +GraniteWidgetsPopOver *.separator { + border-color: shade(@menu_bg_color, 0.9); + color: transparent; +} + +.button.app { + border-width: 0; + border-radius: 2px; + background-color: transparent; + background-image: none; +} + +.button.app:hover { + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +.button.app:focus { + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +/******** + * gala * + ********/ +.gala-workspaces-background { + border-width: 1px 0 0 0; + border-color: shade(@panel_bg_color, 0.8); + background-color: @panel_bg_color; + background-image: none; +} + +.gala-workspace-selected { + border-width: 1px; + border-radius: 2px; + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; + background-image: none; +} + +/********* + * files * + *********/ +.files-overlay-bar { + margin: 3px; + padding: 3px 6px; + border-width: 1px; + border-color: shade(@theme_base_color, 0.7); + border-radius: 2px; + background-color: @theme_base_color; + background-image: none; +} + +.files-overlay-bar GtkLabel { + color: @theme_text_color; +} + +/********* + * noise * + *********/ +.album-list-view, +.album-list-view * { + border-color: shade(@theme_base_color, 0.7); + border-radius: 0; + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.album-list-view GtkTreeView { + -GtkTreeView-vertical-separator: 1; + -GtkTreeView-grid-line-width: 0; + + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.album-list-view GtkTreeView row:nth-child(even) { + border-width: 0; + border-style: none; + background-color: shade(@theme_base_color, 0.97); + background-image: none; +} + + +.album-list-view GtkTreeView row:nth-child(odd) { + border-width: 0; + border-style: none; + background-color: shade(@theme_base_color, 1.0); + background-image: none; +} + +.album-list-view GtkTreeView row:selected { + background-color: @selected_bg_color; + background-image: none; + color: @selected_fg_color; +} + +/********** + * birdie * + **********/ +BirdieWidgetsTweetList * { + background-color: transparent; + background-image: none; +} + +/********* + * tweet * + *********/ +.tweet { + padding: 0; +} + +/********** + * notify * + **********/ +.notify { + border-width: 1px; + border-style: solid; + border-color: shade(@theme_base_color, 0.7); + border-radius: 2px; + background-color: @theme_base_color; + background-image: none; + color: @theme_text_color; +} + +.notify .low { +} + +.notify .critical { +} + +/********* + * panel * + *********/ +.panel { + background-color: @panel_bg_color; + background-image: none; + color: @panel_fg_color; + font: bold; +} + +.panel .menubar .menuitem { + padding: 1px 3px; +} + +.shadow { + background-color: transparent; + background-image: linear-gradient(to bottom, + rgba(0, 0, 0, 0.3), + transparent + ); +} + +.composited-indicator, +.wingpanel-app-button, +.wingpanel-indicator-button { + padding: 0 2px; + background-color: transparent; + background-image: none; + color: @panel_fg_color; +} + +.composited-indicator.menuitem:active, +.composited-indicator.menuitem:prelight { + border-style: none; + background-image: none; +} diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/apps/unity.css shimmer-themes-1.6.2/numix/gtk-3.0/apps/unity.css --- shimmer-themes-1.6.1/numix/gtk-3.0/apps/unity.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/apps/unity.css 2013-09-17 04:29:50.000000000 -0400 @@ -20,8 +20,8 @@ .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { - border-color: mix(@panel_bg_color, @panel_fg_color, 0.23); + border-color: mix(@panel_bg_color, @panel_fg_color, 0.21); background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); background-image: none; color: shade(@panel_fg_color, 1.08); -} \ No newline at end of file +} diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/apps/xfce.css shimmer-themes-1.6.2/numix/gtk-3.0/apps/xfce.css --- shimmer-themes-1.6.1/numix/gtk-3.0/apps/xfce.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/gtk-3.0/apps/xfce.css 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,54 @@ +XfceHeading { + background-color: @theme_base_color; + background-image: none; + padding: 0; + border-width: 0; +} + +.xfce4-panel { + background-color: @panel_bg_color; +} + +.xfce4-panel .button { + border-radius: 0; + padding: 1px; + color: @panel_fg_color; +} + +.xfce4-panel .button:active { + border-width: 0 1px; + border-radius: 0; + border-color: mix(@panel_bg_color, @panel_fg_color, 0.21); + background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); + background-image: none; + color: shade(@panel_fg_color, 1.08); +} + +.xfce4-panel .button:hover, +.xfce4-panel .button:active:hover { + border-color: mix(@panel_bg_color, @panel_fg_color, 0.31); + background-color: mix(@panel_bg_color, @panel_fg_color, 0.31); + background-image: none; + color: shade(@panel_fg_color, 1.08); +} + +/* menu-styling, e.g. for indicators */ +.xfce4-panel .menu, +.xfce4-panel .menu GtkLabel, +.xfce4-panel .menu GtkImage { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + +.xfce4-panel .menu *:hover { + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +.xfce4-panel .menu GtkLabel:hover, +.xfce4-panel .menu GtkImage:hover { + background-image: none; + color: @theme_selected_fg_color; +} diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/assets/pane-handle.svg shimmer-themes-1.6.2/numix/gtk-3.0/assets/pane-handle.svg --- shimmer-themes-1.6.1/numix/gtk-3.0/assets/pane-handle.svg 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/gtk-3.0/assets/pane-handle.svg 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="4" + height="9" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="pane-handle.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="16" + inkscape:cx="-11.087273" + inkscape:cy="3.6971205" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1366" + inkscape:window-height="717" + inkscape:window-x="0" + inkscape:window-y="26" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid2985" + empspacing="8" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="0px" + originy="-3.4765626e-05px" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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 /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1043.3622)"> + <rect + y="-4" + x="1051.3622" + height="4" + width="1" + id="rect3757" + style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-4" + x="1047.3622" + height="4" + width="1" + id="rect3757-3" + style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="matrix(0,1,-1,0,0,0)" /> + <rect + y="-4" + x="1043.3622" + height="4" + width="1" + id="rect3757-35" + style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="matrix(0,1,-1,0,0,0)" /> + </g> +</svg> diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/assets/pane-handle-vertical.svg shimmer-themes-1.6.2/numix/gtk-3.0/assets/pane-handle-vertical.svg --- shimmer-themes-1.6.1/numix/gtk-3.0/assets/pane-handle-vertical.svg 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/gtk-3.0/assets/pane-handle-vertical.svg 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="9" + height="4" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="pane-handle-horizontal.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="16" + inkscape:cx="-11.087273" + inkscape:cy="3.6971205" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1366" + inkscape:window-height="717" + inkscape:window-x="0" + inkscape:window-y="26" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid2985" + empspacing="8" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="0px" + originy="-3.4765626e-05px" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <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> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1048.3622)"> + <rect + y="-1052.3622" + x="-9" + height="4" + width="1" + id="rect3757" + style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + y="-1052.3622" + x="-5" + height="4" + width="1" + id="rect3757-3" + style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + y="-1052.3622" + x="-1" + height="4" + width="1" + id="rect3757-35" + style="opacity:0.2;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + </g> +</svg> diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/gtk.css shimmer-themes-1.6.2/numix/gtk-3.0/gtk.css --- shimmer-themes-1.6.1/numix/gtk-3.0/gtk.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/gtk.css 2013-09-17 04:29:50.000000000 -0400 @@ -61,4 +61,6 @@ @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); @import url("apps/gnome-applications.css"); +@import url("apps/granite-widgets.css"); @import url("apps/unity.css"); +@import url("apps/xfce.css"); diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/gtk-dark.css shimmer-themes-1.6.2/numix/gtk-3.0/gtk-dark.css --- shimmer-themes-1.6.1/numix/gtk-3.0/gtk-dark.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/gtk-dark.css 2013-09-17 04:29:50.000000000 -0400 @@ -61,4 +61,6 @@ @import url("gtk-widgets.css"); @import url("gtk-widgets-assets-dark.css"); @import url("apps/gnome-applications.css"); +@import url("apps/granite-widgets.css"); @import url("apps/unity.css"); +@import url("apps/xfce.css"); diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/gtk-widgets-assets.css shimmer-themes-1.6.2/numix/gtk-3.0/gtk-widgets-assets.css --- shimmer-themes-1.6.1/numix/gtk-3.0/gtk-widgets-assets.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/gtk-widgets-assets.css 2013-09-17 04:29:50.000000000 -0400 @@ -120,3 +120,18 @@ GtkIconView.content-view.cell.check:active { background-image: url("assets/grid-selection-checked.svg"); } + +/****************** + * pane separator * + ******************/ +.pane-separator.horizontal { + background-image: url("assets/pane-handle.svg"); + background-repeat: no-repeat; + background-position: center center; +} + +.pane-separator.vertical { + background-image: url("assets/pane-handle-vertical.svg"); + background-repeat: no-repeat; + background-position: center center; +} diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/gtk-widgets-assets-dark.css shimmer-themes-1.6.2/numix/gtk-3.0/gtk-widgets-assets-dark.css --- shimmer-themes-1.6.1/numix/gtk-3.0/gtk-widgets-assets-dark.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/gtk-widgets-assets-dark.css 2013-09-17 04:29:50.000000000 -0400 @@ -120,3 +120,18 @@ GtkIconView.content-view.cell.check:active { background-image: url("assets/grid-selection-checked-dark.svg"); } + +/****************** + * pane separator * + ******************/ +.pane-separator.horizontal { + background-image: url("assets/pane-handle.svg"); + background-repeat: no-repeat; + background-position: center center; +} + +.pane-separator.vertical { + background-image: url("assets/pane-handle-vertical.svg"); + background-repeat: no-repeat; + background-position: center center; +} diff -Nru shimmer-themes-1.6.1/numix/gtk-3.0/gtk-widgets.css shimmer-themes-1.6.2/numix/gtk-3.0/gtk-widgets.css --- shimmer-themes-1.6.1/numix/gtk-3.0/gtk-widgets.css 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/gtk-3.0/gtk-widgets.css 2013-09-17 04:29:50.000000000 -0400 @@ -22,16 +22,16 @@ -GtkMenu-horizontal-padding: 0; -GtkMenu-vertical-padding: 0; -GtkNotebook-initial-gap: 0; - -GtkPaned-handle-size: 3; + -GtkPaned-handle-size: 4; -GtkProgressBar-min-horizontal-bar-height: 12; -GtkProgressBar-min-vertical-bar-width: 12; - -GtkRange-slider-width: 10; + -GtkRange-slider-width: 12; -GtkRange-stepper-spacing: 0; -GtkRange-trough-border: 0; -GtkRange-trough-under-steppers: 1; -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; - -GtkScrollbar-min-slider-length: 100; + -GtkScrollbar-min-slider-length: 80; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkScrolledWindow-scrollbars-within-bevel: 1; -GtkStatusbar-shadow-type: none; @@ -88,6 +88,15 @@ color: mix(@theme_fg_color, @theme_bg_color, 0.5); } +/* apply effects to insensitive and prelit images */ +*:insensitive { + -gtk-image-effect: dim; +} + +*:hover { + -gtk-image-effect: highlight; +} + .gtkstyle-fallback { background-color: @theme_bg_color; color: @theme_fg_color; @@ -131,8 +140,9 @@ /* inset shadows */ .button:active, +.primary-toolbar .button:active, .toolbar .button:active, -.primary-toolbar .button:active { +.header-bar .button:active { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07), @@ -146,9 +156,11 @@ inset 0 -1px alpha(@dark_shadow, 0.05); } -.button:active:insensitive, -.toolbar .button:active:insensitive, -.primary-toolbar .button:active:insensitive, +/* disable inset shadow */ +.button:active *:insensitive, +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive, .entry:insensitive { box-shadow: none; } @@ -161,7 +173,7 @@ } GtkAssistant .sidebar { - padding: 3px; + padding: 4px; border-width: 0 1px 0 0; border-style: solid; border-right-color: shade(@theme_bg_color, 0.8); @@ -177,7 +189,7 @@ -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; - padding: 3px 2px; + padding: 3px; border-width: 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.8); @@ -216,7 +228,7 @@ background-image: none; } -.button:active:insensitive { +.button:active *:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -259,6 +271,7 @@ } row:selected, +row:selected:hover, row:selected:focus { border-width: 1px 0; border-style: solid; @@ -388,7 +401,7 @@ * calendar * ************/ GtkCalendar { - padding: 3px; + padding: 4px; } GtkCalendar:inconsistent { @@ -526,13 +539,12 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (@theme_selected_bg_color), - to (@theme_selected_bg_color)); - + background-color: @theme_selected_bg_color; + background-image: none; color: @theme_selected_fg_color; } +.content-view.view.rubberband, .view.rubberband, .rubberband { border-width: 1px; @@ -571,39 +583,111 @@ .info { border-width: 1px; border-style: solid; - border-color: shade(@info_bg_color, 0.9); + border-color: shade(@info_bg_color, 0.8); background-color: @info_bg_color; background-image: none; color: @info_fg_color; } +.info .button.close { + color: @info_fg_color; +} + +.info .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.info .button.close:active { + color: @info_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .warning { border-width: 1px; border-style: solid; - border-color: shade(@warning_bg_color, 0.9); + border-color: shade(@warning_bg_color, 0.8); background-color: @warning_bg_color; background-image: none; color: @warning_fg_color; } +.warning .button.close { + color: @warning_fg_color; +} + +.warning .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.warning .button.close:active { + color: @warning_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .question { border-width: 1px; border-style: solid; - border-color: shade(@question_bg_color, 0.9); + border-color: shade(@question_bg_color, 0.8); background-color: @question_bg_color; background-image: none; color: @question_fg_color; } +.question .button.close { + color: @question_fg_color; +} + +.question .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.question .button.close:active { + color: @question_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .error { border-width: 1px; border-style: solid; - border-color: shade(@error_bg_color, 0.9); + border-color: shade(@error_bg_color, 0.8); background-color: @error_bg_color; background-image: none; color: @error_fg_color; } +.error .button.close { + color: @error_fg_color; +} + +.error .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.error .button.close:active { + color: @error_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + /******************* * symbolic images * *******************/ @@ -671,15 +755,8 @@ } .view.dim-label, -.dim-label, -.dim-label:hover, -.dim-label:focus { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -.dim-label:selected, -.dim-label:selected:focus { - color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.5); +.dim-label { + color: alpha(currentColor, 0.5); } .dnd { @@ -705,9 +782,12 @@ background-color: @menu_bg_color; } +.primary-toolbar .menu, .primary-toolbar .button .menu, .toolbar .menu, .toolbar .primary-toolbar .menu, +.header-bar .menu, +.header-bar .primary-toolbar .menu, .menu { padding: 0; border-radius: 0; @@ -718,7 +798,7 @@ .menu.button:hover, .menu.button:active, -.menu.button:active:insensitive, +.menu.button:active *:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -726,6 +806,16 @@ background-image: none; } +.context-menu { + font: initial; +} + +/* ubuntu software center menu */ +#toolbar-popup { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + /*********** * menubar * ***********/ @@ -754,9 +844,10 @@ .menubar.menuitem:hover, .menubar .menuitem:hover { - border-color: mix(@menubar_bg_color, @menubar_fg_color, 0.23); + border-color: mix(@menubar_bg_color, @menubar_fg_color, 0.21); background-color: mix(@menubar_bg_color, @menubar_fg_color, 0.21); background-image: none; + color: shade(@menubar_fg_color, 1.08); } .menubar .menuitem *:hover { @@ -771,10 +862,6 @@ border-width: 0; } -GtkTreeMenu .menuitem * { - color: @menu_fg_color; -} - .menuitem, .menu .menuitem { padding: 3px; @@ -863,6 +950,10 @@ color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6); } +GtkModelMenuItem GtkBox GtkImage { + padding-right: 4px; +} + /************ * notebook * ************/ @@ -871,7 +962,7 @@ border-width: 1px; border-style: solid; border-color: shade(@theme_base_color, 0.7); - border-radius: 2px; + border-radius: 0; background-color: @theme_base_color; background-image: none; background-clip: border-box; @@ -883,9 +974,9 @@ } .notebook tab { - padding: 3px; + padding: 4px; border-color: shade(@theme_base_color, 0.75); - border-radius: 2px; + border-radius: 0; background-color: shade(@theme_base_color, 0.85); background-image: none; } @@ -907,6 +998,7 @@ } .notebook tab.top:active { + border-top-color: @theme_selected_bg_color; } .notebook tab.right { @@ -916,6 +1008,7 @@ } .notebook tab.right:active { + border-right-color: @theme_selected_bg_color; } .notebook tab.bottom { @@ -925,6 +1018,7 @@ } .notebook tab.bottom:active { + border-bottom-color: @theme_selected_bg_color; } .notebook tab.left { @@ -934,6 +1028,7 @@ } .notebook tab.left:active { + border-left-color: @theme_selected_bg_color; } /****************** @@ -1054,11 +1149,11 @@ } .level-bar.fill-block.level-low { - border-color: shade(@warning_bg_color, 0.80); + border-color: shade(@warning_color, 0.80); background-image: linear-gradient(to bottom, - shade(@warning_bg_color, 1.3), - @warning_bg_color 75%, - shade(@warning_bg_color, 0.9) + shade(@warning_color, 1.3), + @warning_color 75%, + shade(@warning_color, 0.9) ); } @@ -1105,6 +1200,15 @@ inset 0 -1px shade(@theme_bg_color, 0.85); } +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + .scale.mark { border-color: shade(@theme_bg_color, 0.8); } @@ -1175,15 +1279,15 @@ .scrollbar.slider { border-width: 1px; - border-color: shade(@theme_bg_color, 0.8); + border-color: mix(shade(@theme_bg_color, 0.87), @theme_fg_color, 0.21); border-radius: 0; - background-color: shade(@theme_bg_color, 0.9); + background-color: mix(@theme_bg_color, @theme_fg_color, 0.21); } .scrollbar.slider:hover, .scrollbar.slider.vertical:hover { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 0.8); + border-color: mix(shade(@theme_bg_color, 0.87), @theme_fg_color, 0.31); + background-color: mix(@theme_bg_color, @theme_fg_color, 0.31); } .scrollbar.slider:active, @@ -1192,6 +1296,12 @@ background-color: @theme_selected_bg_color; } +.scrollbar.slider.fine-tune:prelight:active { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + /* overlay scrollbar */ OsThumb { color: shade(@theme_bg_color, 0.7); @@ -1236,21 +1346,32 @@ .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, -.primary-toolbar .separator:insensitive { +.primary-toolbar .separator:insensitive, +.toolbar GtkSeparatorToolItem, +.toolbar .separator, +.toolbar .separator:insensitive +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { border-color: shade(@toolbar_bg_color, 0.95); + color: shade(@toolbar_bg_color, 0.95); } +.primary-toolbar .button .separator, +.primary-toolbar .button.separator, .toolbar .button .separator, .toolbar .button.separator, -.primary-toolbar .button .separator, -.primary-toolbar .button.separator { +.header-bar .button .separator, +.header-bar .button.separator { border-color: shade(@toolbar_bg_color, 0.95); } +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive, .toolbar .button .separator:insensitive, .toolbar .button.separator:insensitive, -.primary-toolbar .button .separator:insensitive, -.primary-toolbar .button.separator:insensitive { +.header-bar .button .separator:insensitive, +.header-bar .button.separator:insensitive { border-color: shade(@toolbar_bg_color, 0.85); } @@ -1276,11 +1397,40 @@ ***********/ .sidebar, .sidebar.view, -.sidebar .view { +.sidebar .view, +.sidebar GtkScrolledWindow { background-color: @theme_bg_color; color: mix(@theme_fg_color, @theme_bg_color, 0.1); } +.sidebar row:selected, +.sidebar row:selected:hover, +.sidebar row:selected:focus, +.sidebar .view row:selected, +.sidebar .view row:selected:hover, +.sidebar .view row:selected:focus { + border-color: shade(@theme_selected_bg_color, 0.9); + background-color: @theme_selected_bg_color; + background-image: none; + color: @theme_selected_fg_color; +} + +.sidebar row:prelight, +.sidebar .view row:prelight { + border-color: shade(@theme_bg_color, 1.05); + background-color: shade(@theme_bg_color, 1.05); + background-image: none; + color: @theme_fg_color; +} + +.sidebar row:selected:prelight, +.sidebar .view row:selected:prelight { + border-color: shade(@theme_selected_bg_color, 1.05); + background-color: shade(@theme_selected_bg_color, 1.05); + background-image: none; + color: @theme_selected_fg_color; +} + .sidebar .frame { border-width: 0; } @@ -1508,7 +1658,7 @@ * statusbar * *************/ GtkStatusbar { - padding: 3px; + padding: 4px; color: @theme_fg_color; } @@ -1670,26 +1820,34 @@ * header-bar * **************/ .header-bar { + padding: 4px; border-width: 0 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - padding: 0 2px; - background-color: @theme_bg_color; + border-color: shade(@toolbar_bg_color, 0.8); + background-color: @toolbar_bg_color; } .header-bar .button.text-button { - padding: 2px 4px; + padding: 4px; } .header-bar .button.image-button { - padding: 4px 3px 3px 4px; + padding: 6px; +} + +.header-bar .title { + font: bold; +} + +.header-bar .subtitle { + font: smaller; } /*********** * toolbar * ***********/ .toolbar { - padding: 3px; + padding: 4px; border-style: none; background-color: @toolbar_bg_color; background-image: none; @@ -1712,7 +1870,6 @@ background-color: shade(@toolbar_bg_color, 0.9); } - /* menubar toolbars */ .toolbar.menubar { -GtkToolbar-button-relief: normal; @@ -1726,7 +1883,7 @@ .primary-toolbar.toolbar { -GtkWidget-window-dragging: true; - padding: 3px; + padding: 4px; border-width: 0 0 1px 0; border-style: solid; border-color: shade(@toolbar_bg_color, 0.8); @@ -1749,7 +1906,9 @@ .primary-toolbar .raised .button, .primary-toolbar .raised.button, .toolbar GtkComboBox, -.toolbar .button { +.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { border-color: shade(@toolbar_bg_color, 0.8); background-color: shade(@toolbar_bg_color, 1.08); background-image: none; @@ -1757,21 +1916,24 @@ } .primary-toolbar .button:hover, -.toolbar .button:hover { +.toolbar .button:hover, +.header-bar .button:hover { border-color: shade(@toolbar_bg_color, 0.7); background-color: shade(@toolbar_bg_color, 1.10); background-image: none; } .primary-toolbar .button:active, -.toolbar .button:active { +.toolbar .button:active, +.header-bar .button:active { border-color: shade(@toolbar_bg_color, 0.8); background-color: shade(@toolbar_bg_color, 0.95); background-image: none; } .primary-toolbar .button:active:hover, -.toolbar .button:active:hover { +.toolbar .button:active:hover, +.header-bar .button:active:hover { border-color: shade(@toolbar_bg_color, 0.7); } @@ -1782,30 +1944,42 @@ .toolbar .button:focus, .toolbar .button:hover:focus, .toolbar .button:active:focus, -.toolbar .button:active:hover:focus { +.toolbar .button:active:hover:focus, +.header-bar .button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:active:hover:focus { border-color: shade(@toolbar_bg_color, 0.7); } .primary-toolbar .button:insensitive, -.toolbar .button:insensitive { +.toolbar .button:insensitive, +.header-bar .button:insensitive { border-color: shade(@toolbar_bg_color, 0.85); background-color: shade(@toolbar_bg_color, 0.9); background-image: none; } -.primary-toolbar .button:active:insensitive, -.toolbar .button:active:insensitive { +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive { border-color: shade(@toolbar_bg_color, 0.75); background-color: shade(@toolbar_bg_color, 0.80); background-image: none; } -.primary-toolbar .entry { +.primary-toolbar .entry, +.toolbar .entry, +.header-bar .entry { border-color: shade(@toolbar_bg_color, 0.8); } .primary-toolbar .entry:active, -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.toolbar .entry:active, +.toolbar .entry:focus, +.header-bar .entry:active, +.header-bar .entry:focus { border-color: shade(@toolbar_bg_color, 0.7); } @@ -1902,20 +2076,20 @@ .linked .button:only-child, .linked .button:insensitive:last-child, .linked .button:insensitive:only-child, -.linked .button:active:insensitive:last-child, -.linked .button:active:insensitive:only-child, +.linked .button:active *:insensitive:last-child, +.linked .button:active *:insensitive:only-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar .button:active:insensitive:last-child, -.inline-toolbar.toolbar .button:active:insensitive:only-child, +.inline-toolbar.toolbar .button:active *:insensitive:last-child, +.inline-toolbar.toolbar .button:active *:insensitive:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button, .inline-toolbar.toolbar GtkToolButton:only-child > .button, .inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive { +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2030,20 +2204,20 @@ .linked.vertical .button:only-child, .linked.vertical .button:insensitive:last-child, .linked.vertical .button:insensitive:only-child, -.linked.vertical .button:active:insensitive:last-child, -.linked.vertical .button:active:insensitive:only-child, +.linked.vertical .button:active *:insensitive:last-child, +.linked.vertical .button:active *:insensitive:only-child, .inline-toolbar.toolbar.vertical .button:last-child, .inline-toolbar.toolbar.vertical .button:only-child, .inline-toolbar.toolbar.vertical .button:insensitive:last-child, .inline-toolbar.toolbar.vertical .button:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2110,13 +2284,23 @@ /* linked toolbar buttons */ .primary-toolbar .button.raised.linked, .primary-toolbar .raised.linked .button, -.toolbar .button.linked { +.toolbar .button.raised.linked, +.toolbar .raised.linked .button, +.toolbar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button, +.header-bar .linked .button { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9); } .primary-toolbar .button.raised.linked:active, .primary-toolbar .raised.linked .button:active, -.toolbar .button.linked:active { +.toolbar .button.raised.linked:active, +.toolbar .raised.linked .button:active, +.toolbar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active, +.header-bar .linked .button:active { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2125,7 +2309,12 @@ .primary-toolbar .button.raised.linked:insensitive, .primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.linked:insensitive { +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9); } @@ -2134,20 +2323,50 @@ .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .button:insensitive.raised.linked:last-child, .primary-toolbar .button:insensitive.raised.linked:only-child, -.primary-toolbar .button:active:insensitive.raised.linked:last-child, -.primary-toolbar .button:active:insensitive.raised.linked:only-child, +.primary-toolbar .button:active *:insensitive.raised.linked:last-child, +.primary-toolbar .button:active *:insensitive.raised.linked:only-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:insensitive:only-child, -.primary-toolbar .raised.linked .button:active:insensitive:last-child, -.primary-toolbar .raised.linked .button:active:insensitive:only-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:only-child, +.primary-toolbar .raised.linked .button:active *:insensitive:last-child, +.primary-toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:only-child, .toolbar .button:insensitive.raised.linked:last-child, .toolbar .button:insensitive.raised.linked:only-child, -.toolbar .button:active:insensitive.raised.linked:last-child, -.toolbar .button:active:insensitive.raised.linked:only-child { +.toolbar .button:active *:insensitive.raised.linked:last-child, +.toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .raised.linked .button:active *:insensitive:last-child, +.toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:insensitive:last-child, +.toolbar .linked .button:insensitive:only-child, +.toolbar .linked .button:active *:insensitive:last-child, +.toolbar .linked .button:active *:insensitive:only-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button:insensitive.raised.linked:last-child, +.header-bar .button:insensitive.raised.linked:only-child, +.header-bar .button:active *:insensitive.raised.linked:last-child, +.header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .raised.linked .button:active *:insensitive:last-child, +.header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:insensitive:only-child, +.header-bar .linked .button:active *:insensitive:last-child, +.header-bar .linked .button:active *:insensitive:only-child { box-shadow: none; } @@ -2157,7 +2376,17 @@ .primary-toolbar .raised.linked .button:active:last-child, .primary-toolbar .raised.linked .button:active:only-child, .toolbar .button:active.raised.linked:last-child, -.toolbar .button:active.raised.linked:only-child { +.toolbar .button:active.raised.linked:only-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:active:only-child, +.header-bar .button:active.raised.linked:last-child, +.header-bar .button:active.raised.linked:only-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:active:only-child { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2170,9 +2399,24 @@ .primary-toolbar .raised.linked .button, .primary-toolbar .raised.linked .button:active, .primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.linked, -.toolbar .button.linked:active, -.toolbar .button.linked:insensitive { +.toolbar .button.raised.linked, +.toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button, +.toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button, +.toolbar .linked .button:active, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked, +.header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:insensitive { border-width: 1px; border-radius: 0; border-right-width: 0; @@ -2186,9 +2430,24 @@ .primary-toolbar .raised.linked .button:first-child, .primary-toolbar .raised.linked .button:active:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, -.toolbar .button.linked:first-child, -.toolbar .button.linked:active:first-child, -.toolbar .button.linked:insensitive:first-child { +.toolbar .button.raised.linked:first-child, +.toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:insensitive:first-child, +.toolbar .raised.linked .button:first-child, +.toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:insensitive:first-child, +.toolbar .linked .button:first-child, +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:insensitive:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .button.raised.linked:active:first-child, +.header-bar .button.raised.linked:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:insensitive:first-child { border-width: 1px; border-radius: 2px; border-right-width: 0; @@ -2203,9 +2462,24 @@ .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:active:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:active:last-child, -.toolbar .button.linked:insensitive:last-child { +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:insensitive:last-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:insensitive:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:insensitive:last-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 2px; border-left-width: 0; @@ -2220,9 +2494,24 @@ .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:active:only-child, .primary-toolbar .raised.linked .button:insensitive:only-child, -.toolbar .button.linked:only-child, -.toolbar .button.linked:active:only-child, -.toolbar .button.linked:insensitive:only-child { +.toolbar .button.raised.linked:only-child, +.toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:insensitive:only-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:active:only-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:insensitive:only-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 2px; } @@ -2362,8 +2651,8 @@ background-image: none; } -.osd.button:active:insensitive, -.osd .button:active:insensitive { +.osd.button:active *:insensitive, +.osd .button:active *:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -2421,7 +2710,7 @@ background-image: none; } -.osd.toolbar .button:active:insensitive { +.osd.toolbar .button:active *:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; @@ -2544,14 +2833,14 @@ .osd .scrollbar.slider { border-width: 1px; - border-color: shade(@osd_bg, 0.8); + border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.21); border-radius: 0; - background-color: shade(@osd_bg, 0.9); + background-color: mix(@osd_base, @osd_fg, 0.21); } .osd .scrollbar.slider:hover { - border-color: shade(@osd_bg, 0.7); - background-color: shade(@osd_bg, 0.8); + border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.31); + background-color: mix(@osd_base, @osd_fg, 0.31); } .osd .scrollbar.slider:active { @@ -2578,6 +2867,35 @@ background-color: @osd_bg; } +/****************************** + * destructive action buttons * + ******************************/ +.destructive-action.button { + border-width: 1px; + border-style: solid; + border-color: shade(@error_color, 0.8); + border-radius: 2px; + background-color: @error_color; + background-image: none; + color: mix(@theme_selected_fg_color, @error_color, 0.1); +} + +.destructive-action.button:hover { + border-color: shade(@error_color, 0.7); + background-color: shade(@error_color, 1.12); + background-image: none; +} + +.destructive-action.button:active { + border-color: shade(@error_color, 0.8); + background-color: shade(@error_color, 0.87); + background-image: none; +} + +.destructive-action.button:hover:active { + border-color: shade(@error_color, 0.7); +} + /****************** * selection mode * ******************/ @@ -2603,7 +2921,7 @@ .selection-mode.header-bar .button, .selection-mode.toolbar .button, .selection-mode.toolbar GtkToolButton .button { - padding: 3px 2px; + padding: 3px; border-width: 1px; border-style: solid; border-color: @theme_selected_bg_color; @@ -2712,3 +3030,92 @@ GtkBubbleWindow .toolbar { background-color: transparent; } + +/******* + * CSD * + *******/ +.titlebar { + border-radius: 2px 2px 0 0; + background-image: none; + background-color: @toolbar_bg_color; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.1); + text-shadow: none; +} + +/* 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 .title { + font: bold; +} + +.titlebar:backdrop { + background-image: none; + background-color: @toolbar_bg_color; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.4); + text-shadow: none; +} + +.titlebar .titlebutton { + padding: 4px; + border-style: none; + background: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.1); + icon-shadow: none; +} + +.titlebar .titlebutton:hover, +.titlebar .titlebutton:hover:focus { + background: none; + color: @theme_selected_bg_color; +} + +.titlebar .titlebutton:active, +.titlebar .titlebutton:active:hover { + background: none; + color: shade(@theme_selected_bg_color, 0.9); + box-shadow: none; +} + +/* +.titlebar .right .titlebutton:first-child { + border-left: 1px solid shade(@toolbar_bg_color, 0.9); +} + +.titlebar .right .titlebutton:last-child { +} + +.titlebar .left .titlebutton:last-child { + border-right: 1px solid shade(@toolbar_bg_color, 0.9); +} + +.titlebar .left .titlebutton:first-child { +} +*/ + +.titlebar .titlebutton:backdrop { + background-image: none; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.4); + icon-shadow: none; +} + +.window-frame { + border-style: none; + border-radius: 2px 2px 0 0; + box-shadow: 0 3px 7px 1px alpha(black, 0.7), + 0 0 0 1px mix(shade(@toolbar_bg_color, 0.7), @toolbar_fg_color, 0.21); + + /* this is used for the resize cursor area */ + margin: 10px; +} + +.window-frame:backdrop { + box-shadow: 0 3px 5px 1px alpha(black, 0.5), + 0 0 0 1px mix(shade(@toolbar_bg_color, 0.7), @toolbar_fg_color, 0.12); +} diff -Nru shimmer-themes-1.6.1/numix/index.theme shimmer-themes-1.6.2/numix/index.theme --- shimmer-themes-1.6.1/numix/index.theme 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/index.theme 2013-09-17 04:29:50.000000000 -0400 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Numix -Comment=A flat and light theme with a modern look +Comment=A modern flat theme Encoding=UTF-8 [X-GNOME-Metatheme] Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/close_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/close_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/close_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/close_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/maximize_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/maximize_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/maximize_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/maximize_unfocused.png differ diff -Nru shimmer-themes-1.6.1/numix/metacity-1/metacity-theme-1.xml shimmer-themes-1.6.2/numix/metacity-1/metacity-theme-1.xml --- shimmer-themes-1.6.1/numix/metacity-1/metacity-theme-1.xml 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/metacity-1/metacity-theme-1.xml 1969-12-31 19:00:00.000000000 -0500 @@ -1,391 +0,0 @@ -<?xml version="1.0"?> -<metacity_theme> -<info> - <name>Numix</name> - <author>Satyajit Sahoo</author> - <copyright>GPL-3.0+</copyright> - <date>8 March 2013</date> - <description>Numix Metacity Theme</description> -</info> - -<!-- ::: GEOMETRY ::: --> -<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_titlebar_edge" value="4"/> - <distance name="right_titlebar_edge" value="4"/> - <distance name="title_vertical_pad" value="8"/> - <aspect_ratio name="button" value="1.0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<frame_geometry name="shaded" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"/> - -<frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <!-- strip frame spacing off the normal geometry when maximised --> - <distance name="left_width" value="0"/> - <distance name="right_width" value="0"/> - <distance name="bottom_height" value="0"/> -</frame_geometry> - -<frame_geometry name="utility" title_scale="small" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_titlebar_edge" value="4"/> - <distance name="right_titlebar_edge" value="4"/> - <distance name="title_vertical_pad" value="8"/> - <aspect_ratio name="button" value="1.0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<frame_geometry name="border" has_title="false"> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> - <distance name="button_width" value="0"/> - <distance name="button_height" value="0"/> - <distance name="title_vertical_pad" value="0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<!-- button minimum size --> -<constant name="Bmin" value="7"/> -<!-- button inside padding --> -<constant name="Bpad" value="6"/> - -<!-- ::: CORNERS OUTLINE::: --> -<draw_ops name="corners_outline"> -</draw_ops> - -<!-- ::: BORDER OUTLINE ::: --> -<draw_ops name="border_focused"> - <line color="#484848" x1="0" y1="0" x2="width" y2="0"/> - <line color="#484848" x1="0" y1="0" x2="0" y2="height"/> - <line color="#484848" x1="width-1" y1="0" x2="width-1" y2="height"/> - <line color="#484848" x1="0" y1="height-1" x2="width" y2="height-1"/> -</draw_ops> - -<draw_ops name="border_unfocused"> - <line color="#393939" x1="0" y1="0" x2="width" y2="0"/> - <line color="#393939" x1="0" y1="0" x2="0" y2="height"/> - <line color="#393939" x1="width-1" y1="0" x2="width-1" y2="height"/> - <line color="#393939" x1="0" y1="height-1" x2="width" y2="height-1"/> -</draw_ops> - -<!-- ::: TITLEBAR ::: --> -<draw_ops name="titlebar_gradient"> - <rectangle color="#2d2d2d" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="titlebar_gradient_unfocused"> - <rectangle color="#2d2d2d" x="0" y="0" width="width" height="height" filled="true" /> -</draw_ops> - -<draw_ops name="titlebar_maximized"> - <include name="titlebar_gradient"/> -</draw_ops> - -<draw_ops name="titlebar_maximized_unfocused"> - <include name="titlebar_gradient_unfocused"/> -</draw_ops> - -<draw_ops name="round_titlebar"> - <include name="titlebar_gradient"/> - <include name="border_focused"/> - <include name="corners_outline"/> -</draw_ops> - -<draw_ops name="round_titlebar_unfocused"> - <include name="titlebar_gradient_unfocused"/> - <include name="border_unfocused"/> - <include name="corners_outline"/> -</draw_ops> - -<draw_ops name="titlebar_shaded"> - <include name="border_focused"/> - <line color="#2d2d2d" x1="0" y1="height-1" x2="width" y2="height-1"/> -</draw_ops> - -<draw_ops name="round_titlebar_shaded"> - <include name="border_focused"/> - <include name="corners_outline"/> - <line color="#2d2d2d" x1="5" y1="height-1" x2="width-6" y2="height-1"/> -</draw_ops> - -<!-- ::: TITLES ::: --> -<draw_ops name="title"> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2))" - color="#dcdcdc" /> -</draw_ops> - -<draw_ops name="title_unfocused"> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2))" - color="#888888" /> -</draw_ops> - -<!-- ::: BUTTON ICONS ::: --> -<!-- close icon --> -<draw_ops name="close_button_normal"> - <image filename="close_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_button_prelight"> - <image filename="close_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_button_pressed"> - <image filename="close_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_button_unfocused"> - <image filename="close_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- maximize icon --> -<draw_ops name="maximize_button_normal"> - <image filename="maximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_button_prelight"> - <image filename="maximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_button_pressed"> - <image filename="maximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_button_unfocused"> - <image filename="maximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- unmaximize icon --> -<draw_ops name="unmaximize_button_normal"> - <image filename="unmaximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_button_prelight"> - <image filename="unmaximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_button_pressed"> - <image filename="unmaximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_button_unfocused"> - <image filename="unmaximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- minimize icon --> -<draw_ops name="minimize_button_normal"> - <image filename="minimize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_button_prelight"> - <image filename="minimize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_button_pressed"> - <image filename="minimize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_button_unfocused"> - <image filename="minimize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- menu icon --> -<draw_ops name="menu_button"></draw_ops> - -<!-- :: BLANK :: --> -<draw_ops name="blank"></draw_ops> - -<!-- ::: FRAME STYLES ::: --> -<frame_style name="normal" geometry="normal"> - <piece position="entire_background" draw_ops="round_titlebar_unfocused"/> - <piece position="title" draw_ops="title_unfocused"/> - <button function="close" state="normal" draw_ops="close_button_unfocused"/> - <button function="close" state="pressed" draw_ops="close_button_pressed"/> - <button function="close" state="prelight" draw_ops="close_button_prelight"/> - <button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/> - <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/> - <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/> - <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/> - <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/> - <button function="menu" state="normal" draw_ops="menu_button"/> - <button function="menu" state="pressed" draw_ops="menu_button"/> - <button function="menu" state="prelight" draw_ops="menu_button"/> -</frame_style> - -<frame_style name="normal_shaded" geometry="shaded" parent="normal"> - <piece position="entire_background" draw_ops="round_titlebar"/> -</frame_style> - -<frame_style name="focused" geometry="normal" parent="normal"> - <piece position="entire_background" draw_ops="round_titlebar"/> - <piece position="title" draw_ops="title"/> - <button function="close" state="normal" draw_ops="close_button_normal"/> - <button function="close" state="pressed" draw_ops="close_button_pressed"/> - <button function="close" state="prelight" draw_ops="close_button_prelight"/> - <button function="maximize" state="normal" draw_ops="maximize_button_normal"/> - <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/> - <button function="minimize" state="normal" draw_ops="minimize_button_normal"/> - <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/> - <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/> - <button function="menu" state="normal" draw_ops="menu_button"/> - <button function="menu" state="pressed" draw_ops="menu_button"/> - <button function="menu" state="prelight" draw_ops="menu_button"/> -</frame_style> - -<frame_style name="focused_shaded" geometry="shaded" parent="focused"> - <piece position="entire_background" draw_ops="round_titlebar_shaded"/> -</frame_style> - -<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal"> - <piece position="entire_background" draw_ops="titlebar_maximized_unfocused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_button_unfocused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_button_prelight"/> -</frame_style> - -<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused"> - <piece position="entire_background" draw_ops="titlebar_maximized"/> - <button function="maximize" state="normal" draw_ops="unmaximize_button_normal"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_button_prelight"/> -</frame_style> - -<frame_style name="border" geometry="border" parent="normal"> - <piece position="entire_background" draw_ops="border_focused"/> - <piece position="title" draw_ops="blank"/> -</frame_style> - -<frame_style name="utility_normal" geometry="utility" parent="normal"></frame_style> - -<frame_style name="utility_focused" geometry="utility" parent="focused"></frame_style> - -<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded"> - <piece position="entire_background" draw_ops="titlebar_shaded"/> -</frame_style> - -<frame_style_set name="normal"> - <frame focus="yes" state="normal" resize="both" style="focused"/> - <frame focus="no" state="normal" resize="both" style="normal"/> - <frame focus="yes" state="maximized" style="focused_maximized"/> - <frame focus="no" state="maximized" style="normal_maximized"/> - <frame focus="yes" state="shaded" style="focused_shaded"/> - <frame focus="no" state="shaded" style="normal_shaded"/> - <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/> - <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/> -</frame_style_set> - -<frame_style_set name="utility" parent="normal"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_normal"/> - <!-- this is a bunch of crap since utility windows shouldn't be maximized --> - <frame focus="yes" state="maximized" style="focused"/> - <frame focus="no" state="maximized" style="normal"/> - <frame focus="yes" state="shaded" style="utility_focused_shaded"/> - <frame focus="no" state="shaded" style="utility_normal"/> - <frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/> - <frame focus="no" state="maximized_and_shaded" style="normal"/> -</frame_style_set> - -<frame_style_set name="border"> - <frame focus="yes" state="normal" resize="both" style="border"/> - <frame focus="no" state="normal" resize="both" style="border"/> - <frame focus="yes" state="maximized" style="border"/> - <frame focus="no" state="maximized" style="border"/> - <frame focus="yes" state="shaded" style="border"/> - <frame focus="no" state="shaded" style="border"/> - <frame focus="yes" state="maximized_and_shaded" style="border"/> - <frame focus="no" state="maximized_and_shaded" style="border"/> -</frame_style_set> - -<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/> -<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> -<menu_icon function="unmaximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> -<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/> - -<!-- ::: WINDOWS ::: --> -<window type="normal" style_set="normal"/> -<window type="dialog" style_set="normal"/> -<window type="modal_dialog" style_set="normal"/> -<window type="menu" style_set="normal"/> -<window type="utility" style_set="utility"/> -<window type="border" style_set="border"/> - -</metacity_theme> diff -Nru shimmer-themes-1.6.1/numix/metacity-1/metacity-theme-2.xml shimmer-themes-1.6.2/numix/metacity-1/metacity-theme-2.xml --- shimmer-themes-1.6.1/numix/metacity-1/metacity-theme-2.xml 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/metacity-1/metacity-theme-2.xml 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,1116 @@ +<?xml version="1.0"?> +<metacity_theme> +<info> + <name>Numix</name> + <author>Satyajit Sahoo</author> + <copyright>GPL-3.0+</copyright> + <date>4 August 2013</date> + <description>Numix Metacity Theme</description> +</info> + +<!-- ::: CONSTANTS ::: --> +<constant name="C_titlebar" value="#2d2d2d" /> +<constant name="C_border_focused" value="#484848" /> +<constant name="C_border_unfocused" value="#393939" /> +<constant name="C_title_focused" value="#dcdcdc" /> +<constant name="C_title_unfocused" value="#888888" /> + +<!-- ::: GEOMETRY ::: --> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1"> + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="left_titlebar_edge" value="4" /> + <distance name="right_titlebar_edge" value="4" /> + <distance name="title_vertical_pad" value="0" /> + <aspect_ratio name="button" value="1.0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal" /> + +<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> +</frame_geometry> + +<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="right_width" value="1" /> +</frame_geometry> + +<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="left_width" value="1" /> +</frame_geometry> + +<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="1" rounded_top_right="1"> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="small_unfocused" parent="small"> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> +</frame_geometry> + +<frame_geometry name="nobuttons" hide_buttons="true" parent="normal" /> + +<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> +</frame_geometry> + +<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_right="1" rounded_bottom_left="1" parent="small"> +</frame_geometry> + +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> +</frame_geometry> + +<!-- ::: TITLES ::: --> +<draw_ops name="title_focused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_focused" /> +</draw_ops> + +<draw_ops name="title_unfocused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_unfocused" /> +</draw_ops> + +<!-- ::: WINDOW DECORATIONS ::: --> +<draw_ops name="entire_background_focused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="entire_background_unfocused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_focused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="titlebar_fill_attached_focused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_unfocused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="titlebar_focused"> + <include name="titlebar_fill_focused" /> +</draw_ops> + +<draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs --> + <include name="titlebar_fill_attached_focused" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused"> + <include name="titlebar_fill_focused" /> +</draw_ops> + +<draw_ops name="border_focused"> + <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="border_unfocused"> + <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_focused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_unfocused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="3" height="3" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-3" y="0" width="2" height="3" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="border_right_focused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_right_unfocused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<draw_ops name="border_left_focused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_left_unfocused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<!-- ::: BUTTON ICONS ::: --> +<!-- note: negative values in x or y causes gnome-shell to crash --> +<!-- close icon --> +<draw_ops name="close_focused"> + <image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_focused_prelight"> + <image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_focused_pressed"> + <image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_unfocused"> + <image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_unfocused_prelight"> + <include name="close_focused_prelight" /> +</draw_ops> + +<draw_ops name="close_unfocused_pressed"> + <include name="close_focused_pressed" /> +</draw_ops> + +<!-- maximize icon --> +<draw_ops name="maximize_focused"> + <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_focused_prelight"> + <image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_focused_pressed"> + <image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_unfocused"> + <image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_prelight"> + <include name="maximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_pressed"> + <include name="maximize_focused_pressed" /> +</draw_ops> + +<!-- unmaximize icon --> +<draw_ops name="unmaximize_focused"> + <image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_prelight"> + <image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_pressed"> + <image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused"> + <image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_prelight"> + <include name="unmaximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_pressed"> + <include name="unmaximize_focused_pressed" /> +</draw_ops> + +<!-- minimize icon --> +<draw_ops name="minimize_focused"> + <image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_focused_prelight"> + <image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_focused_pressed"> + <image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_unfocused"> + <image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_prelight"> + <include name="minimize_focused_prelight" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_pressed"> + <include name="minimize_focused_pressed" /> +</draw_ops> + +<!-- menu icon --> +<draw_ops name="menu_focused"></draw_ops> + +<draw_ops name="menu_focused_prelight"></draw_ops> + +<draw_ops name="menu_focused_pressed"></draw_ops> + +<draw_ops name="menu_unfocused"></draw_ops> + +<draw_ops name="menu_unfocused_prelight"></draw_ops> + +<draw_ops name="menu_unfocused_pressed"></draw_ops> + +<!-- shade icon --> +<draw_ops name="shade_focused"> + <image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_focused_prelight"> + <image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_focused_pressed"> + <image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_unfocused"> + <image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_unfocused_prelight"> + <include name="shade_focused_prelight" /> +</draw_ops> + +<draw_ops name="shade_unfocused_pressed"> + <include name="shade_focused_pressed" /> +</draw_ops> + +<!-- unshade icon --> +<draw_ops name="unshade_focused"> + <image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_focused_prelight"> + <image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_focused_pressed"> + <image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_unfocused"> + <image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_prelight"> + <include name="unshade_focused_prelight" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_pressed"> + <include name="unshade_focused_pressed" /> +</draw_ops> + +<!-- ::: FRAME STYLES ::: --> +<frame_style name="normal_focused" geometry="normal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_unfocused" geometry="normal_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_focused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_unfocused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_focused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_unfocused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_focused" geometry="small"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_unfocused" geometry="small_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_focused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_unfocused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="borderless" geometry="borderless"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_focused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_unfocused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_focused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_right_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_unfocused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_right_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_focused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_left_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_unfocused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_left_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- placeholder for unimplementated styles--> +<frame_style name="blank" geometry="normal"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- ::: FRAME STYLE SETS ::: --> +<frame_style_set name="normal_style_set"> + <frame focus="yes" state="normal" resize="both" style="normal_focused" /> + <frame focus="no" state="normal" resize="both" style="normal_unfocused" /> + <frame focus="yes" state="maximized" style="normal_max_focused" /> + <frame focus="no" state="maximized" style="normal_max_unfocused" /> + <frame focus="yes" state="shaded" style="normal_focused" /> + <frame focus="no" state="shaded" style="normal_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused" /> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused" /> +</frame_style_set> + +<frame_style_set name="dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="dialog_focused" /> + <frame focus="no" state="shaded" style="dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="modal_dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="modal_dialog_focused" /> + <frame focus="no" state="shaded" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="utility_style_set"> + <frame focus="yes" state="normal" resize="both" style="utility_focused" /> + <frame focus="no" state="normal" resize="both" style="utility_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="utility_focused" /> + <frame focus="no" state="shaded" style="utility_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="border_style_set"> + <frame focus="yes" state="normal" resize="both" style="border_focused" /> + <frame focus="no" state="normal" resize="both" style="border_unfocused" /> + <frame focus="yes" state="maximized" style="borderless" /> + <frame focus="no" state="maximized" style="borderless" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<!-- ::: WINDOWS ::: --> +<window type="normal" style_set="normal_style_set" /> +<window type="dialog" style_set="dialog_style_set" /> +<window type="modal_dialog" style_set="modal_dialog_style_set" /> +<window type="menu" style_set="utility_style_set" /> +<window type="utility" style_set="utility_style_set" /> +<window type="border" style_set="border_style_set" /> + +</metacity_theme> diff -Nru shimmer-themes-1.6.1/numix/metacity-1/metacity-theme-3.xml shimmer-themes-1.6.2/numix/metacity-1/metacity-theme-3.xml --- shimmer-themes-1.6.1/numix/metacity-1/metacity-theme-3.xml 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/metacity-1/metacity-theme-3.xml 2013-09-17 04:29:50.000000000 -0400 @@ -9,10 +9,11 @@ </info> <!-- ::: CONSTANTS ::: --> +<constant name="C_titlebar" value="gtk:custom(wm_bg,#2d2d2d)" /> <constant name="C_border_focused" value="gtk:custom(wm_border_focused,#484848)" /> <constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,#393939)" /> <constant name="C_title_focused" value="gtk:custom(wm_title_focused,#dcdcdc)" /> -<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,#393939)" /> +<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,#888888)" /> <!-- ::: GEOMETRY ::: --> <frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1"> @@ -21,9 +22,9 @@ <distance name="bottom_height" value="1" /> <distance name="left_titlebar_edge" value="4" /> <distance name="right_titlebar_edge" value="4" /> - <distance name="title_vertical_pad" value="8" /> + <distance name="title_vertical_pad" value="0" /> <aspect_ratio name="button" value="1.0" /> - <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> @@ -43,9 +44,9 @@ <distance name="left_width" value="1" /> </frame_geometry> -<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="title_vertical_pad" value="8" /> - <border name="title_border" left="0" right="0" top="0" bottom="0" /> +<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="1" rounded_top_right="1"> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> @@ -60,9 +61,9 @@ <distance name="left_width" value="1" /> <distance name="right_width" value="1" /> <distance name="bottom_height" value="1" /> + <distance name="title_vertical_pad" value="0" /> <border name="title_border" left="0" right="0" top="0" bottom="0" /> <border name="button_border" left="0" right="0" top="0" bottom="0"/> - <distance name="title_vertical_pad" value="0" /> </frame_geometry> <frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> @@ -74,12 +75,10 @@ <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_right="2" rounded_bottom_left="2" parent="small"> - <distance name="title_vertical_pad" value="0" /> +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" rounded_bottom_right="1" rounded_bottom_left="1" parent="small"> </frame_geometry> -<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small"> - <distance name="title_vertical_pad" value="0" /> +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small"> </frame_geometry> <!-- ::: TITLES ::: --> @@ -109,7 +108,7 @@ <!-- ::: WINDOW DECORATIONS ::: --> <draw_ops name="entire_background_focused"> - <rectangle color="gtk:custom(wm_bg,#2d2d2d)" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="entire_background_unfocused"> @@ -117,7 +116,7 @@ </draw_ops> <draw_ops name="titlebar_fill_focused"> - <rectangle color="gtk:custom(wm_bg,#2d2d2d)" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="titlebar_fill_attached_focused"> @@ -125,7 +124,7 @@ </draw_ops> <draw_ops name="titlebar_fill_unfocused"> - <rectangle color="gtk:custom(wm_bg,#2d2d2d)" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="titlebar_focused"> @@ -317,15 +316,19 @@ <!-- shade icon --> <draw_ops name="shade_focused"> + <image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_focused_prelight"> + <image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_focused_pressed"> + <image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused"> + <image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused_prelight"> @@ -338,15 +341,19 @@ <!-- unshade icon --> <draw_ops name="unshade_focused"> + <image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_focused_prelight"> + <image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_focused_pressed"> + <image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused"> + <image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused_prelight"> Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/minimize_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/minimize_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/minimize_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/minimize_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/shade_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/shade_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/shade_focused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/shade_focused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/shade_focused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/shade_focused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/shade_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/shade_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/unmaximize_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/unmaximize_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/unmaximize_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/unmaximize_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/unshade_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/unshade_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/unshade_focused_prelight.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/unshade_focused_prelight.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/unshade_focused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/unshade_focused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/metacity-1/unshade_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/metacity-1/unshade_unfocused.png differ diff -Nru shimmer-themes-1.6.1/numix/openbox-3/shade_toggled.xbm shimmer-themes-1.6.2/numix/openbox-3/shade_toggled.xbm --- shimmer-themes-1.6.1/numix/openbox-3/shade_toggled.xbm 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/openbox-3/shade_toggled.xbm 2013-09-17 04:29:50.000000000 -0400 @@ -1,4 +1,4 @@ #define shade_toggled_width 8 #define shade_toggled_height 8 static unsigned char shade_toggled_bits[] = { - 0x18, 0x18, 0x18, 0x18, 0xff, 0x7e, 0x3c, 0x18 }; + 0x18, 0x18, 0x18, 0xdb, 0xff, 0x7e, 0x3c, 0x18 }; diff -Nru shimmer-themes-1.6.1/numix/openbox-3/shade.xbm shimmer-themes-1.6.2/numix/openbox-3/shade.xbm --- shimmer-themes-1.6.1/numix/openbox-3/shade.xbm 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/openbox-3/shade.xbm 2013-09-17 04:29:50.000000000 -0400 @@ -1,4 +1,4 @@ #define shade_width 8 #define shade_height 8 static unsigned char shade_bits[] = { - 0x18, 0x3c, 0x7e, 0xff, 0x18, 0x18, 0x18, 0x18 }; + 0x18, 0x3c, 0x7e, 0xff, 0xdb, 0x18, 0x18, 0x18 }; diff -Nru shimmer-themes-1.6.1/numix/openbox-3/themerc shimmer-themes-1.6.2/numix/openbox-3/themerc --- shimmer-themes-1.6.1/numix/openbox-3/themerc 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/openbox-3/themerc 2013-09-17 04:29:50.000000000 -0400 @@ -88,14 +88,13 @@ # OSD osd.border.width: 1 -osd.border.color: #2d2d2d +osd.border.color: #484848 osd.bg: flat solid -osd.bg.color: #dedede - +osd.bg.color: #2d2d2d osd.label.bg: flat solid -osd.label.bg.color: #dedede -osd.label.text.color: #555555 +osd.label.bg.color: #2d2d2d +osd.label.text.color: #dcdcdc osd.hilight.bg: flat solid osd.hilight.bg.color: #d64937 @@ -103,17 +102,17 @@ osd.unhilight.bg: flat solid osd.unhilight.bg.color: #888888 -osd.button.unpressed.bg: flat border -osd.button.unpressed.bg.color: #f0f0f0 -osd.button.unpressed.*.border.color: #b2b2b2 - -osd.button.pressed.bg: flat border -osd.button.pressed.bg.color: #d3d3d3 -osd.button.pressed.*.border.color: #b2b2b2 - -osd.button.focused.bg: flat solid border -osd.button.focused.bg.color: #f0f0f0 -osd.button.focused.*.border.color: #9c9c9c +osd.button.unpressed.bg: flat border +osd.button.unpressed.bg.color: #303030 +osd.button.unpressed.*.border.color: #242424 + +osd.button.pressed.bg: flat border +osd.button.pressed.bg.color: #2a2a2a +osd.button.pressed.*.border.color: #242424 + +osd.button.focused.bg: flat solid border +osd.button.focused.bg.color: #303030 +osd.button.focused.*.border.color: #1e1e1e osd.button.focused.box.color: #d64937 diff -Nru shimmer-themes-1.6.1/numix/README shimmer-themes-1.6.2/numix/README --- shimmer-themes-1.6.1/numix/README 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/README 1969-12-31 19:00:00.000000000 -0500 @@ -1,24 +0,0 @@ -Numix is a modern flat theme with a combination of light and dark elements. It supports Gnome, Unity, XFCE and Openbox. The theme is compatible with GTK 3.6 and 3.8. It also includes a GTK 2.0 theme using Murrine engine. - ---- - -Ubuntu users can install Numix from our themes PPA using the following commands, - -sudo add-apt-repository ppa:satyajit-happy/themes -sudo apt-get update && sudo apt-get install numix-gtk-theme - ---- - -Installation Instructions for other distros: - -Extract the zip file to the themes directory i.e. "/usr/share/themes/" - -Use Gnome Tweak tool to choose the theme, or run the following commands in Terminal, - -gsettings set org.gnome.desktop.interface gtk-theme "Numix" - -gsettings set org.gnome.desktop.wm.preferences theme "Numix" - ---- - -License: GPL-3.0+ diff -Nru shimmer-themes-1.6.1/numix/README.md shimmer-themes-1.6.2/numix/README.md --- shimmer-themes-1.6.1/numix/README.md 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/README.md 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,31 @@ +Numix is a modern flat theme with a combination of light and dark elements. It supports Gnome, Unity, XFCE and Openbox. + +### Manual installation + +Extract the zip file to the themes directory i.e. `/usr/share/themes/` + +To set the theme in Gnome, run the following commands in Terminal, + +``` +gsettings set org.gnome.desktop.interface gtk-theme "Numix" +gsettings set org.gnome.desktop.wm.preferences theme "Numix" +``` + +To set the theme in Xfce, run the following commands in Terminal, + +``` +xfconf-query -c xsettings -p /Net/ThemeName -s "Numix" +xfconf-query -c xfwm4 -p /general/theme -s "Numix" +``` + +### Requirements + +GTK+ 3.6 or above + +Murrine theme engine + +### Code and license + +Report bugs or contribute at [GitHub](https://github.com/shimmerproject/Numix) + +License: GPL-3.0+ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/close_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/close_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/close.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/close.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/close_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/close_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/close_unfocused_pressed.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/close_unfocused_pressed.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/maximize_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/maximize_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/maximize.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/maximize.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/maximize_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/maximize_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/minimized.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/minimized.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/minimize_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/minimize_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/minimize_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/minimize_unfocused.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/unmaximize_focused_normal.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/unmaximize_focused_normal.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/unmaximize.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/unmaximize.png differ Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/numix/unity/unmaximize_unfocused.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/numix/unity/unmaximize_unfocused.png differ diff -Nru shimmer-themes-1.6.1/numix/xfwm4/close-inactive.xpm shimmer-themes-1.6.2/numix/xfwm4/close-inactive.xpm --- shimmer-themes-1.6.1/numix/xfwm4/close-inactive.xpm 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/xfwm4/close-inactive.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -1,23 +1,22 @@ /* XPM */ static char * close_inactive_xpm[] = { -"16 16 17 1", +"16 16 16 1", " c None", ". c #2D2D2D", -"+ c #ADA9A8", -"@ c #848181", +"+ c #AAAAAA", +"@ c #828282", "# c #3A3A3A", -"$ c #858383", -"% c #A5A1A0", -"& c #484747", +"$ c #848484", +"% c #A2A2A2", +"& c #474747", "* c #3B3B3B", -"= c #A6A3A2", -"- c #A39F9D", -"; c #4C4B4B", -"> c #A29F9E", -", c #A3A09F", -"' c #474646", -") c #83807F", -"! c #383838", +"= c #A4A4A4", +"- c #A0A0A0", +"; c #4B4B4B", +"> c #A1A1A1", +", c #464646", +"' c #818181", +") c #383838", "................", "................", "................", @@ -27,9 +26,9 @@ "....*=+--+%#....", ".....;=++-&.....", ".....;=++-&.....", -"....*=+>>+%#....", -"....$+,'',+@....", -"....+)!..!)+....", +"....*=+--+%#....", +"....$+>,,>+@....", +"....+')..)'+....", "................", "................", "................", diff -Nru shimmer-themes-1.6.1/numix/xfwm4/hide-inactive.xpm shimmer-themes-1.6.2/numix/xfwm4/hide-inactive.xpm --- shimmer-themes-1.6.1/numix/xfwm4/hide-inactive.xpm 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/xfwm4/hide-inactive.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -3,7 +3,7 @@ "16 16 3 1", " c None", ". c #2D2D2D", -"+ c #ADA9A8", +"+ c #AAAAAA", "................", "................", "................", diff -Nru shimmer-themes-1.6.1/numix/xfwm4/maximize-inactive.xpm shimmer-themes-1.6.2/numix/xfwm4/maximize-inactive.xpm --- shimmer-themes-1.6.1/numix/xfwm4/maximize-inactive.xpm 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/xfwm4/maximize-inactive.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -3,7 +3,7 @@ "16 16 3 1", " c None", ". c #2D2D2D", -"+ c #ADA9A8", +"+ c #AAAAAA", "................", "................", "................", diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-active.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-active.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-active.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-active.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_active_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #DBDBDB", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-inactive.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-inactive.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-inactive.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-inactive.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_inactive_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #AAAAAA", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-prelight.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-prelight.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-prelight.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-prelight.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_prelight_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #D64937", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-pressed.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-pressed.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-pressed.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-pressed.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_pressed_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #B44335", +"................", +"................", +"................", +"................", +".......++.......", +"......++++......", +".....++++++.....", +"....++++++++....", +"...+++.++.+++...", +".......++.......", +".......++.......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-active.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-active.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-active.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-active.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_active_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #DBDBDB", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-inactive.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-inactive.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-inactive.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-inactive.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_inactive_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #AAAAAA", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-prelight.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-prelight.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-prelight.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-prelight.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_prelight_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #D64937", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-pressed.xpm shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-pressed.xpm --- shimmer-themes-1.6.1/numix/xfwm4/shade-toggled-pressed.xpm 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/numix/xfwm4/shade-toggled-pressed.xpm 2013-09-17 04:29:50.000000000 -0400 @@ -0,0 +1,22 @@ +/* XPM */ +static char * shade_toggled_pressed_xpm[] = { +"16 16 3 1", +" c None", +". c #2D2D2D", +"+ c #B44335", +"................", +"................", +"................", +"................", +".......++.......", +".......++.......", +".......++.......", +"...+++.++.+++...", +"....++++++++....", +".....++++++.....", +"......++++......", +".......++.......", +"................", +"................", +"................", +"................"}; diff -Nru shimmer-themes-1.6.1/numix/xfwm4/themerc shimmer-themes-1.6.2/numix/xfwm4/themerc --- shimmer-themes-1.6.1/numix/xfwm4/themerc 2013-07-20 02:10:18.000000000 -0400 +++ shimmer-themes-1.6.2/numix/xfwm4/themerc 2013-09-17 04:29:50.000000000 -0400 @@ -4,11 +4,11 @@ active_text_color=#dcdcdc inactive_text_color=#888888 -button_offset=4 -button_spacing=4 +button_offset=6 +button_spacing=6 show_app_icon=true full_width_title=true -maximized_offset=4 +maximized_offset=6 title_horizontal_offset=6 title_shadow_active=false title_shadow_inactive=false diff -Nru shimmer-themes-1.6.1/orion/gtk-2.0/gtkrc shimmer-themes-1.6.2/orion/gtk-2.0/gtkrc --- shimmer-themes-1.6.1/orion/gtk-2.0/gtkrc 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/gtk-2.0/gtkrc 2013-09-14 14:35:27.000000000 -0400 @@ -4,10 +4,6 @@ gtk-color-scheme = "base_color:#fff\nfg_color:#555\ntooltip_fg_color:#fff\nselected_bg_color:#569be4\nselected_fg_color:#fff\ntext_color:#333\nbg_color:#eee\ntooltip_bg_color:#000\nlink_color:#569be4" -gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16" - -gtk-auto-mnemonics = 1 - style "default" { xthickness = 1 ythickness = 1 @@ -149,7 +145,7 @@ style "hscale" { } -style "button" = "wide" { +style "button" = "wider" { bg[NORMAL] = @bg_color bg[PRELIGHT] = shade (1.04, @bg_color) bg[ACTIVE] = shade (0.9, @bg_color) @@ -619,7 +615,10 @@ widget_class "*<GtkNotebook>*<GtkLayout>" style "notebook_bg" widget_class "*<GtkNotebook>*<GtkLabel>" style "notebook_bg" -widget_class "*<GtkToolbar>*" style "toolbar" +class "GtkToolbar" style "toolbar" +class "GtkHandleBox" style "toolbar" +widget_class "*Toolbar*.*Separator*" style "toolbar" + widget_class "*<GtkScrolledWindow>*" style "scrolledwindow" widget_class "*<GtkButton>" style "button" diff -Nru shimmer-themes-1.6.1/orion/gtk-3.0/apps/gnome-applications.css shimmer-themes-1.6.2/orion/gtk-3.0/apps/gnome-applications.css --- shimmer-themes-1.6.1/orion/gtk-3.0/apps/gnome-applications.css 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/gtk-3.0/apps/gnome-applications.css 2013-09-14 14:35:27.000000000 -0400 @@ -5,9 +5,10 @@ PanelApplet, PanelToplevel { padding: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.1)), - to (shade(@panel_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); color: @panel_fg_color; } @@ -18,9 +19,10 @@ PanelSeparator { border-width: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.1)), - to (shade(@panel_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); color: @panel_fg_color; } @@ -33,17 +35,19 @@ -PanelMenuBar-icon-visible: true; border-width: 0; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.1)), - to (shade(@panel_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); } PanelAppletFrame { border-width: 0; - background-color: @panel_bg_color; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.1)), - to (shade(@panel_bg_color, 0.9))); + background-color: @panel_bg_color; + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); } PanelApplet .button { @@ -52,9 +56,10 @@ border-width: 0 1px; border-radius: 0; border-color: transparent; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.1)), - to (shade(@panel_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); color: @panel_fg_color; } @@ -63,23 +68,26 @@ border-width: 0 1px; border-radius: 0; border-color: shade(@panel_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@panel_bg_color, 1.02), 0.9)), - to (shade(shade(@panel_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@panel_bg_color, 1.02), 0.9), + shade(shade(@panel_bg_color, 1.02), 0.95) + ); } PanelApplet .button:prelight { border-color: transparent; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.2)), - to (shade(@panel_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.2), + shade(@panel_bg_color, 1.0) + ); } PanelApplet .button:active:prelight { border-color: shade(@panel_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@panel_bg_color, 1.02), 1.0)), - to (shade(shade(@panel_bg_color, 1.02), 1.05))); + background-image: linear-gradient(to bottom, + shade(shade(@panel_bg_color, 1.02), 1.0), + shade(shade(@panel_bg_color, 1.02), 1.05) + ); } WnckPager, WnckTasklist { @@ -94,8 +102,8 @@ } .nautilus-desktop.nautilus-canvas-item { - color: #fff; - text-shadow: 1px 1px #000; + color: white; + text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:active { @@ -112,44 +120,42 @@ text-shadow: none; } -NautilusWindow .sidebar .frame { - border-width: 1px 0 0 0; +NautilusWindow .toolbar { + border-width: 0 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; + border-color: shade(@toolbar_bg_color, 0.8); +} + +NautilusWindow .sidebar .frame { + border-style: none; } NautilusWindow > GtkGrid > .pane-separator, NautilusWindow > GtkGrid > .pane-separator:hover { - border-width: 1px 1px 0 0; + border-width: 0 1px 0 0; border-style: solid; border-color: shade(@theme_bg_color, 0.8); background-color: @theme_bg_color; } -NautilusView.frame, NautilusNotebook.notebook { border-right-width: 0; - border-bottom-width: 0; border-left-width: 0; + border-bottom-width: 0; } NautilusNotebook .frame { - border-width: 1px 0 0 0; + border-width: 0; } NautilusQueryEditor .primary-toolbar.toolbar { - padding: 4px; - border-top-width: 1px; + border-top-width: 0; border-bottom-width: 0; } -NautilusQueryEditor .primary-toolbar.toolbar .button { - padding: 0; -} - NautilusQueryEditor .toolbar { - padding: 4px 4px 3px 4px; + padding-top: 3px; + padding-bottom: 2px; border-width: 1px 0 0 0; border-style: solid; border-color: @toolbar_bg_color; @@ -160,20 +166,12 @@ border-color: shade(@toolbar_bg_color, 0.8); } -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar { - border-top-width: 0; -} - -NautilusNotebook.notebook NautilusQueryEditor .toolbar:last-child, -NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-child { +NautilusQueryEditor .toolbar:last-child, +NautilusQueryEditor .primary-toolbar.toolbar:only-child { border-bottom-width: 1px; border-bottom-color: shade(@toolbar_bg_color, 0.8); } -.toolbar NautilusPathBar .button { - padding: 1px 5px; -} - /****************** * gnome terminal * ******************/ diff -Nru shimmer-themes-1.6.1/orion/gtk-3.0/apps/unity.css shimmer-themes-1.6.2/orion/gtk-3.0/apps/unity.css --- shimmer-themes-1.6.1/orion/gtk-3.0/apps/unity.css 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/gtk-3.0/apps/unity.css 2013-09-14 14:35:27.000000000 -0400 @@ -3,9 +3,10 @@ border-width: 0 0 1px 0; border-style: solid; border-color: shade(@panel_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@panel_bg_color, 1.1)), - to (shade(@panel_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); color: @panel_fg_color; } @@ -23,9 +24,10 @@ .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-color: shade(@panel_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@panel_bg_color, 1.02), 0.9)), - to (shade(shade(@panel_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@panel_bg_color, 1.02), 0.9), + shade(shade(@panel_bg_color, 1.02), 0.95) + ); color: @panel_fg_color; -} \ No newline at end of file +} diff -Nru shimmer-themes-1.6.1/orion/gtk-3.0/apps/xfce.css shimmer-themes-1.6.2/orion/gtk-3.0/apps/xfce.css --- shimmer-themes-1.6.1/orion/gtk-3.0/apps/xfce.css 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/orion/gtk-3.0/apps/xfce.css 2013-09-14 14:35:27.000000000 -0400 @@ -0,0 +1,62 @@ +XfceHeading { + background-color: @theme_base_color; + background-image: none; + padding: 0; + border-width: 0; +} + +.xfce4-panel { + background-image: linear-gradient(to bottom, + shade(@panel_bg_color, 1.1), + shade(@panel_bg_color, 0.9) + ); +} + +.xfce4-panel .button { + border-radius: 0; + padding: 1px; + color: @panel_fg_color; +} + +.xfce4-panel .button:active { + border-width: 0 1px; + border-radius: 0; + border-color: shade(@panel_bg_color, 0.8); + background-image: linear-gradient(to bottom, + shade(shade(@panel_bg_color, 1.02), 0.9), + shade(shade(@panel_bg_color, 1.02), 0.95) + ); +} + +.xfce4-panel .button:hover, +.xfce4-panel .button:active:hover { + border-color: shade(@panel_bg_color, 0.8); + background-image: linear-gradient(to bottom, + shade(shade(@panel_bg_color, 1.02), 1.0), + shade(shade(@panel_bg_color, 1.02), 1.05) + ); +} + +/* menu-styling, e.g. for indicators */ +.xfce4-panel .menu, +.xfce4-panel .menu GtkLabel, +.xfce4-panel .menu GtkImage { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + +.xfce4-panel .menu *:hover { + border-color: shade(@theme_selected_bg_color, 0.9); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); + + color: @theme_selected_fg_color; +} + +.xfce4-panel .menu GtkLabel:hover, +.xfce4-panel .menu GtkImage:hover { + background-image: none; + color: @theme_selected_fg_color; +} diff -Nru shimmer-themes-1.6.1/orion/gtk-3.0/gtk.css shimmer-themes-1.6.2/orion/gtk-3.0/gtk.css --- shimmer-themes-1.6.1/orion/gtk-3.0/gtk.css 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/gtk-3.0/gtk.css 2013-09-14 14:35:27.000000000 -0400 @@ -56,7 +56,8 @@ @define-color backdrop_selected_fg_color @theme_fg_color; /* window manager colors */ -@define-color wm_bg @theme_bg_color; +@define-color wm_bg_a shade(@theme_bg_color, 1.05); +@define-color wm_bg_b @theme_bg_color; @define-color wm_title_focused mix(@theme_fg_color, @theme_bg_color, 0.1); @define-color wm_title_unfocused mix(@theme_fg_color, @theme_bg_color, 0.6); @define-color wm_border_focused shade(@theme_bg_color, 0.7); @@ -66,3 +67,4 @@ @import url("gtk-widgets-assets.css"); @import url("apps/gnome-applications.css"); @import url("apps/unity.css"); +@import url("apps/xfce.css"); diff -Nru shimmer-themes-1.6.1/orion/gtk-3.0/gtk-widgets.css shimmer-themes-1.6.2/orion/gtk-3.0/gtk-widgets.css --- shimmer-themes-1.6.1/orion/gtk-3.0/gtk-widgets.css 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/gtk-3.0/gtk-widgets.css 2013-09-14 14:35:27.000000000 -0400 @@ -88,6 +88,15 @@ color: mix(@theme_fg_color, @theme_bg_color, 0.5); } +/* apply effects to insensitive and prelit images */ +*:insensitive { + -gtk-image-effect: dim; +} + +*:hover { + -gtk-image-effect: highlight; +} + .gtkstyle-fallback { background-color: @theme_bg_color; color: @theme_fg_color; @@ -131,8 +140,9 @@ /* inset shadows */ .button, +.primary-toolbar .button, .toolbar .button, -.primary-toolbar .button { +.header-bar .button { box-shadow: inset 1px 0 alpha(@light_shadow, 0.30), inset 0 1px alpha(@light_shadow, 0.30), inset -1px 0 alpha(@light_shadow, 0.30), @@ -147,8 +157,9 @@ } .button:active, +.primary-toolbar .button:active, .toolbar .button:active, -.primary-toolbar .button:active { +.header-bar .button:active { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07), @@ -178,9 +189,11 @@ inset 0 -1px alpha(@dark_shadow, 0.05); } -.button:active:insensitive, -.toolbar .button:active:insensitive, -.primary-toolbar .button:active:insensitive, +/* disable inset shadow */ +.button:active *:insensitive, +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive, .entry:insensitive { box-shadow: none; } @@ -214,9 +227,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); color: @theme_fg_color; } @@ -227,9 +241,10 @@ .button:active { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 0.9)), - to (shade(shade(@theme_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 0.9), + shade(shade(@theme_bg_color, 1.02), 0.95) + ); } .button:active:hover { @@ -245,24 +260,27 @@ .button:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); } -.button:active:insensitive { +.button:active *:insensitive { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.97)), - to (shade(@theme_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.97), + shade(@theme_bg_color, 1.0) + ); } /* default button */ .button.default { border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.02), 1.3)), - to (shade(shade(@theme_selected_bg_color, 1.02), 1.1))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.02), 1.3), + shade(shade(@theme_selected_bg_color, 1.02), 1.1) + ); } .button.default:hover { @@ -271,9 +289,10 @@ .button.default:active { border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_selected_bg_color, 1.02), 1.15))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.02), 1.1), + shade(shade(@theme_selected_bg_color, 1.02), 1.15) + ); } .button.default:active:hover { @@ -295,13 +314,15 @@ } row:selected, +row:selected:hover, row:selected:focus { border-width: 1px 0; border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); color: @theme_selected_fg_color; @@ -342,9 +363,10 @@ column-header .button:active:focus { border-color: shade(@theme_bg_color, 0.9); border-bottom-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); } column-header .button:hover, @@ -490,9 +512,10 @@ border-left-color: shade(@theme_bg_color, 0.76); border-bottom-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_base_color, 0.97)), - to (@theme_base_color)); + background-image: linear-gradient(to bottom, + shade(@theme_base_color, 0.97), + @theme_base_color + ); color: @theme_text_color; } @@ -520,9 +543,10 @@ .entry.progressbar { border-width: 0; border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); color: @theme_selected_fg_color; } @@ -573,13 +597,15 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); color: @theme_selected_fg_color; } +.content-view.view.rubberband, .view.rubberband, .rubberband { border-width: 1px; @@ -619,46 +645,122 @@ border-width: 1px; border-style: solid; border-color: shade(@info_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@info_bg_color, 1.04)), - to (shade(@info_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@info_bg_color, 1.04), + shade(@info_bg_color, 0.96) + ); + + color: @info_fg_color; +} + +.info .button.close { + color: @info_fg_color; +} +.info .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.info .button.close:active { color: @info_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); } .warning { border-width: 1px; border-style: solid; border-color: shade(@warning_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@warning_bg_color, 1.04)), - to (shade(@warning_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@warning_bg_color, 1.04), + shade(@warning_bg_color, 0.96) + ); + + color: @warning_fg_color; +} +.warning .button.close { color: @warning_fg_color; } +.warning .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.warning .button.close:active { + color: @warning_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .question { border-width: 1px; border-style: solid; border-color: shade(@question_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@question_bg_color, 1.04)), - to (shade(@question_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@question_bg_color, 1.04), + shade(@question_bg_color, 0.96) + ); color: @question_fg_color; } +.question .button.close { + color: @question_fg_color; +} + +.question .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.question .button.close:active { + color: @question_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + .error { border-width: 1px; border-style: solid; border-color: shade(@error_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@error_bg_color, 1.04)), - to (shade(@error_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@error_bg_color, 1.04), + shade(@error_bg_color, 0.96) + ); color: @error_fg_color; } +.error .button.close { + color: @error_fg_color; +} + +.error .button.close:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0.3), + alpha(white, 0.2) 30%, + alpha(black, 0.02)); +} + +.error .button.close:active { + color: @error_fg_color; + background-image: linear-gradient(to bottom, + alpha(black, 0.1), + transparent); +} + /******************* * symbolic images * *******************/ @@ -687,9 +789,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); color: @theme_fg_color; } @@ -728,15 +831,8 @@ } .view.dim-label, -.dim-label, -.dim-label:hover, -.dim-label:focus { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -.dim-label:selected, -.dim-label:selected:focus { - color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.5); +.dim-label { + color: alpha(currentColor, 0.5); } .dnd { @@ -762,9 +858,12 @@ background-color: @menu_bg_color; } +.primary-toolbar .menu, .primary-toolbar .button .menu, .toolbar .menu, .toolbar .primary-toolbar .menu, +.header-bar .menu, +.header-bar .primary-toolbar .menu, .menu { padding: 0; border-radius: 0; @@ -775,7 +874,7 @@ .menu.button:hover, .menu.button:active, -.menu.button:active:insensitive, +.menu.button:active *:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -783,6 +882,16 @@ background-image: none; } +.context-menu { + font: initial; +} + +/* ubuntu software center menu */ +#toolbar-popup { + background-color: @menu_bg_color; + color: @menu_fg_color; +} + /*********** * menubar * ***********/ @@ -804,21 +913,24 @@ border-width: 1px 1px 0 1px; border-style: solid; border-color: transparent; - background-color: @menubar_bg_color; + background-color: transparent; background-image: none; color: @menubar_fg_color; } .menubar.menuitem:hover, .menubar .menuitem:hover { - border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 0.9)), - to (shade(shade(@theme_bg_color, 1.02), 0.95))); + border-color: shade(@menubar_bg_color, 0.8); + background-image: linear-gradient(to bottom, + shade(shade(@menubar_bg_color, 1.02), 0.9), + shade(shade(@menubar_bg_color, 1.02), 0.95) + ); + + color: @menubar_fg_color; } .menubar .menuitem *:hover { - color: @theme_fg_color; + color: @menubar_fg_color; } /************ @@ -829,10 +941,6 @@ border-width: 0; } -GtkTreeMenu .menuitem * { - color: @menu_fg_color; -} - .menuitem, .menu .menuitem { padding: 2px; @@ -840,7 +948,7 @@ border-style: solid; border-color: transparent; border-radius: 0; - background-color: @menu_bg_color; + background-color: transparent; background-image: none; color: @menu_fg_color; @@ -850,9 +958,10 @@ .menu .menuitem:active, .menu .menuitem:hover { border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); } .menu .menuitem:active, @@ -923,6 +1032,10 @@ color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6); } +GtkModelMenuItem GtkBox GtkImage { + padding-right: 4px; +} + /************ * notebook * ************/ @@ -946,16 +1059,18 @@ padding: 2px; border-color: shade(@theme_base_color, 0.75); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_base_color, 0.97)), - to (shade(@theme_base_color, 0.92))); + background-image: linear-gradient(to bottom, + shade(@theme_base_color, 0.97), + shade(@theme_base_color, 0.92) + ); } .notebook tab:active { border-color: shade(@theme_base_color, 0.7); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_base_color, 0.99)), - to (shade(@theme_base_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_base_color, 0.99), + shade(@theme_base_color, 1.0) + ); } .notebook tab GtkLabel { @@ -1027,15 +1142,17 @@ border-width: 1px; border-style: solid; border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); } .progressbar.vertical { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to right, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); } .trough, @@ -1046,15 +1163,17 @@ border-width: 1px; border-style: solid; border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.92)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.92), + shade(@theme_bg_color, 0.96) + ); } .trough.vertical { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 0.92)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.92), + shade(@theme_bg_color, 0.96) + ); } /* level bars as used for password quality or remaining power */ @@ -1150,9 +1269,10 @@ .scale.slider { border-radius: 7px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); /* we will draw the border using box shadow for now */ box-shadow: inset 1px 0 shade(@theme_bg_color, 0.7), @@ -1169,9 +1289,10 @@ } .scale.slider:insensitive { - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); box-shadow: inset 1px 0 shade(@theme_bg_color, 0.9), inset 0 1px shade(@theme_bg_color, 0.9), @@ -1180,21 +1301,33 @@ } .scale.slider.vertical { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to right, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); } .scale.slider.vertical:hover { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); } .scale.slider.vertical:insensitive { - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; } .scale.mark { @@ -1205,56 +1338,63 @@ margin: 6px 0; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.92)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.92), + shade(@theme_bg_color, 0.96) + ); } .scale.trough.vertical { margin: 0 6px; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 0.92)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.92), + shade(@theme_bg_color, 0.96) + ); } .menubar .menuitem .scale.highlight.left, .scale.highlight.left { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); } .menubar .menuitem .scale.highlight.left:hover { border-color: shade(@theme_selected_bg_color, 0.6); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 0.9)), - to (shade(@theme_selected_bg_color, 0.7))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 0.9), + shade(@theme_selected_bg_color, 0.7) + ); } .scale.highlight.bottom { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_selected_bg_color, 1.1)), - to (shade(@theme_selected_bg_color, 0.9))); + background-image: linear-gradient(to right, + shade(@theme_selected_bg_color, 1.1), + shade(@theme_selected_bg_color, 0.9) + ); } .scale.trough:insensitive, .scale.highlight.left:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.99)), - to (shade(@theme_bg_color, 0.95))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.99), + shade(@theme_bg_color, 0.95) + ); } .scale.trough.vertical:insensitive, .scale.highlight.bottom:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, right top, - from (shade(@theme_bg_color, 0.99)), - to (shade(@theme_bg_color, 0.95))); + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.99), + shade(@theme_bg_color, 0.95) + ); } /************* @@ -1303,6 +1443,12 @@ background-color: @theme_selected_bg_color; } +.scrollbar.slider.fine-tune:prelight:active { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + /* overlay scrollbar */ OsThumb { color: shade(@theme_bg_color, 0.7); @@ -1347,21 +1493,32 @@ .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, -.primary-toolbar .separator:insensitive { +.primary-toolbar .separator:insensitive, +.toolbar GtkSeparatorToolItem, +.toolbar .separator, +.toolbar .separator:insensitive +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { border-color: transparent; + color: transparent; } +.primary-toolbar .button .separator, +.primary-toolbar .button.separator, .toolbar .button .separator, .toolbar .button.separator, -.primary-toolbar .button .separator, -.primary-toolbar .button.separator { +.header-bar .button .separator, +.header-bar .button.separator { border-color: transparent; } +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive, .toolbar .button .separator:insensitive, .toolbar .button.separator:insensitive, -.primary-toolbar .button .separator:insensitive, -.primary-toolbar .button.separator:insensitive { +.header-bar .button .separator:insensitive, +.header-bar .button.separator:insensitive { border-color: transparent; } @@ -1444,9 +1601,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); color: @theme_fg_color; box-shadow: none; @@ -1458,9 +1616,10 @@ .spinbutton.vertical .button:active { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 0.9)), - to (shade(shade(@theme_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 0.9), + shade(shade(@theme_bg_color, 1.02), 0.95) + ); } .spinbutton.vertical .button:active:hover { @@ -1476,9 +1635,10 @@ .spinbutton.vertical .button:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); color: mix(@theme_fg_color, @theme_bg_color, 0.5); } @@ -1647,41 +1807,46 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.7); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); } GtkSwitch.slider:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); } GtkSwitch.trough { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.97)), - to (shade(@theme_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.97), + shade(@theme_bg_color, 1.0) + ); color: @theme_fg_color; } GtkSwitch.trough:active { border-color: shade(@theme_selected_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_selected_bg_color, 0.9)), - to (shade(@theme_selected_bg_color, 1.1))); + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 0.9), + shade(@theme_selected_bg_color, 1.1) + ); color: @theme_selected_fg_color; } GtkSwitch.trough:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.95)), - to (shade(@theme_bg_color, 0.99))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.95), + shade(@theme_bg_color, 0.99) + ); color: mix(@theme_fg_color, @theme_bg_color, 0.5); } @@ -1800,28 +1965,36 @@ * header-bar * **************/ .header-bar { + padding: 4px; border-width: 0 0 1px; border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - padding: 0 2px; - background-color: @theme_bg_color; + border-color: shade(@toolbar_bg_color, 0.8); + background-color: @toolbar_bg_color; } .header-bar .button.text-button { - padding: 2px 4px; + padding: 4px; } .header-bar .button.image-button { - padding: 4px 3px 3px 4px; + padding: 6px; +} + +.header-bar .title { + font: bold; +} + +.header-bar .subtitle { + font: smaller; } /*********** * toolbar * ***********/ .toolbar { - padding: 2px; + padding: 4px; border-style: none; - background-color: @theme_bg_color; + background-color: @toolbar_bg_color; background-image: none; } @@ -1838,11 +2011,10 @@ } .toolbar:insensitive { - color: alpha (@theme_fg_color, 0.6); - background-color: @theme_bg_color;; + color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5); + background-color: shade(@toolbar_bg_color, 0.9); } - /* menubar toolbars */ .toolbar.menubar { -GtkToolbar-button-relief: normal; @@ -1860,9 +2032,10 @@ border-width: 1px 0 1px 0; border-style: solid; border-color: shade(@toolbar_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 0.96)), - to (shade(@toolbar_bg_color, 0.94))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 0.96), + shade(@toolbar_bg_color, 0.94) + ); color: @toolbar_fg_color; } @@ -1881,31 +2054,37 @@ .primary-toolbar .raised .button, .primary-toolbar .raised.button, .toolbar GtkComboBox, -.toolbar .button { +.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { border-color: shade(@toolbar_bg_color, 0.8); - background-color: transparent; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@toolbar_bg_color, 1.02), 1.1)), - to (shade(shade(@toolbar_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@toolbar_bg_color, 1.02), 1.1), + shade(shade(@toolbar_bg_color, 1.02), 0.9) + ); color: @toolbar_fg_color; } .primary-toolbar .button:hover, -.toolbar .button:hover { +.toolbar .button:hover, +.header-bar .button:hover { border-color: shade(@toolbar_bg_color, 0.7); } .primary-toolbar .button:active, -.toolbar .button:active { +.toolbar .button:active, +.header-bar .button:active { border-color: shade(@toolbar_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@toolbar_bg_color, 1.02), 0.9)), - to (shade(shade(@toolbar_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@toolbar_bg_color, 1.02), 0.9), + shade(shade(@toolbar_bg_color, 1.02), 0.95) + ); } .primary-toolbar .button:active:hover, -.toolbar .button:active:hover { +.toolbar .button:active:hover, +.header-bar .button:active:hover { border-color: shade(@toolbar_bg_color, 0.7); } @@ -1916,27 +2095,37 @@ .toolbar .button:focus, .toolbar .button:hover:focus, .toolbar .button:active:focus, -.toolbar .button:active:hover:focus { +.toolbar .button:active:hover:focus, +.header-bar .button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:active:hover:focus { border-color: shade(@toolbar_bg_color, 0.7); } .primary-toolbar .button:insensitive, -.toolbar .button:insensitive { +.toolbar .button:insensitive, +.header-bar .button:insensitive { border-color: shade(@toolbar_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 1.04)), - to (shade(@toolbar_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 1.04), + shade(@toolbar_bg_color, 0.96) + ); } -.primary-toolbar .button:active:insensitive, -.toolbar .button:active:insensitive { +.primary-toolbar .button:active *:insensitive, +.toolbar .button:active *:insensitive, +.header-bar .button:active *:insensitive { border-color: shade(@toolbar_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@toolbar_bg_color, 0.97)), - to (shade(@toolbar_bg_color, 1.0))); + background-image: linear-gradient(to bottom, + shade(@toolbar_bg_color, 0.97), + shade(@toolbar_bg_color, 1.0) + ); } -.primary-toolbar .entry { +.primary-toolbar .entry, +.toolbar .entry, +.header-bar .entry { border-top-color: shade(@toolbar_bg_color, 0.7); border-right-color: shade(@toolbar_bg_color, 0.76); border-left-color: shade(@toolbar_bg_color, 0.76); @@ -1944,7 +2133,11 @@ } .primary-toolbar .entry:active, -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.toolbar .entry:active, +.toolbar .entry:focus, +.header-bar .entry:active, +.header-bar .entry:focus { border-top-color: shade(@toolbar_bg_color, 0.6); border-right-color: shade(@toolbar_bg_color, 0.66); border-left-color: shade(@toolbar_bg_color, 0.66); @@ -1960,9 +2153,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 0.96)), - to (shade(@theme_bg_color, 0.94))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 0.96), + shade(@theme_bg_color, 0.94) + ); color: @theme_fg_color; } @@ -1979,9 +2173,10 @@ border-style: solid; border-color: shade(@theme_bg_color, 0.8); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); color: @theme_fg_color; } @@ -1992,9 +2187,10 @@ .inline-toolbar.toolbar .button:active { border-color: shade(@theme_bg_color, 0.8); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 0.9)), - to (shade(shade(@theme_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 0.9), + shade(shade(@theme_bg_color, 1.02), 0.95) + ); } .inline-toolbar.toolbar .button:active:hover { @@ -2011,9 +2207,10 @@ .inline-toolbar.toolbar .button *:insensitive, .inline-toolbar.toolbar GtkToolButton .button:insensitive { border-color: shade(@theme_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(@theme_bg_color, 1.04)), - to (shade(@theme_bg_color, 0.96))); + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.04), + shade(@theme_bg_color, 0.96) + ); } /****************** @@ -2021,18 +2218,16 @@ *****************/ /* set up shadows for visual separation */ .linked .button, -.toolbar .button.linked, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar GtkToolButton .button, .inline-toolbar.toolbar GtkToolButton > .button { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), - inset 1px 0 alpha(@light_shadow, 0.30), + inset 1px 0 alpha(@light_shadow, 0.30), inset 0 1px alpha(@light_shadow, 0.30), inset 0 -1px alpha(@light_shadow, 0.30); } .linked .button:active, -.toolbar .button.linked:active, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar GtkToolButton .button:active, .inline-toolbar.toolbar GtkToolButton > .button:active { @@ -2043,7 +2238,6 @@ } .linked .button:insensitive, -.toolbar .button.linked:insensitive, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:insensitive, .inline-toolbar.toolbar GtkToolButton > .button:insensitive { @@ -2051,14 +2245,12 @@ } /* remove box shadow from last-child and only-child */ -.linked .button:active:insensitive:last-child, -.linked .button:active:insensitive:only-child, -.toolbar .button.linked:active:insensitive:last-child, -.toolbar .button.linked:active:insensitive:only-child, -.inline-toolbar.toolbar .button:active:insensitive:last-child, -.inline-toolbar.toolbar .button:active:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive { +.linked .button:active *:insensitive:last-child, +.linked .button:active *:insensitive:only-child, +.inline-toolbar.toolbar .button:active *:insensitive:last-child, +.inline-toolbar.toolbar .button:active *:insensitive:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2067,10 +2259,6 @@ .linked .button:only-child, .linked .button:insensitive:last-child, .linked .button:insensitive:only-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:only-child, -.toolbar .button:insensitive.raised.linked:last-child, -.toolbar .button:insensitive.raised.linked:only-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:insensitive:last-child, @@ -2087,8 +2275,6 @@ .linked .button:active:last-child, .linked .button:active:only-child, -.toolbar .button:active.raised.linked:last-child, -.toolbar .button:active.raised.linked:only-child, .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button:active, @@ -2104,9 +2290,6 @@ .linked .button:active, .linked .button:active:hover, .linked .button:insensitive, -.toolbar .button.linked, -.toolbar .button.linked:active, -.toolbar .button.linked:insensitive, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:insensitive, @@ -2125,9 +2308,6 @@ .linked .button:active:first-child, .linked .button:active:hover:first-child, .linked .button:insensitive:first-child, -.toolbar .button.linked:first-child, -.toolbar .button.linked:active:first-child, -.toolbar .button.linked:insensitive:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, .inline-toolbar.toolbar .button:insensitive:first-child, @@ -2147,9 +2327,6 @@ .linked .button:active:last-child, .linked .button:active:hover:last-child, .linked .button:insensitive:last-child, -.toolbar .button.linked:last-child, -.toolbar .button.linked:active:last-child, -.toolbar .button.linked:insensitive:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:insensitive:last-child, @@ -2169,9 +2346,6 @@ .linked .button:active:only-child, .linked .button:active:hover:only-child, .linked .button:insensitive:only-child, -.toolbar .button.linked:only-child, -.toolbar .button.linked:active:only-child, -.toolbar .button.linked:insensitive:only-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar .button:insensitive:only-child, @@ -2187,7 +2361,7 @@ .inline-toolbar.toolbar.vertical .button, .inline-toolbar.toolbar.vertical GtkToolButton > .button { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), - inset 1px 0 alpha(@light_shadow, 0.30), + inset 1px 0 alpha(@light_shadow, 0.30), inset 0 1px alpha(@light_shadow, 0.30), inset 0 -1px alpha(@light_shadow, 0.30); } @@ -2208,12 +2382,12 @@ } /* remove box shadow from last-child and only-child */ -.linked.vertical .button:active:insensitive:last-child, -.linked.vertical .button:active:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive { +.linked.vertical .button:active *:insensitive:last-child, +.linked.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { box-shadow: none; } @@ -2297,15 +2471,27 @@ /* linked toolbar buttons */ .primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button { +.primary-toolbar .raised.linked .button, +.toolbar .button.raised.linked, +.toolbar .raised.linked .button, +.toolbar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button, +.header-bar .linked .button { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), - inset 1px 0 alpha(@light_shadow, 0.30), + inset 1px 0 alpha(@light_shadow, 0.30), inset 0 1px alpha(@light_shadow, 0.30), inset 0 -1px alpha(@light_shadow, 0.30); } .primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active { +.primary-toolbar .raised.linked .button:active, +.toolbar .button.raised.linked:active, +.toolbar .raised.linked .button:active, +.toolbar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active, +.header-bar .linked .button:active { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2313,15 +2499,33 @@ } .primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive { +.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9); } /* remove box shadow from last-child and only-child */ -.primary-toolbar .button:active:insensitive.raised.linked:last-child, -.primary-toolbar .button:active:insensitive.raised.linked:only-child, -.primary-toolbar .raised.linked .button:active:insensitive:last-child, -.primary-toolbar .raised.linked .button:active:insensitive:only-child { +.primary-toolbar .button:active *:insensitive.raised.linked:last-child, +.primary-toolbar .button:active *:insensitive.raised.linked:only-child, +.primary-toolbar .raised.linked .button:active *:insensitive:last-child, +.primary-toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .button:active *:insensitive.raised.linked:last-child, +.toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:active *:insensitive:last-child, +.toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .linked .button:active *:insensitive:last-child, +.toolbar .linked .button:active *:insensitive:only-child, +.header-bar .button:active *:insensitive.raised.linked:last-child, +.header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:active *:insensitive:last-child, +.header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .linked .button:active *:insensitive:last-child, +.header-bar .linked .button:active *:insensitive:only-child { box-shadow: none; } @@ -2333,7 +2537,31 @@ .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:insensitive:last-child, -.primary-toolbar .raised.linked .button:insensitive:only-child { +.primary-toolbar .raised.linked .button:insensitive:only-child, +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:only-child, +.toolbar .button:insensitive.raised.linked:last-child, +.toolbar .button:insensitive.raised.linked:only-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:insensitive:last-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button:insensitive.raised.linked:last-child, +.header-bar .button:insensitive.raised.linked:only-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:insensitive:only-child { box-shadow: inset 1px 0 alpha(@light_shadow, 0.30), inset 0 1px alpha(@light_shadow, 0.30), inset -1px 0 alpha(@light_shadow, 0.30), @@ -2343,7 +2571,19 @@ .primary-toolbar .button:active.raised.linked:last-child, .primary-toolbar .button:active.raised.linked:only-child, .primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:active:only-child { +.primary-toolbar .raised.linked .button:active:only-child, +.toolbar .button:active.raised.linked:last-child, +.toolbar .button:active.raised.linked:only-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:active:only-child, +.header-bar .button:active.raised.linked:last-child, +.header-bar .button:active.raised.linked:only-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:active:only-child { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2355,7 +2595,25 @@ .primary-toolbar .button.raised.linked:insensitive, .primary-toolbar .raised.linked .button, .primary-toolbar .raised.linked .button:active, -.primary-toolbar .raised.linked .button:insensitive { +.primary-toolbar .raised.linked .button:insensitive, +.toolbar .button.raised.linked, +.toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:insensitive, +.toolbar .raised.linked .button, +.toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:insensitive, +.toolbar .linked .button, +.toolbar .linked .button:active, +.toolbar .linked .button:insensitive, +.header-bar .button.raised.linked, +.header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:insensitive { border-width: 1px; border-radius: 0; border-right-width: 0; @@ -2368,7 +2626,25 @@ .primary-toolbar .button.raised.linked:insensitive:first-child, .primary-toolbar .raised.linked .button:first-child, .primary-toolbar .raised.linked .button:active:first-child, -.primary-toolbar .raised.linked .button:insensitive:first-child { +.primary-toolbar .raised.linked .button:insensitive:first-child, +.toolbar .button.raised.linked:first-child, +.toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:insensitive:first-child, +.toolbar .raised.linked .button:first-child, +.toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:insensitive:first-child, +.toolbar .linked .button:first-child, +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:insensitive:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .button.raised.linked:active:first-child, +.header-bar .button.raised.linked:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:insensitive:first-child { border-width: 1px; border-radius: 2px; border-right-width: 0; @@ -2382,7 +2658,25 @@ .primary-toolbar .button.raised.linked:insensitive:last-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child { +.primary-toolbar .raised.linked .button:insensitive:last-child, +.toolbar .button.raised.linked:last-child, +.toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:insensitive:last-child, +.toolbar .raised.linked .button:last-child, +.toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:insensitive:last-child, +.toolbar .linked .button:last-child, +.toolbar .linked .button:active:last-child, +.toolbar .linked .button:insensitive:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:insensitive:last-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 2px; border-left-width: 0; @@ -2396,7 +2690,25 @@ .primary-toolbar .button.raised.linked:insensitive:only-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:active:only-child, -.primary-toolbar .raised.linked .button:insensitive:only-child { +.primary-toolbar .raised.linked .button:insensitive:only-child, +.toolbar .button.raised.linked:only-child, +.toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:insensitive:only-child, +.toolbar .raised.linked .button:only-child, +.toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:insensitive:only-child, +.toolbar .linked .button:only-child, +.toolbar .linked .button:active:only-child, +.toolbar .linked .button:insensitive:only-child, +.header-bar .button.raised.linked:only-child, +.header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:insensitive:only-child, +.header-bar .raised.linked .button:only-child, +.header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:insensitive:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 2px; } @@ -2409,8 +2721,8 @@ border-style: solid; border-color: alpha(@theme_tooltip_bg_color, 0.9); border-radius: 2px; - background-image: none; background-color: alpha(@theme_tooltip_bg_color, 0.7); + background-image: none; color: @theme_tooltip_fg_color; } @@ -2536,8 +2848,8 @@ background-image: none; } -.osd.button:active:insensitive, -.osd .button:active:insensitive { +.osd.button:active *:insensitive, +.osd .button:active *:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -2595,7 +2907,7 @@ background-image: none; } -.osd.toolbar .button:active:insensitive { +.osd.toolbar .button:active *:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; @@ -2752,6 +3064,40 @@ background-color: @osd_bg; } +/****************************** + * destructive action buttons * + ******************************/ +.destructive-action.button { + padding: 4px; + border-width: 1px; + border-style: solid; + border-color: shade(@error_color, 0.9); + border-radius: 2px; + background-image: linear-gradient(to bottom, + shade(shade(@error_color, 1.02), 1.3), + shade(shade(@error_color, 1.02), 1.1) + ); + + color: @theme_selected_fg_color; + box-shadow: none; +} + +.destructive-action.button:hover { + border-color: shade(@error_color, 0.8); +} + +.destructive-action.button:active { + border-color: shade(@error_color, 0.9); + background-image: linear-gradient(to bottom, + shade(shade(@error_color, 1.02), 1.1), + shade(shade(@error_color, 1.02), 1.15) + ); +} + +.destructive-action.button:hover:active { + border-color: shade(@error_color, 0.8); +} + /****************** * selection mode * ******************/ @@ -2759,9 +3105,10 @@ .selection-mode.toolbar { border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.3), 1.04)), - to (shade(shade(@theme_selected_bg_color, 1.1), 0.96))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.3), 1.04), + shade(shade(@theme_selected_bg_color, 1.1), 0.96) + ); color: shade(@theme_selected_bg_color, 0.9); } @@ -2784,9 +3131,10 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.02), 1.3)), - to (shade(shade(@theme_selected_bg_color, 1.02), 1.1))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.02), 1.3), + shade(shade(@theme_selected_bg_color, 1.02), 1.1) + ); color: @theme_selected_fg_color; box-shadow: none; @@ -2802,9 +3150,10 @@ .selection-mode.toolbar .button:active, .selection-mode.toolbar GtkToolButton .button:active { border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_selected_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_selected_bg_color, 1.02), 1.15))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_selected_bg_color, 1.02), 1.1), + shade(shade(@theme_selected_bg_color, 1.02), 1.15) + ); } .selection-mode.header-bar .button:hover:active, @@ -2822,9 +3171,10 @@ border-style: solid; border-color: shade(@theme_selected_bg_color, 0.9); border-radius: 2px; - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 1.1)), - to (shade(shade(@theme_bg_color, 1.02), 0.9))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 1.1), + shade(shade(@theme_bg_color, 1.02), 0.9) + ); color: @theme_fg_color; } @@ -2839,9 +3189,10 @@ .selection-mode.toolbar .suggested-action.button:active, .selection-mode.toolbar GtkToolButton.suggested-action:active { border-color: shade(@theme_selected_bg_color, 0.9); - background-image: -gtk-gradient(linear, left top, left bottom, - from (shade(shade(@theme_bg_color, 1.02), 0.9)), - to (shade(shade(@theme_bg_color, 1.02), 0.95))); + background-image: linear-gradient(to bottom, + shade(shade(@theme_bg_color, 1.02), 0.9), + shade(shade(@theme_bg_color, 1.02), 0.95) + ); } .selection-mode.header-bar .suggested-action.button:hover:active, @@ -2892,3 +3243,94 @@ GtkBubbleWindow .toolbar { background-color: transparent; } + +/******* + * CSD * + *******/ +.titlebar { + border-radius: 2px 2px 0 0; + background-image: linear-gradient(to bottom, + @wm_bg_a, + @wm_bg_b + ); + + text-shadow: none; +} + +/* 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 .title { + font: bold; +} + +.titlebar:backdrop { + background-image: linear-gradient(to bottom, + shade(@wm_bg_a, 0.99), + @wm_bg_b + ); + + text-shadow: none; +} + +.titlebar .titlebutton { + padding: 4px; + border-style: none; + background: none; + color: @wm_title_focused; +} + +.titlebar .titlebutton:hover, +.titlebar .titlebutton:hover:focus { + background: none; + color: shade(@wm_title_focused, 0.8); +} + +.titlebar .titlebutton:active, +.titlebar .titlebutton:active:hover { + background: none; + color: shade(@wm_title_focused, 0.7); + box-shadow: none; +} + +/* +.titlebar .right .titlebutton:first-child { + border-left: 1px solid shade(@wm_bg_a, 0.9); +} + +.titlebar .right .titlebutton:last-child { +} + +.titlebar .left .titlebutton:last-child { + border-right: 1px solid shade(@wm_bg_a, 0.9); +} + +.titlebar .left .titlebutton:first-child { +} +*/ + +.titlebar .titlebutton:backdrop { + background-image: none; + color: @wm_title_unfocused; +} + +.window-frame { + border-style: none; + border-radius: 2px 2px 0 0; + box-shadow: 0 3px 7px alpha(black, 0.7), + 0 0 0 1px alpha(black, 0.2); + + /* this is used for the resize cursor area */ + margin: 10px; +} + +.window-frame:backdrop { + box-shadow: 0 3px 5px alpha(black, 0.5), + 0 0 0 1px alpha(black, 0.2); +} diff -Nru shimmer-themes-1.6.1/orion/metacity-1/metacity-theme-1.xml shimmer-themes-1.6.2/orion/metacity-1/metacity-theme-1.xml --- shimmer-themes-1.6.1/orion/metacity-1/metacity-theme-1.xml 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/metacity-1/metacity-theme-1.xml 1969-12-31 19:00:00.000000000 -0500 @@ -1,420 +0,0 @@ -<?xml version="1.0"?> -<metacity_theme> -<info> - <name>Orion</name> - <author>Satyajit Sahoo</author> - <copyright>GPL-3.0+</copyright> - <date>16 Jan 2013</date> - <description>Orion Metacity Theme</description> -</info> - -<!-- ::: GEOMETRY ::: --> -<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false"> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_titlebar_edge" value="4"/> - <distance name="right_titlebar_edge" value="4"/> - <distance name="title_vertical_pad" value="10"/> - <aspect_ratio name="button" value="1.0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<frame_geometry name="shaded" parent="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false"/> - -<frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <!-- strip frame spacing off the normal geometry when maximised --> - <distance name="left_width" value="0"/> - <distance name="right_width" value="0"/> - <distance name="bottom_height" value="0"/> -</frame_geometry> - -<frame_geometry name="utility" title_scale="small" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false"> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_titlebar_edge" value="4"/> - <distance name="right_titlebar_edge" value="4"/> - <distance name="title_vertical_pad" value="10"/> - <aspect_ratio name="button" value="1.0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<frame_geometry name="border" has_title="false"> - <distance name="left_width" value="1"/> - <distance name="right_width" value="1"/> - <distance name="bottom_height" value="1"/> - <distance name="left_titlebar_edge" value="0"/> - <distance name="right_titlebar_edge" value="0"/> - <distance name="button_width" value="0"/> - <distance name="button_height" value="0"/> - <distance name="title_vertical_pad" value="0"/> - <border name="title_border" left="0" right="0" top="0" bottom="0"/> - <border name="button_border" left="0" right="0" top="0" bottom="0"/> -</frame_geometry> - -<!-- button minimum size --> -<constant name="Bmin" value="7"/> -<!-- button inside padding --> -<constant name="Bpad" value="6"/> - -<!-- ::: CORNERS OUTLINE::: --> -<draw_ops name="corners_outline"> - <!-- top left Dark --> - <line color="shade/gtk:bg[NORMAL]/0.74" x1="3" y1="1" x2="4" y2="1"/> - <line color="shade/gtk:bg[NORMAL]/0.72" x1="2" y1="2" x2="2" y2="2"/> - <line color="shade/gtk:bg[NORMAL]/0.70" x1="1" y1="3" x2="1" y2="4"/> - - <!-- top right Dark --> - <line color="shade/gtk:bg[NORMAL]/0.74" x1="width-5" y1="1" x2="width-4" y2="1"/> - <line color="shade/gtk:bg[NORMAL]/0.72" x1="width-3" y1="2" x2="width-3" y2="2"/> - <line color="shade/gtk:bg[NORMAL]/0.70" x1="width-2" y1="3" x2="width-2" y2="4"/> - - <!-- top left White --> - <line color="shade/gtk:bg[NORMAL]/1.12" x1="4" y1="2" x2="4" y2="2"/> - <line color="shade/gtk:bg[NORMAL]/1.14" x1="3" y1="2" x2="3" y2="2"/> - <line color="shade/gtk:bg[NORMAL]/1.10" x1="2" y1="3" x2="2" y2="3"/> - <line color="shade/gtk:bg[NORMAL]/1.08" x1="2" y1="4" x2="2" y2="4"/> - - <!-- top right White --> - <line color="shade/gtk:bg[NORMAL]/1.12" x1="width-5" y1="2" x2="width-5" y2="2"/> - <line color="shade/gtk:bg[NORMAL]/1.14" x1="width-4" y1="2" x2="width-4" y2="2"/> - <line color="shade/gtk:bg[NORMAL]/1.10" x1="width-3" y1="3" x2="width-3" y2="3"/> - <line color="shade/gtk:bg[NORMAL]/1.08" x1="width-3" y1="4" x2="width-3" y2="4"/> - -</draw_ops> - -<!-- ::: BORDER OUTLINE ::: --> -<draw_ops name="border"> - <line color="shade/gtk:bg[NORMAL]/0.76" x1="0" y1="0" x2="width" y2="0"/> - <line color="shade/gtk:bg[NORMAL]/1.08" x1="4" y1="1" x2="width-1" y2="1"/> - <line color="shade/gtk:bg[NORMAL]/0.70" x1="0" y1="0" x2="0" y2="height"/> - <line color="shade/gtk:bg[NORMAL]/0.70" x1="width-1" y1="0" x2="width-1" y2="height"/> - <line color="shade/gtk:bg[NORMAL]/0.70" x1="0" y1="height-1" x2="width" y2="height-1"/> -</draw_ops> - -<draw_ops name="maxed_border"> - <line color="shade/gtk:bg[NORMAL]/1.14" x1="0" y1="0" x2="width" y2="0"/> - <line color="shade/gtk:bg[NORMAL]/0.70" x1="0" y1="height-1" x2="width" y2="height-1"/> -</draw_ops> - -<!-- ::: TITLEBAR ::: --> -<draw_ops name="titlebar_gradient"> - <gradient type="vertical" x="0" y="0" width="width" height="title_height"> - <color value="shade/gtk:bg[NORMAL]/1.05" /> - <color value="shade/gtk:bg[NORMAL]/1.00" /> - </gradient> -</draw_ops> - -<draw_ops name="titlebar_gradient_unfocused"> - <gradient type="vertical" x="0" y="0" width="width" height="title_height"> - <color value="shade/gtk:bg[NORMAL]/1.02" /> - <color value="shade/gtk:bg[NORMAL]/1.00" /> - </gradient> -</draw_ops> - -<draw_ops name="titlebar_maximized"> - <include name="titlebar_gradient"/> - <include name="maxed_border"/> -</draw_ops> - -<draw_ops name="titlebar_maximized_unfocused"> - <include name="titlebar_gradient_unfocused"/> - <include name="maxed_border"/> -</draw_ops> - -<draw_ops name="round_titlebar"> - <include name="titlebar_gradient"/> - <include name="border"/> - <include name="corners_outline"/> -</draw_ops> - -<draw_ops name="round_titlebar_unfocused"> - <include name="titlebar_gradient_unfocused"/> - <include name="border"/> - <include name="corners_outline"/> -</draw_ops> - -<draw_ops name="titlebar_shaded"> - <include name="border"/> - <line color="shade/gtk:bg[NORMAL]/0.60" x1="0" y1="height-1" x2="width" y2="height-1"/> -</draw_ops> - -<draw_ops name="round_titlebar_shaded"> - <include name="border"/> - <include name="corners_outline"/> - <line color="shade/gtk:bg[NORMAL]/0.60" x1="5" y1="height-1" x2="width-6" y2="height-1"/> -</draw_ops> - -<!-- ::: TITLES ::: --> -<draw_ops name="title"> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2))" - color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" /> -</draw_ops> - -<draw_ops name="title_unfocused"> - <title x="(0 `max` ((width - title_width) / 2)) + 2" - y="(0 `max` ((height - title_height) / 2))" - color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" /> -</draw_ops> - -<!-- ::: BUTTON ICONS ::: --> -<!-- close icon --> -<draw_ops name="close_button_normal"> - <image filename="close_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_button_prelight"> - <image filename="close_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_button_pressed"> - <image filename="close_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="close_button_unfocused"> - <image filename="close_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- maximize icon --> -<draw_ops name="maximize_button_normal"> - <image filename="maximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_button_prelight"> - <image filename="maximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_button_pressed"> - <image filename="maximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="maximize_button_unfocused"> - <image filename="maximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- unmaximize icon --> -<draw_ops name="unmaximize_button_normal"> - <image filename="unmaximize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_button_prelight"> - <image filename="unmaximize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_button_pressed"> - <image filename="unmaximize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="unmaximize_button_unfocused"> - <image filename="unmaximize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- minimize icon --> -<draw_ops name="minimize_button_normal"> - <image filename="minimize_focused_normal.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_button_prelight"> - <image filename="minimize_focused_prelight.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_button_pressed"> - <image filename="minimize_focused_pressed.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<draw_ops name="minimize_button_unfocused"> - <image filename="minimize_unfocused.png" - x="(width - object_width) / 2" - y="(height - object_height) / 2" - width="object_width" - height="object_height"/> -</draw_ops> - -<!-- menu icon --> -<draw_ops name="menu_button"></draw_ops> - -<!-- :: BLANK :: --> -<draw_ops name="blank"></draw_ops> - -<!-- ::: FRAME STYLES ::: --> -<frame_style name="normal" geometry="normal"> - <piece position="entire_background" draw_ops="round_titlebar_unfocused"/> - <piece position="title" draw_ops="title_unfocused"/> - <button function="close" state="normal" draw_ops="close_button_unfocused"/> - <button function="close" state="pressed" draw_ops="close_button_pressed"/> - <button function="close" state="prelight" draw_ops="close_button_prelight"/> - <button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/> - <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/> - <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/> - <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/> - <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/> - <button function="menu" state="normal" draw_ops="menu_button"/> - <button function="menu" state="pressed" draw_ops="menu_button"/> - <button function="menu" state="prelight" draw_ops="menu_button"/> -</frame_style> - -<frame_style name="normal_shaded" geometry="shaded" parent="normal"> - <piece position="entire_background" draw_ops="round_titlebar"/> -</frame_style> - -<frame_style name="focused" geometry="normal" parent="normal"> - <piece position="entire_background" draw_ops="round_titlebar"/> - <piece position="title" draw_ops="title"/> - <button function="close" state="normal" draw_ops="close_button_normal"/> - <button function="close" state="pressed" draw_ops="close_button_pressed"/> - <button function="close" state="prelight" draw_ops="close_button_prelight"/> - <button function="maximize" state="normal" draw_ops="maximize_button_normal"/> - <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/> - <button function="minimize" state="normal" draw_ops="minimize_button_normal"/> - <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/> - <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/> - <button function="menu" state="normal" draw_ops="menu_button"/> - <button function="menu" state="pressed" draw_ops="menu_button"/> - <button function="menu" state="prelight" draw_ops="menu_button"/> -</frame_style> - -<frame_style name="focused_shaded" geometry="shaded" parent="focused"> - <piece position="entire_background" draw_ops="round_titlebar_shaded"/> -</frame_style> - -<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal"> - <piece position="entire_background" draw_ops="titlebar_maximized_unfocused"/> - <button function="maximize" state="normal" draw_ops="unmaximize_button_unfocused"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_button_prelight"/> -</frame_style> - -<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused"> - <piece position="entire_background" draw_ops="titlebar_maximized"/> - <button function="maximize" state="normal" draw_ops="unmaximize_button_normal"/> - <button function="maximize" state="pressed" draw_ops="unmaximize_button_pressed"/> - <button function="maximize" state="prelight" draw_ops="unmaximize_button_prelight"/> -</frame_style> - -<frame_style name="border" geometry="border" parent="normal"> - <piece position="entire_background" draw_ops="border"/> - <piece position="title" draw_ops="blank"/> -</frame_style> - -<frame_style name="utility_normal" geometry="utility" parent="normal"></frame_style> - -<frame_style name="utility_focused" geometry="utility" parent="focused"></frame_style> - -<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded"> - <piece position="entire_background" draw_ops="titlebar_shaded"/> -</frame_style> - -<frame_style_set name="normal"> - <frame focus="yes" state="normal" resize="both" style="focused"/> - <frame focus="no" state="normal" resize="both" style="normal"/> - <frame focus="yes" state="maximized" style="focused_maximized"/> - <frame focus="no" state="maximized" style="normal_maximized"/> - <frame focus="yes" state="shaded" style="focused_shaded"/> - <frame focus="no" state="shaded" style="normal_shaded"/> - <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/> - <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/> -</frame_style_set> - -<frame_style_set name="utility" parent="normal"> - <frame focus="yes" state="normal" resize="both" style="utility_focused"/> - <frame focus="no" state="normal" resize="both" style="utility_normal"/> - <!-- this is a bunch of crap since utility windows shouldn't be maximized --> - <frame focus="yes" state="maximized" style="focused"/> - <frame focus="no" state="maximized" style="normal"/> - <frame focus="yes" state="shaded" style="utility_focused_shaded"/> - <frame focus="no" state="shaded" style="utility_normal"/> - <frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/> - <frame focus="no" state="maximized_and_shaded" style="normal"/> -</frame_style_set> - -<frame_style_set name="border"> - <frame focus="yes" state="normal" resize="both" style="border"/> - <frame focus="no" state="normal" resize="both" style="border"/> - <frame focus="yes" state="maximized" style="border"/> - <frame focus="no" state="maximized" style="border"/> - <frame focus="yes" state="shaded" style="border"/> - <frame focus="no" state="shaded" style="border"/> - <frame focus="yes" state="maximized_and_shaded" style="border"/> - <frame focus="no" state="maximized_and_shaded" style="border"/> -</frame_style_set> - -<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/> -<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> -<menu_icon function="unmaximize" state="normal" draw_ops="maximize_button_icon_unfocused"/> -<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/> - -<!-- ::: WINDOWS ::: --> -<window type="normal" style_set="normal"/> -<window type="dialog" style_set="normal"/> -<window type="modal_dialog" style_set="normal"/> -<window type="menu" style_set="normal"/> -<window type="utility" style_set="utility"/> -<window type="border" style_set="border"/> - -</metacity_theme> diff -Nru shimmer-themes-1.6.1/orion/metacity-1/metacity-theme-2.xml shimmer-themes-1.6.2/orion/metacity-1/metacity-theme-2.xml --- shimmer-themes-1.6.1/orion/metacity-1/metacity-theme-2.xml 1969-12-31 19:00:00.000000000 -0500 +++ shimmer-themes-1.6.2/orion/metacity-1/metacity-theme-2.xml 2013-09-14 14:35:27.000000000 -0400 @@ -0,0 +1,1124 @@ +<?xml version="1.0"?> +<metacity_theme> +<info> + <name>Orion</name> + <author>Satyajit Sahoo</author> + <copyright>GPL-3.0+</copyright> + <date>16 Jan 2013</date> + <description>Orion Mutter Theme</description> +</info> + +<!-- ::: CONSTANTS ::: --> +<constant name="C_titlebar" value="gtk:bg[NORMAL]" /> +<constant name="C_border_focused" value="shade/gtk:bg[NORMAL]/0.7" /> +<constant name="C_border_unfocused" value="shade/gtk:bg[NORMAL]/0.8" /> +<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" /> +<constant name="C_title_unfocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6" /> +<constant name="C_highlight_focused" value="shade/gtk:bg[NORMAL]/1.05" /> +<constant name="C_highlight_unfocused" value="shade/gtk:bg[NORMAL]/1.02" /> + +<!-- ::: GEOMETRY ::: --> +<frame_geometry name="normal" title_scale="medium" rounded_top_left="2" rounded_top_right="2"> + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="left_titlebar_edge" value="4" /> + <distance name="right_titlebar_edge" value="4" /> + <distance name="title_vertical_pad" value="2" /> + <aspect_ratio name="button" value="1.0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="2" rounded_top_right="2" parent="normal" /> + +<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> +</frame_geometry> + +<frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="right_width" value="1" /> +</frame_geometry> + +<frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max"> + <distance name="left_width" value="1" /> +</frame_geometry> + +<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> + <distance name="title_vertical_pad" value="2" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="small_unfocused" parent="small"> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> +</frame_geometry> + +<frame_geometry name="nobuttons" hide_buttons="true" parent="normal" /> + +<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" > + <distance name="left_width" value="1" /> + <distance name="right_width" value="1" /> + <distance name="bottom_height" value="1" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> +</frame_geometry> + +<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> + <distance name="left_width" value="0" /> + <distance name="right_width" value="0" /> + <distance name="bottom_height" value="0" /> + <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0" /> +</frame_geometry> + +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" rounded_bottom_right="false" rounded_bottom_left="false" parent="small"> +</frame_geometry> + +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" parent="small"> +</frame_geometry> + +<!-- ::: TITLES ::: --> +<draw_ops name="title_focused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_focused" /> +</draw_ops> + +<draw_ops name="title_unfocused"> + <title x="(0 `max` ((width - title_width) / 2)) + 2" + y="(0 `max` ((height - title_height) / 2))" + color="C_title_unfocused" /> +</draw_ops> + +<!-- ::: WINDOW DECORATIONS ::: --> +<draw_ops name="entire_background_focused"> + <rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" /> +</draw_ops> + +<draw_ops name="entire_background_unfocused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_focused"> + <gradient type="vertical" x="0" y="0" width="width" height="title_height"> + <color value="C_highlight_focused" /> + <color value="C_titlebar" /> + </gradient> +</draw_ops> + +<draw_ops name="titlebar_fill_attached_focused"> + <include name="entire_background_focused" /> +</draw_ops> + +<draw_ops name="titlebar_fill_unfocused"> + <gradient type="vertical" x="0" y="0" width="width" height="title_height"> + <color value="C_highlight_unfocused" /> + <color value="C_titlebar" /> + </gradient> +</draw_ops> + +<draw_ops name="titlebar_focused"> + <include name="titlebar_fill_focused" /> +</draw_ops> + +<draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs --> + <include name="titlebar_fill_attached_focused" /> +</draw_ops> + +<draw_ops name="rounded_titlebar_focused"> + <include name="titlebar_fill_focused" /> +</draw_ops> + +<draw_ops name="border_focused"> + <rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="border_unfocused"> + <rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" /> +</draw_ops> + +<draw_ops name="rounded_border_focused"> + <line color="C_border_focused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_focused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_focused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_focused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_focused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="rounded_border_unfocused"> + <line color="C_border_unfocused" x1="2" y1="0" x2="width-3" y2="0" /> + <line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" /> + <line color="C_border_unfocused" x1="0" y1="2" x2="0" y2="height-2" /> + <line color="C_border_unfocused" x1="width-1" y1="2" x2="width-1" y2="height-2" /> + <arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> + <!-- double arcs for darker borders --> + <arc color="C_border_unfocused" x="0" y="0" width="5" height="5" start_angle="270" extent_angle="90" /> + <arc color="C_border_unfocused" x="width-5" y="0" width="4" height="5" start_angle="0" extent_angle="90" /> +</draw_ops> + +<draw_ops name="border_right_focused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_right_unfocused"> + <line + x1="width-1" y1="0" + x2="width-1" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<draw_ops name="border_left_focused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_focused" /> +</draw_ops> + +<draw_ops name="border_left_unfocused"> + <line + x1="0" y1="0" + x2="0" y2="height" + color="C_border_unfocused" /> +</draw_ops> + +<!-- ::: BUTTON ICONS ::: --> +<!-- note: negative values in x or y causes gnome-shell to crash --> +<!-- close icon --> +<draw_ops name="close_focused"> + <image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_focused_prelight"> + <image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_focused_pressed"> + <image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_unfocused"> + <image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="close_unfocused_prelight"> + <include name="close_focused_prelight" /> +</draw_ops> + +<draw_ops name="close_unfocused_pressed"> + <include name="close_focused_pressed" /> +</draw_ops> + +<!-- maximize icon --> +<draw_ops name="maximize_focused"> + <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_focused_prelight"> + <image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_focused_pressed"> + <image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_unfocused"> + <image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_prelight"> + <include name="maximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="maximize_unfocused_pressed"> + <include name="maximize_focused_pressed" /> +</draw_ops> + +<!-- unmaximize icon --> +<draw_ops name="unmaximize_focused"> + <image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_prelight"> + <image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_focused_pressed"> + <image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused"> + <image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_prelight"> + <include name="unmaximize_focused_prelight" /> +</draw_ops> + +<draw_ops name="unmaximize_unfocused_pressed"> + <include name="unmaximize_focused_pressed" /> +</draw_ops> + +<!-- minimize icon --> +<draw_ops name="minimize_focused"> + <image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_focused_prelight"> + <image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_focused_pressed"> + <image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_unfocused"> + <image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_prelight"> + <include name="minimize_focused_prelight" /> +</draw_ops> + +<draw_ops name="minimize_unfocused_pressed"> + <include name="minimize_focused_pressed" /> +</draw_ops> + +<!-- menu icon --> +<draw_ops name="menu_focused"></draw_ops> + +<draw_ops name="menu_focused_prelight"></draw_ops> + +<draw_ops name="menu_focused_pressed"></draw_ops> + +<draw_ops name="menu_unfocused"></draw_ops> + +<draw_ops name="menu_unfocused_prelight"></draw_ops> + +<draw_ops name="menu_unfocused_pressed"></draw_ops> + +<!-- shade icon --> +<draw_ops name="shade_focused"> + <image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_focused_prelight"> + <image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_focused_pressed"> + <image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_unfocused"> + <image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="shade_unfocused_prelight"> + <include name="shade_focused_prelight" /> +</draw_ops> + +<draw_ops name="shade_unfocused_pressed"> + <include name="shade_focused_pressed" /> +</draw_ops> + +<!-- unshade icon --> +<draw_ops name="unshade_focused"> + <image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_focused_prelight"> + <image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_focused_pressed"> + <image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_unfocused"> + <image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_prelight"> + <include name="unshade_focused_prelight" /> +</draw_ops> + +<draw_ops name="unshade_unfocused_pressed"> + <include name="unshade_focused_pressed" /> +</draw_ops> + +<!-- ::: FRAME STYLES ::: --> +<frame_style name="normal_focused" geometry="normal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_unfocused" geometry="normal_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_focused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="normal_max_shaded_unfocused" geometry="max"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_focused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="rounded_titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="rounded_border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="dialog_unfocused" geometry="nobuttons"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="rounded_border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_focused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button><button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="modal_dialog_unfocused" geometry="modal"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_focused" geometry="small"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="utility_unfocused" geometry="small_unfocused"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_focused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="border_unfocused" geometry="border"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="borderless" geometry="borderless"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_focused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_focused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="attached_unfocused" geometry="attached"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_attached_focused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_unfocused" /> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_focused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_right_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_left_unfocused" geometry="tiled_left"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_right_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_focused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_focused" /> + <piece position="titlebar" draw_ops="titlebar_fill_focused" /> + <piece position="title" draw_ops="title_focused" /> + <piece position="overlay" draw_ops="border_left_focused" /> + <button function="close" state="normal" draw_ops="close_focused" /> + <button function="close" state="prelight" draw_ops="close_focused_prelight" /> + <button function="close" state="pressed" draw_ops="close_focused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_focused" /> + <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_focused" /> + <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_focused" /> + <button function="menu" state="prelight" draw_ops="menu_focused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_focused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_focused" /> + <button function="shade" state="prelight" draw_ops="shade_focused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_focused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_focused" /> + <button function="unshade" state="prelight" draw_ops="unshade_focused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_focused_pressed" /> + + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<frame_style name="tiled_right_unfocused" geometry="tiled_right"> + <piece position="entire_background" draw_ops="entire_background_unfocused" /> + <piece position="titlebar" draw_ops="titlebar_fill_unfocused" /> + <piece position="title" draw_ops="title_unfocused" /> + <piece position="overlay" draw_ops="border_left_unfocused" /> + <button function="close" state="normal" draw_ops="close_unfocused" /> + <button function="close" state="prelight" draw_ops="close_unfocused_prelight" /> + <button function="close" state="pressed" draw_ops="close_unfocused_pressed" /> + <button function="maximize" state="normal" draw_ops="maximize_unfocused" /> + <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight" /> + <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed" /> + <button function="minimize" state="normal" draw_ops="minimize_unfocused" /> + <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight" /> + <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed" /> + <button function="menu" state="normal" draw_ops="menu_unfocused" /> + <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" /> + <button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" /> + <button function="shade" state="normal" draw_ops="shade_unfocused" /> + <button function="shade" state="prelight" draw_ops="shade_unfocused_prelight" /> + <button function="shade" state="pressed" draw_ops="shade_unfocused_pressed" /> + <button function="unshade" state="normal" draw_ops="unshade_unfocused" /> + <button function="unshade" state="prelight" draw_ops="unshade_unfocused_prelight" /> + <button function="unshade" state="pressed" draw_ops="unshade_unfocused_pressed" /> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- placeholder for unimplementated styles--> +<frame_style name="blank" geometry="normal"> + <button function="close" state="normal"><draw_ops></draw_ops></button> + <button function="close" state="pressed"><draw_ops></draw_ops></button> + <button function="maximize" state="normal"><draw_ops></draw_ops></button> + <button function="maximize" state="pressed"><draw_ops></draw_ops></button> + <button function="minimize" state="normal"><draw_ops></draw_ops></button> + <button function="minimize" state="pressed"><draw_ops></draw_ops></button> + <button function="menu" state="normal"><draw_ops></draw_ops></button> + <button function="menu" state="pressed"><draw_ops></draw_ops></button> + <button function="shade" state="normal"><draw_ops></draw_ops></button> + <button function="shade" state="prelight"><draw_ops></draw_ops></button> + <button function="shade" state="pressed"><draw_ops></draw_ops></button> + <button function="unshade" state="normal"><draw_ops></draw_ops></button> + <button function="unshade" state="prelight"><draw_ops></draw_ops></button> + <button function="unshade" state="pressed"><draw_ops></draw_ops></button> + <button function="above" state="normal"><draw_ops></draw_ops></button> + <button function="above" state="pressed"><draw_ops></draw_ops></button> + <button function="unabove" state="normal"><draw_ops></draw_ops></button> + <button function="unabove" state="pressed"><draw_ops></draw_ops></button> + <button function="stick" state="normal"><draw_ops></draw_ops></button> + <button function="stick" state="pressed"><draw_ops></draw_ops></button> + <button function="unstick" state="normal"><draw_ops></draw_ops></button> + <button function="unstick" state="pressed"><draw_ops></draw_ops></button> +</frame_style> + +<!-- ::: FRAME STYLE SETS ::: --> +<frame_style_set name="normal_style_set"> + <frame focus="yes" state="normal" resize="both" style="normal_focused" /> + <frame focus="no" state="normal" resize="both" style="normal_unfocused" /> + <frame focus="yes" state="maximized" style="normal_max_focused" /> + <frame focus="no" state="maximized" style="normal_max_unfocused" /> + <frame focus="yes" state="shaded" style="normal_focused" /> + <frame focus="no" state="shaded" style="normal_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused" /> + <frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused" /> +</frame_style_set> + +<frame_style_set name="dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="dialog_focused" /> + <frame focus="no" state="shaded" style="dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="modal_dialog_style_set"> + <frame focus="yes" state="normal" resize="both" style="modal_dialog_focused" /> + <frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="modal_dialog_focused" /> + <frame focus="no" state="shaded" style="modal_dialog_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="utility_style_set"> + <frame focus="yes" state="normal" resize="both" style="utility_focused" /> + <frame focus="no" state="normal" resize="both" style="utility_unfocused" /> + <frame focus="yes" state="maximized" style="blank" /> + <frame focus="no" state="maximized" style="blank" /> + <frame focus="yes" state="shaded" style="utility_focused" /> + <frame focus="no" state="shaded" style="utility_unfocused" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<frame_style_set name="border_style_set"> + <frame focus="yes" state="normal" resize="both" style="border_focused" /> + <frame focus="no" state="normal" resize="both" style="border_unfocused" /> + <frame focus="yes" state="maximized" style="borderless" /> + <frame focus="no" state="maximized" style="borderless" /> + <frame focus="yes" state="shaded" style="blank" /> + <frame focus="no" state="shaded" style="blank" /> + <frame focus="yes" state="maximized_and_shaded" style="blank" /> + <frame focus="no" state="maximized_and_shaded" style="blank" /> +</frame_style_set> + +<!-- ::: WINDOWS ::: --> +<window type="normal" style_set="normal_style_set" /> +<window type="dialog" style_set="dialog_style_set" /> +<window type="modal_dialog" style_set="modal_dialog_style_set" /> +<window type="menu" style_set="utility_style_set" /> +<window type="utility" style_set="utility_style_set" /> +<window type="border" style_set="border_style_set" /> + +</metacity_theme> diff -Nru shimmer-themes-1.6.1/orion/metacity-1/metacity-theme-3.xml shimmer-themes-1.6.2/orion/metacity-1/metacity-theme-3.xml --- shimmer-themes-1.6.1/orion/metacity-1/metacity-theme-3.xml 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/metacity-1/metacity-theme-3.xml 2013-09-14 14:35:27.000000000 -0400 @@ -9,6 +9,8 @@ </info> <!-- ::: CONSTANTS ::: --> +<constant name="C_titlebar_gradient_a" value="gtk:custom(wm_bg_a,shade/gtk:bg[NORMAL]/1.05)" /> +<constant name="C_titlebar_gradient_b" value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" /> <constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.7)" /> <constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.8)" /> <constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1)" /> @@ -21,9 +23,9 @@ <distance name="bottom_height" value="1" /> <distance name="left_titlebar_edge" value="4" /> <distance name="right_titlebar_edge" value="4" /> - <distance name="title_vertical_pad" value="10" /> + <distance name="title_vertical_pad" value="4" /> <aspect_ratio name="button" value="1.0" /> - <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> @@ -44,12 +46,15 @@ </frame_geometry> <frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false"> - <distance name="title_vertical_pad" value="10" /> - <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <distance name="title_vertical_pad" value="4" /> + <border name="title_border" left="8" right="8" top="4" bottom="4" /> <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="small_unfocused" parent="small" /> +<frame_geometry name="small_unfocused" parent="small"> + <distance name="left_titlebar_edge" value="1"/> + <distance name="right_titlebar_edge" value="1"/> +</frame_geometry> <frame_geometry name="nobuttons" hide_buttons="true" parent="normal" /> @@ -58,23 +63,23 @@ <distance name="right_width" value="1" /> <distance name="bottom_height" value="1" /> <distance name="title_vertical_pad" value="0" /> + <border name="title_border" left="0" right="0" top="0" bottom="0" /> + <border name="button_border" left="0" right="0" top="0" bottom="0"/> </frame_geometry> <frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal"> <distance name="left_width" value="0" /> <distance name="right_width" value="0" /> <distance name="bottom_height" value="0" /> - <distance name="title_vertical_pad" value="0"/> + <distance name="title_vertical_pad" value="0" /> <border name="title_border" left="0" right="0" top="0" bottom="0" /> <border name="button_border" left="0" right="0" top="0" bottom="0" /> </frame_geometry> -<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" rounded_bottom_right="2" rounded_bottom_left="2" parent="small"> - <distance name="title_vertical_pad" value="2" /> +<frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" rounded_bottom_right="false" rounded_bottom_left="false" parent="small"> </frame_geometry> -<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small"> - <distance name="title_vertical_pad" value="0" /> +<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="2" rounded_top_right="2" parent="small"> </frame_geometry> <!-- ::: TITLES ::: --> @@ -104,7 +109,7 @@ <!-- ::: WINDOW DECORATIONS ::: --> <draw_ops name="entire_background_focused"> - <rectangle color="gtk:custom(wm_bg,gtk:bg[NORMAL])" x="0" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_titlebar_gradient_b" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="entire_background_unfocused"> @@ -113,8 +118,8 @@ <draw_ops name="titlebar_fill_focused"> <gradient type="vertical" x="0" y="0" width="width" height="title_height"> - <color value="shade/gtk:custom(wm_bg,gtk:bg[NORMAL])/1.05" /> - <color value="shade/gtk:custom(wm_bg,gtk:bg[NORMAL])/1.00" /> + <color value="C_titlebar_gradient_a" /> + <color value="C_titlebar_gradient_b" /> </gradient> </draw_ops> @@ -124,8 +129,8 @@ <draw_ops name="titlebar_fill_unfocused"> <gradient type="vertical" x="0" y="0" width="width" height="title_height"> - <color value="shade/gtk:custom(wm_bg,gtk:bg[NORMAL])/1.02" /> - <color value="shade/gtk:custom(wm_bg,gtk:bg[NORMAL])/1.00" /> + <color value="C_titlebar_gradient_a" /> + <color value="C_titlebar_gradient_b" /> </gradient> </draw_ops> Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/bottom-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/bottom-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/bottom-active.xpm shimmer-themes-1.6.2/orion/xfwm4/bottom-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/bottom-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/bottom-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,8 +1,8 @@ /* XPM */ static char * bottom_active_xpm[] = { -"1 2 3 1", +"1 2 2 1", " c None", -". c #EEEEEE", -"+ c #BDBDBD", +". c #EEEEEE s inactive_color_2", ".", -"+"}; +".", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/bottom-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/bottom-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/bottom-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/bottom-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/bottom-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/bottom-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,8 +1,8 @@ /* XPM */ static char * bottom_inactive_xpm[] = { -"1 2 3 1", +"1 2 2 1", " c None", -". c #EEEEEE", -"+ c #C9C9C9", +". c #EEEEEE s inactive_color_2", ".", -"+"}; +".", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/bottom-left-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/bottom-left-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/bottom-left-active.xpm shimmer-themes-1.6.2/orion/xfwm4/bottom-left-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/bottom-left-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/bottom-left-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,8 +1,8 @@ /* XPM */ static char * bottom_left_active_xpm[] = { -"2 2 3 1", +"2 2 2 1", " c None", -". c #BDBDBD", -"+ c #EEEEEE", -".+", -".."}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/bottom-left-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/bottom-left-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/bottom-left-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/bottom-left-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/bottom-left-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/bottom-left-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,8 +1,8 @@ /* XPM */ static char * bottom_left_inactive_xpm[] = { -"2 2 3 1", +"2 2 2 1", " c None", -". c #C9C9C9", -"+ c #EEEEEE", -".+", -".."}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/bottom-right-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/bottom-right-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/bottom-right-active.xpm shimmer-themes-1.6.2/orion/xfwm4/bottom-right-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/bottom-right-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/bottom-right-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,8 +1,8 @@ /* XPM */ static char * bottom_right_active_xpm[] = { -"2 2 3 1", +"2 2 2 1", " c None", -". c #EEEEEE", -"+ c #BDBDBD", -".+", -"++"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/bottom-right-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/bottom-right-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/bottom-right-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/bottom-right-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/bottom-right-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/bottom-right-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,8 +1,8 @@ /* XPM */ static char * bottom_right_inactive_xpm[] = { -"2 2 3 1", +"2 2 2 1", " c None", -". c #EEEEEE", -"+ c #C9C9C9", -".+", -"++"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +} diff -Nru shimmer-themes-1.6.1/orion/xfwm4/close-active.xpm shimmer-themes-1.6.2/orion/xfwm4/close-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/close-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/close-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * close_active_xpm[] = { -"23 18 107 2", +"23 16 107 2", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -108,8 +108,7 @@ ">. c #E6E8E9", ",. c #EDEEEE", "'. c #EEEEEE", -" ", -". + @ # # # # # # # # # # # # # # # # # @ + . ", +" + @ # # # # # # # # # # # # # # # # # @ + ", "$ % & * = - - - - - - - - - - - - - = * & % ; ", "> , ' ) ! ~ { { { { { { { { { { { ~ ! ) ' ] ^ ", "/ ( _ : < [ [ [ [ [ [ [ [ [ [ [ [ [ < : _ ( / ", @@ -124,5 +123,4 @@ "O P Q R S T T T T T T T T T T T T T S R Q P O ", "f U V W X Y Y Y Y Y Y Y Y Y Y Y Y Y X W V Z ` ", " ...+.U @.#.#.#.#.#.#.#.#.#.#.#.#.#.@.U +...$.", -"%.&.*.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.*.&.-.", -";.>.,.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.,.>.;."}; +" &.*.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.=.*.&. "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/close-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/close-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/close-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/close-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * close_inactive_xpm[] = { -"23 18 41 1", +"23 16 41 1", " c None", ". c #DFDFDF", "+ c #BABABA", @@ -42,8 +42,7 @@ "0 c #E8E8E8", "a c #EDEDED", "b c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*.*************.*&%%", "#=-;---------------;-=>", ",=';---------------;'=,", @@ -58,5 +57,4 @@ "12[}}}}}}}}}}}}}}}}}[21", "{3222[[[[[[[[[[[[[2224,", "56733222222222222233765", -"_8#11111111111111111#8_", -"90abbbbbbbbbbbbbbbbba09"}; +" 8#11111111111111111#8 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/close-prelight.xpm shimmer-themes-1.6.2/orion/xfwm4/close-prelight.xpm --- shimmer-themes-1.6.1/orion/xfwm4/close-prelight.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/close-prelight.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * close_prelight_xpm[] = { -"23 18 55 1", +"23 16 55 1", " c None", ". c #DEDEDE", "+ c #BEBEBE", @@ -56,8 +56,7 @@ "n c #E7E7E7", "o c #EDEEEE", "p c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*===============*&%-", ";>,')!!!!!!!!!!!!!)',>~", "#{])^^^^^^^^^^^^^^^)]{#", @@ -72,5 +71,4 @@ "0ab}_______________}ba0", "<cd8b5555555555555b8de#", "+fgcadddddddddddddacgfh", -"ij#kkkkkkkkkkkkkkkkk#jl", -"mnoppppppppppppppppponm"}; +" j#kkkkkkkkkkkkkkkkk#j "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/close-pressed.xpm shimmer-themes-1.6.2/orion/xfwm4/close-pressed.xpm --- shimmer-themes-1.6.1/orion/xfwm4/close-pressed.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/close-pressed.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * close_pressed_xpm[] = { -"23 18 103 2", +"23 16 103 2", " c None", ". c #D0D4D6", "+ c #9EA0A2", @@ -104,8 +104,7 @@ "*. c #E1E3E4", "=. c #ECEEEE", "-. c #EEEEEE", -" ", -". + @ # # # # # # # # # # # # # # # # # @ + . ", +" + @ # # # # # # # # # # # # # # # # # @ + ", "$ % & * = - - - - - - - - - - - - - = * & % ; ", "# > , ' ) ! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ! ) ' , { ] ", "^ / ( _ : < < < < < < < < < < < < < : _ ( / ^ ", @@ -120,5 +119,4 @@ "z L M N O P P P P P P P P P P P P P O N M L z ", "e Q R S T U U U U U U U U U U U U U T S R V W ", "X Y Z Q ` . . . . . . . . . . . . .` Q Z Y ..", -"+.@.#.$.$.$.$.$.$.$.$.$.$.$.$.$.$.$.$.$.#.@.%.", -"&.*.=.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.=.*.&."}; +" @.#.$.$.$.$.$.$.$.$.$.$.$.$.$.$.$.$.$.#.@. "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/hide-active.xpm shimmer-themes-1.6.2/orion/xfwm4/hide-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/hide-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/hide-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * hide_active_xpm[] = { -"23 18 50 1", +"23 16 50 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -51,8 +51,7 @@ "i c #EDEEEE", "j c #EEEEEE", "k c #E4E7E8", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -67,5 +66,4 @@ "23333333333333333333332", "/4555555555555555555567", "8904444444444444444409a", -"bcdeeeeeeeeeeeeeeeeedcf", -"ghijjjjjjjjjjjjjjjjjihk"}; +" cdeeeeeeeeeeeeeeeeedc "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/hide-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/hide-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/hide-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/hide-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * hide_inactive_xpm[] = { -"23 18 36 1", +"23 16 36 1", " c None", ". c #DFDFDF", "+ c #BABABA", @@ -37,8 +37,7 @@ "5 c #EDEDED", "6 c #EEEEEE", "7 c #E6E6E6", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "#-;&&&&&&&&&&&&&&&&&;>,", "'---------------------'", @@ -53,5 +52,4 @@ ":<<<<<<<<<<<<<<<<<<<<<:", "~[}}}}}}}}}}}}}}}}}}}|'", "123[[[[[[[[[[[[[[[[[321", -")4#:::::::::::::::::#4)", -";*5666666666666666665*7"}; +" 4#:::::::::::::::::#4 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/hide-prelight.xpm shimmer-themes-1.6.2/orion/xfwm4/hide-prelight.xpm --- shimmer-themes-1.6.1/orion/xfwm4/hide-prelight.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/hide-prelight.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * hide_prelight_xpm[] = { -"23 18 43 1", +"23 16 43 1", " c None", ". c #DCEFEF", "+ c #B7B7B7", @@ -44,8 +44,7 @@ "b c #EDEEEE", "c c #EEEEEE", "d c #E4EEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "#!!!!!!!!!!!!!!!!!!!!!#", @@ -60,5 +59,4 @@ "|111111111111111111111|", "/233333333333333333332{", "+4522222222222222222546", -"78#99999999999999999#80", -"a*bcccccccccccccccccb*d"}; +" 8#99999999999999999#8 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/hide-pressed.xpm shimmer-themes-1.6.2/orion/xfwm4/hide-pressed.xpm --- shimmer-themes-1.6.1/orion/xfwm4/hide-pressed.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/hide-pressed.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * hide_pressed_xpm[] = { -"23 18 50 1", +"23 16 50 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -51,8 +51,7 @@ "i c #EDEEEE", "j c #EEEEEE", "k c #E4E6E8", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -67,5 +66,4 @@ "23333333333333333333332", "/4555555555555555555567", "8904444444444444444409a", -"bcdeeeeeeeeeeeeeeeeedcf", -"ghijjjjjjjjjjjjjjjjjihk"}; +" cdeeeeeeeeeeeeeeeeedc "}; Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/left-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/left-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/left-active.xpm shimmer-themes-1.6.2/orion/xfwm4/left-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/left-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/left-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,7 +1,7 @@ /* XPM */ static char * left_active_xpm[] = { -"2 1 3 1", +"2 1 2 1", " c None", -". c #BDBDBD", -"+ c #EEEEEE", -".+"}; +". c #EEEEEE s inactive_color_2", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/left-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/left-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/left-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/left-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/left-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/left-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,7 +1,7 @@ /* XPM */ static char * left_inactive_xpm[] = { -"2 1 3 1", +"2 1 2 1", " c None", -". c #C9C9C9", -"+ c #EEEEEE", -".+"}; +". c #EEEEEE s inactive_color_2", +"..", +} diff -Nru shimmer-themes-1.6.1/orion/xfwm4/maximize-active.xpm shimmer-themes-1.6.2/orion/xfwm4/maximize-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/maximize-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/maximize-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_active_xpm[] = { -"23 18 52 1", +"23 16 52 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -53,8 +53,7 @@ "k c #E6E8E9", "l c #EDEEEE", "m c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -69,5 +68,4 @@ "56666666666666666666665", "(7888888888888888888890", "abc77777777777777777cbd", -"efghhhhhhhhhhhhhhhhhgfi", -"jklmmmmmmmmmmmmmmmmmlkj"}; +" fghhhhhhhhhhhhhhhhhgf "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/maximize-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/maximize-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/maximize-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/maximize-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_inactive_xpm[] = { -"23 18 39 1", +"23 16 39 1", " c None", ". c #DFDFDF", "+ c #BABABA", @@ -40,8 +40,7 @@ "8 c #E6E6E6", "9 c #EDEDED", "0 c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "#-;&&&&&&&&&&&&&&&&&;>,", "'---------------------'", @@ -56,5 +55,4 @@ "}|||||||||||||||||||||}", "{122222222222222222223'", "45611111111111111111654", -")7#}}}}}}}}}}}}}}}}}#7)", -"8*9000000000000000009*8"}; +" 7#}}}}}}}}}}}}}}}}}#7 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/maximize-prelight.xpm shimmer-themes-1.6.2/orion/xfwm4/maximize-prelight.xpm --- shimmer-themes-1.6.1/orion/xfwm4/maximize-prelight.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/maximize-prelight.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_prelight_xpm[] = { -"23 18 45 1", +"23 16 45 1", " c None", ". c #DCEFEF", "+ c #B7B7B7", @@ -46,8 +46,7 @@ "d c #E4EEEE", "e c #EDEEEE", "f c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "#!!!!!!!!!!!!!!!!!!!!!#", @@ -62,5 +61,4 @@ "34444444444444444444443", "(566666666666666666665{", "+7855555555555555555879", -"0a#bbbbbbbbbbbbbbbbb#ac", -"d*efffffffffffffffffe*d"}; +" a#bbbbbbbbbbbbbbbbb#a "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/maximize-pressed.xpm shimmer-themes-1.6.2/orion/xfwm4/maximize-pressed.xpm --- shimmer-themes-1.6.1/orion/xfwm4/maximize-pressed.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/maximize-pressed.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * maximize_pressed_xpm[] = { -"23 18 52 1", +"23 16 52 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -53,8 +53,7 @@ "k c #E6E8E9", "l c #EDEEEE", "m c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -69,5 +68,4 @@ "56666666666666666666665", "(7888888888888888888890", "abc77777777777777777cbd", -"efghhhhhhhhhhhhhhhhhgfi", -"jklmmmmmmmmmmmmmmmmmlkj"}; +" fghhhhhhhhhhhhhhhhhgf "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/menu-active.xpm shimmer-themes-1.6.2/orion/xfwm4/menu-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/menu-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/menu-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * menu_active_xpm[] = { -"23 18 48 1", +"23 16 48 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -49,8 +49,7 @@ "g c #EDEEEE", "h c #EEEEEE", "i c #E4E7E8", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -65,5 +64,4 @@ "|111111111111111111111|", "/2333333333333333333345", "67822222222222222222879", -"0abcccccccccccccccccbad", -"efghhhhhhhhhhhhhhhhhgfi"}; +" abcccccccccccccccccba "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/menu-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/menu-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/menu-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/menu-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * menu_inactive_xpm[] = { -"23 18 35 1", +"23 16 35 1", " c None", ". c #DFDFDF", "+ c #BABABA", @@ -36,8 +36,7 @@ "4 c #EDEDED", "5 c #EEEEEE", "6 c #E6E6E6", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "#-;&&&&&&&&&&&&&&&&&;>,", "'---------------------'", @@ -52,5 +51,4 @@ "_:::::::::::::::::::::_", "~<[[[[[[[[[[[[[[[[[[[}'", "|12<<<<<<<<<<<<<<<<<21|", -")3#_________________#3)", -";*4555555555555555554*6"}; +" 3#_________________#3 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/menu-prelight.xpm shimmer-themes-1.6.2/orion/xfwm4/menu-prelight.xpm --- shimmer-themes-1.6.1/orion/xfwm4/menu-prelight.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/menu-prelight.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * menu_prelight_xpm[] = { -"23 18 42 1", +"23 16 42 1", " c None", ". c #DCEFEF", "+ c #B7B7B7", @@ -43,8 +43,7 @@ "a c #EDEEEE", "b c #EEEEEE", "c c #E4EEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "#!!!!!!!!!!!!!!!!!!!!!#", @@ -59,5 +58,4 @@ "}|||||||||||||||||||||}", "/122222222222222222221{", "+3411111111111111111435", -"67#88888888888888888#79", -"0*abbbbbbbbbbbbbbbbba*c"}; +" 7#88888888888888888#7 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/menu-pressed.xpm shimmer-themes-1.6.2/orion/xfwm4/menu-pressed.xpm --- shimmer-themes-1.6.1/orion/xfwm4/menu-pressed.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/menu-pressed.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * menu_pressed_xpm[] = { -"23 18 48 1", +"23 16 48 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -49,8 +49,7 @@ "g c #EDEEEE", "h c #EEEEEE", "i c #E4E6E8", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -65,5 +64,4 @@ "|111111111111111111111|", "/2333333333333333333345", "67822222222222222222879", -"0abcccccccccccccccccbad", -"efghhhhhhhhhhhhhhhhhgfi"}; +" abcccccccccccccccccba "}; Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/right-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/right-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/right-active.xpm shimmer-themes-1.6.2/orion/xfwm4/right-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/right-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/right-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,7 +1,7 @@ /* XPM */ static char * right_active_xpm[] = { -"2 1 3 1", +"2 1 2 1", " c None", -". c #EEEEEE", -"+ c #BDBDBD", -".+"}; +". c #EEEEEE s inactive_color_2", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/right-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/right-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/right-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/right-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/right-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/right-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,7 +1,7 @@ /* XPM */ static char * right_inactive_xpm[] = { -"2 1 3 1", +"2 1 2 1", " c None", -". c #EEEEEE", -"+ c #C9C9C9", -".+"}; +". c #EEEEEE s inactive_color_2", +"..", +} diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-active.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_active_xpm[] = { -"23 18 54 1", +"23 16 54 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -55,8 +55,7 @@ "m c #E6E8E9", "n c #EDEEEE", "o c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -71,5 +70,4 @@ "78888888888888888888887", "(90000000000000000000ab", "cde99999999999999999edf", -"ghijjjjjjjjjjjjjjjjjihk", -"lmnooooooooooooooooonml"}; +" hijjjjjjjjjjjjjjjjjih "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_inactive_xpm[] = { -"23 18 40 1", +"23 16 40 1", " c None", ". c #DFDFDF", "+ c #BABABA", @@ -41,8 +41,7 @@ "9 c #E6E6E6", "0 c #EDEDED", "a c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "#-;&&&&&&&&&&&&&&&&&;>,", "'---------------------'", @@ -57,5 +56,4 @@ "|111111111111111111111|", "{233333333333333333334'", "56722222222222222222765", -")8#|||||||||||||||||#8)", -"9*0aaaaaaaaaaaaaaaaa0*9"}; +" 8#|||||||||||||||||#8 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-prelight.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-prelight.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-prelight.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-prelight.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_prelight_xpm[] = { -"23 18 48 1", +"23 16 48 1", " c None", ". c #DCEFEF", "+ c #B7B7B7", @@ -49,8 +49,7 @@ "g c #E4EEEE", "h c #EDEEEE", "i c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "#!!!!!!!!!!!!!!!!!!!!!#", @@ -65,5 +64,4 @@ "67777777777777777777776", "(899999999999999999998{", "+0a88888888888888888a0b", -"cd#eeeeeeeeeeeeeeeee#df", -"g*hiiiiiiiiiiiiiiiiih*g"}; +" d#eeeeeeeeeeeeeeeee#d "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-pressed.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-pressed.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-pressed.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-pressed.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_pressed_xpm[] = { -"23 18 55 1", +"23 16 55 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -56,8 +56,7 @@ "n c #E6E8E9", "o c #EDEEEE", "p c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -72,5 +71,4 @@ "89999999999999999999998", "(0aaaaaaaaaaaaaaaaaaabc", "def00000000000000000feg", -"hijkkkkkkkkkkkkkkkkkjil", -"mnoppppppppppppppppponm"}; +" ijkkkkkkkkkkkkkkkkkji "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-active.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_toggled_active_xpm[] = { -"23 18 53 1", +"23 16 53 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -54,8 +54,7 @@ "l c #E6E8E9", "m c #EDEEEE", "n c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -70,5 +69,4 @@ "67777777777777777777776", "(899999999999999999990a", "bcd88888888888888888dce", -"fghiiiiiiiiiiiiiiiiihgj", -"klmnnnnnnnnnnnnnnnnnmlk"}; +" ghiiiiiiiiiiiiiiiiihg "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_toggled_inactive_xpm[] = { -"23 18 38 1", +"23 16 38 1", " c None", ". c #DFDFDF", "+ c #BABABA", @@ -39,8 +39,7 @@ "7 c #E6E6E6", "8 c #EDEDED", "9 c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "#-;&&&&&&&&&&&&&&&&&;>,", "'---------------------'", @@ -55,5 +54,4 @@ "[}}}}}}}}}}}}}}}}}}}}}[", "{|11111111111111111112'", "345|||||||||||||||||543", -")6#[[[[[[[[[[[[[[[[[#6)", -"7*8999999999999999998*7"}; +" 6#[[[[[[[[[[[[[[[[[#6 "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-prelight.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-prelight.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-prelight.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-prelight.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_toggled_prelight_xpm[] = { -"23 18 45 1", +"23 16 45 1", " c None", ". c #DCEFEF", "+ c #B7B7B7", @@ -46,8 +46,7 @@ "d c #E4EEEE", "e c #EDEEEE", "f c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "#!!!!!!!!!!!!!!!!!!!!!#", @@ -62,5 +61,4 @@ "34444444444444444444443", "(566666666666666666665{", "+7855555555555555555879", -"0a#bbbbbbbbbbbbbbbbb#ac", -"d*efffffffffffffffffe*d"}; +" a#bbbbbbbbbbbbbbbbb#a "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-pressed.xpm shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-pressed.xpm --- shimmer-themes-1.6.1/orion/xfwm4/shade-toggled-pressed.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/shade-toggled-pressed.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,6 +1,6 @@ /* XPM */ static char * shade_toggled_pressed_xpm[] = { -"23 18 53 1", +"23 16 53 1", " c None", ". c #DCE0E2", "+ c #B7BABC", @@ -54,8 +54,7 @@ "l c #E6E8E9", "m c #EDEEEE", "n c #EEEEEE", -" ", -".+@#################@+.", +" +@#################@+ ", "$%&*****************&%=", "-;>,,,,,,,,,,,,,,,,,>')", "!~~~~~~~~~~~~~~~~~~~~~!", @@ -70,5 +69,4 @@ "67777777777777777777776", "(899999999999999999990a", "bcd88888888888888888dce", -"fghiiiiiiiiiiiiiiiiihgj", -"klmnnnnnnnnnnnnnnnnnmlk"}; +" ghiiiiiiiiiiiiiiiiihg "}; diff -Nru shimmer-themes-1.6.1/orion/xfwm4/themerc shimmer-themes-1.6.2/orion/xfwm4/themerc --- shimmer-themes-1.6.1/orion/xfwm4/themerc 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/themerc 2013-09-14 14:35:27.000000000 -0400 @@ -12,8 +12,8 @@ title_horizontal_offset=6 title_shadow_active=false title_shadow_inactive=false -title_vertical_offset_active=2 -title_vertical_offset_inactive=2 +title_vertical_offset_active=1 +title_vertical_offset_inactive=1 title_shadow_active=false title_shadow_inactive=false shadow_delta_height=0 Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-1-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-1-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-1-active.xpm shimmer-themes-1.6.2/orion/xfwm4/title-1-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-1-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-1-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,46 +1,36 @@ /* XPM */ static char * title_1_active_xpm[] = { -"2 30 13 1", +"2 30 2 1", " c None", -". c #BFBFBF", -"+ c #F8F8F8", -"@ c #F7F7F7", -"# c #F6F6F6", -"$ c #F5F5F5", -"% c #F4F4F4", -"& c #F3F3F3", -"* c #F2F2F2", -"= c #F1F1F1", -"- c #F0F0F0", -"; c #EFEFEF", -"> c #EEEEEE", -"..", -"++", -"@@", -"@@", -"@@", -"##", -"$$", -"$$", -"%%", -"&&", -"&&", -"&&", -"**", -"==", -"==", -"--", -"--", -";;", -"==", -"==", -"--", -"--", -";;", -";;", -">>", -">>", -">>", -">>", -">>", -">>"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-1-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-1-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-1-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/title-1-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-1-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-1-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,36 +1,36 @@ /* XPM */ static char * title_1_inactive_xpm[] = { -"2 30 3 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #EEEEEE", +". c #EEEEEE s inactive_color_2", "..", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-2-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-2-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-2-active.xpm shimmer-themes-1.6.2/orion/xfwm4/title-2-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-2-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-2-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,46 +1,36 @@ /* XPM */ static char * title_2_active_xpm[] = { -"2 30 13 1", +"2 30 2 1", " c None", -". c #BFBFBF", -"+ c #F8F8F8", -"@ c #F7F7F7", -"# c #F6F6F6", -"$ c #F5F5F5", -"% c #F4F4F4", -"& c #F3F3F3", -"* c #F2F2F2", -"= c #F1F1F1", -"- c #F0F0F0", -"; c #EFEFEF", -"> c #EEEEEE", -"..", -"++", -"@@", -"@@", -"@@", -"##", -"$$", -"$$", -"%%", -"&&", -"&&", -"&&", -"**", -"==", -"==", -"--", -"--", -";;", -"==", -"==", -"--", -"--", -";;", -";;", -">>", -">>", -">>", -">>", -">>", -">>"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-2-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-2-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-2-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/title-2-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-2-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-2-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,36 +1,36 @@ /* XPM */ static char * title_2_inactive_xpm[] = { -"2 30 3 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #EEEEEE", +". c #EEEEEE s inactive_color_2", "..", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-3-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-3-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-3-active.xpm shimmer-themes-1.6.2/orion/xfwm4/title-3-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-3-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-3-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,46 +1,36 @@ /* XPM */ static char * title_3_active_xpm[] = { -"2 30 13 1", +"2 30 2 1", " c None", -". c #BFBFBF", -"+ c #F8F8F8", -"@ c #F7F7F7", -"# c #F6F6F6", -"$ c #F5F5F5", -"% c #F4F4F4", -"& c #F3F3F3", -"* c #F2F2F2", -"= c #F1F1F1", -"- c #F0F0F0", -"; c #EFEFEF", -"> c #EEEEEE", -"..", -"++", -"@@", -"@@", -"@@", -"##", -"$$", -"$$", -"%%", -"&&", -"&&", -"&&", -"**", -"==", -"==", -"--", -"--", -";;", -"==", -"==", -"--", -"--", -";;", -";;", -">>", -">>", -">>", -">>", -">>", -">>"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-3-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-3-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-3-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/title-3-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-3-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-3-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,36 +1,36 @@ /* XPM */ static char * title_3_inactive_xpm[] = { -"2 30 3 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #EEEEEE", +". c #EEEEEE s inactive_color_2", "..", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-4-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-4-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-4-active.xpm shimmer-themes-1.6.2/orion/xfwm4/title-4-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-4-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-4-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,46 +1,36 @@ /* XPM */ static char * title_4_active_xpm[] = { -"2 30 13 1", +"2 30 2 1", " c None", -". c #BFBFBF", -"+ c #F8F8F8", -"@ c #F7F7F7", -"# c #F6F6F6", -"$ c #F5F5F5", -"% c #F4F4F4", -"& c #F3F3F3", -"* c #F2F2F2", -"= c #F1F1F1", -"- c #F0F0F0", -"; c #EFEFEF", -"> c #EEEEEE", -"..", -"++", -"@@", -"@@", -"@@", -"##", -"$$", -"$$", -"%%", -"&&", -"&&", -"&&", -"**", -"==", -"==", -"--", -"--", -";;", -"==", -"==", -"--", -"--", -";;", -";;", -">>", -">>", -">>", -">>", -">>", -">>"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-4-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-4-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-4-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/title-4-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-4-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-4-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,36 +1,36 @@ /* XPM */ static char * title_4_inactive_xpm[] = { -"2 30 3 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #EEEEEE", +". c #EEEEEE s inactive_color_2", "..", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-5-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-5-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-5-active.xpm shimmer-themes-1.6.2/orion/xfwm4/title-5-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-5-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-5-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,46 +1,36 @@ /* XPM */ static char * title_5_active_xpm[] = { -"2 30 13 1", +"2 30 2 1", " c None", -". c #BFBFBF", -"+ c #F8F8F8", -"@ c #F7F7F7", -"# c #F6F6F6", -"$ c #F5F5F5", -"% c #F4F4F4", -"& c #F3F3F3", -"* c #F2F2F2", -"= c #F1F1F1", -"- c #F0F0F0", -"; c #EFEFEF", -"> c #EEEEEE", -"..", -"++", -"@@", -"@@", -"@@", -"##", -"$$", -"$$", -"%%", -"&&", -"&&", -"&&", -"**", -"==", -"==", -"--", -"--", -";;", -"==", -"==", -"--", -"--", -";;", -";;", -">>", -">>", -">>", -">>", -">>", -">>"}; +". c #EEEEEE s inactive_color_2", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/title-5-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/title-5-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/title-5-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/title-5-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/title-5-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/title-5-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,36 +1,36 @@ /* XPM */ static char * title_5_inactive_xpm[] = { -"2 30 3 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #EEEEEE", +". c #EEEEEE s inactive_color_2", "..", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++", -"++"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/top-left-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/top-left-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/top-left-active.xpm shimmer-themes-1.6.2/orion/xfwm4/top-left-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/top-left-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/top-left-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,45 +1,36 @@ /* XPM */ static char * top_left_active_xpm[] = { -"2 30 12 1", +"2 30 2 1", " c None", -". c #C0C0C0", -"+ c #F7F7F7", -"@ c #F6F6F6", -"# c #F5F5F5", -"$ c #F4F4F4", -"% c #F3F3F3", -"& c #F2F2F2", -"* c #F1F1F1", -"= c #F0F0F0", -"- c #EFEFEF", -"; c #EEEEEE", +". c #EEEEEE s inactive_color_2", " .", "..", -".+", -".+", -".@", -".@", -".#", -".#", -".$", -".%", -".%", -".%", -".&", -".*", -".*", -".=", -".=", -".-", -".-", -".*", -".=", -".-", -".-", -".-", -".;", -".;", -".;", -".;", -".;", -".;"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/top-left-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/top-left-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/top-left-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/top-left-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/top-left-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/top-left-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,37 +1,36 @@ /* XPM */ static char * top_left_inactive_xpm[] = { -"2 30 4 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #E6E6E6", -"@ c #EEEEEE", +". c #EEEEEE s inactive_color_2", " .", "..", -".+", -".+", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@", -".@"}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/top-right-active.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/top-right-active.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/top-right-active.xpm shimmer-themes-1.6.2/orion/xfwm4/top-right-active.xpm --- shimmer-themes-1.6.1/orion/xfwm4/top-right-active.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/top-right-active.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,45 +1,36 @@ /* XPM */ static char * top_right_active_xpm[] = { -"2 30 12 1", +"2 30 2 1", " c None", -". c #C0C0C0", -"+ c #F7F7F7", -"@ c #F6F6F6", -"# c #F5F5F5", -"$ c #F4F4F4", -"% c #F3F3F3", -"& c #F2F2F2", -"* c #F1F1F1", -"= c #F0F0F0", -"- c #EFEFEF", -"; c #EEEEEE", +". c #EEEEEE s inactive_color_2", ". ", "..", -"+.", -"+.", -"@.", -"@.", -"#.", -"#.", -"$.", -"%.", -"%.", -"%.", -"&.", -"*.", -"*.", -"=.", -"=.", -"-.", -"-.", -"*.", -"=.", -"-.", -"-.", -"-.", -";.", -";.", -";.", -";.", -";.", -";."}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +} Binary files /tmp/9BV9bpJBy9/shimmer-themes-1.6.1/orion/xfwm4/top-right-inactive.png and /tmp/kQWVBlJozP/shimmer-themes-1.6.2/orion/xfwm4/top-right-inactive.png differ diff -Nru shimmer-themes-1.6.1/orion/xfwm4/top-right-inactive.xpm shimmer-themes-1.6.2/orion/xfwm4/top-right-inactive.xpm --- shimmer-themes-1.6.1/orion/xfwm4/top-right-inactive.xpm 2013-07-07 16:20:41.000000000 -0400 +++ shimmer-themes-1.6.2/orion/xfwm4/top-right-inactive.xpm 2013-09-14 14:35:27.000000000 -0400 @@ -1,37 +1,36 @@ /* XPM */ static char * top_right_inactive_xpm[] = { -"2 30 4 1", +"2 30 2 1", " c None", -". c #CACACA", -"+ c #E6E6E6", -"@ c #EEEEEE", +". c #EEEEEE s inactive_color_2", ". ", "..", -"+.", -"+.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@.", -"@."}; +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +"..", +}