diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css index 3b6732f..c968911 100644 --- a/Paper/gtk-3.0/apps/pantheon.css +++ b/Paper/gtk-3.0/apps/pantheon.css @@ -61,6 +61,24 @@ BirdieWidgetsTweetList * { color: white; } +.gala-button { + padding: 3px; + color: #fff; + border: none; + border-radius: 100px; + background-image: linear-gradient(to bottom, + #7e7e7e, + #3e3e3e + ); + box-shadow: inset 0 0 0 1px alpha (#fff, 0.02), + inset 0 1px 0 0 alpha (#fff, 0.07), + inset 0 -1px 0 0 alpha (#fff, 0.01), + 0 0 0 1px alpha (#000, 0.40), + 0 3px 6px alpha (#000, 0.16), + 0 3px 6px alpha (#000, 0.23); + text-shadow: 0 1px 1px alpha (#000, 0.6); +} + /********** * Notify * *********/ @@ -249,6 +267,38 @@ NoiseWidgetsTileView { box-shadow: none; } +.panel .window-frame.menu.csd, +.panel .window-frame.popup.csd { + box-shadow: none; +} + +.panel .menu .window-frame.menu.csd, +.panel .menu .window-frame.popup.csd { + box-shadow: 0 0 0 1px alpha (#000, 0.20), + 0 10px 20px alpha (#000, 0.19), + 0 6px 6px alpha (#000, 0.23); +} + +.composited-indicator { + background-color: transparent; + color: #fff; +} + +.composited-indicator > GtkWidget > GtkWidget:first-child { + padding: 0 2px; +} + +.panel-app-button > GtkWidget > GtkWidget:first-child { + padding: 0 2px 0 4px; +} + +.composited-indicator.menuitem:active, +.composited-indicator.menuitem:prelight { + border-style: none; + background-image: none; + box-shadow: none; +} + /********* * Tweet * ********/ diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css index 26bcf5f..2cb17ed 100644 --- a/Paper/gtk-3.0/widgets/menus.css +++ b/Paper/gtk-3.0/widgets/menus.css @@ -25,6 +25,14 @@ box-shadow: 0 2px 3px 2px @menu_shadow; } +.menu, +.popup { + padding: 4px 0; + border-radius: 4px; + background-color: @background; + color: @text; +} + /*Context Menu*/ .context-menu { @@ -47,7 +55,8 @@ /* Menu Item */ .menuitem, -.menu .menuitem { +.menu .menuitem, +.popup .menuitem { padding-top: 4px; padding-bottom: 4px; padding-left: 6px; @@ -61,7 +70,8 @@ /* Active */ .menuitem:active, -.menu .menuitem:active { +.menu .menuitem:active, +.popup .menuitem:active { background-color: @selection; color: @selection_foreground; @@ -70,7 +80,8 @@ /* Hover*/ .menuitem:hover, -.menu .menuitem:hover{ +.menu .menuitem:hover, +.popup .menuitem:hover{ background-color: @selection; color: @selection_foreground; @@ -146,7 +157,8 @@ padding-right: 2px; } -.menu .menuitem GtkLabel { +.menu .menuitem GtkLabel, +.popup .menuitem GtkLabel { padding-left: 6px; padding-right: 2px; } @@ -156,6 +168,7 @@ /* Images */ .menuitem GtkImage, .menu .menuitem GtkImage, +.popup .menuitem GtkImage, .menu .menuitem .menu .menuitem GtkImage, .menu .menuitem .menu .menuitem .menu .menuitem GtkImage { color: @text; @@ -211,12 +224,14 @@ /* Labels */ .menuitem GtkLabel, .menu .menuitem GtkLabel, +.popup .menuitem GtkLabel, .menu .menuitem .menu .menuitem GtkLabel, .menu .menuitem .menu .menuitem .menu .menuitem GtkLabel { color: @text; } .menu .menuitem:active GtkLabel, +.popup .menuitem:active GtkLabel, .menu .menuitem .menu .menuitem:active GtkLabel, .menu .menuitem .menu .menuitem .menu .menuitem:active GtkLabel, .menu .menuitem:hover GtkLabel, @@ -232,6 +247,7 @@ } .menu .menuitem:backdrop GtkLabel, +.popup .menuitem:backdrop GtkLabel, .menu .menuitem .menu .menuitem:backdrop GtkLabel, .menu .menuitem .menu .menuitem .menu .menuitem:backdrop GtkLabel, .menu .menuitem:active:backdrop GtkLabel, @@ -247,6 +263,7 @@ } .menu .menuitem:insensitive GtkLabel, +.popup .menuitem:insensitive GtkLabel, .menu .menuitem .menu .menuitem:insensitive GtkLabel, .menu .menuitem .menu .menuitem .menu .menuitem:insensitive GtkLabel, .menuitem:insensitive GtkLabel { @@ -254,6 +271,7 @@ } .menu .menuitem:insensitive:backdrop GtkLabel, +.popup .menuitem:insensitive:backdrop GtkLabel, .menu .menuitem .menu .menuitem:insensitive:backdrop GtkLabel, .menu .menuitem .menu .menuitem .menu .menuitem:insensitive:backdrop GtkLabel, .menuitem:insensitive:backdrop GtkLabel { diff --git a/Paper/metacity-1/metacity-theme-2.xml b/Paper/metacity-1/metacity-theme-2.xml index 6859762..e8d94b3 100644 --- a/Paper/metacity-1/metacity-theme-2.xml +++ b/Paper/metacity-1/metacity-theme-2.xml @@ -63,11 +63,9 @@ - - - - - + + + diff --git a/Paper/metacity-1/metacity-theme-3.xml b/Paper/metacity-1/metacity-theme-3.xml index 0f67407..1521f2b 100644 --- a/Paper/metacity-1/metacity-theme-3.xml +++ b/Paper/metacity-1/metacity-theme-3.xml @@ -23,7 +23,7 @@ Sam Hewitt <hewittsamuel@gmail> ÂSam Hewitt, 2014 2014 - Paper Mutter Theme + Paper Metacity Theme @@ -63,11 +63,9 @@ - - - - - + + + @@ -132,36 +130,25 @@ + - - <title version=">= 3.1" - x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width)))" - y="(0 `max` ((height - title_height) / 2))" - ellipsize_width="width" - color="C_title_focused" /> </draw_ops> <draw_ops name="title_unfocused"> - <title version="< 3.1" - x="(0 `max` ((width - title_width) / 2))" + <title x="(0 `max` ((width - title_width) / 2)) + 2" 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)))" - y="(0 `max` ((height - title_height) / 2))" - ellipsize_width="width" - color="C_title_unfocused"/> + color="C_title_unfocused" /> </draw_ops> <!-- WINDOW DECORATIONS --> <draw_ops name="entire_background_focused"> - <rectangle color="C_titlebar" x="1" 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"> @@ -169,7 +156,7 @@ </draw_ops> <draw_ops name="titlebar_fill_focused"> - <rectangle color="C_titlebar" x="1" 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"> @@ -177,7 +164,7 @@ </draw_ops> <draw_ops name="titlebar_fill_unfocused"> - <rectangle color="C_titlebar_unfocused" x="1" y="0" width="width" height="height" filled="true" /> + <rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" /> </draw_ops> <draw_ops name="titlebar_focused"> @@ -193,11 +180,11 @@ </draw_ops> <draw_ops name="border_focused"> - <rectangle color="C_border_focused" x="1" y="0" width="width-1" height="height-1" filled="false" /> + <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="1" y="0" width="width-1" height="height-1" filled="false" /> + <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"> @@ -205,10 +192,10 @@ <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="1" y="0" width="3" height="3" start_angle="270" 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="1" y="0" width="3" height="3" start_angle="270" 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> @@ -217,10 +204,10 @@ <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="1" y="0" width="3" height="3" start_angle="270" 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="1" y="0" width="3" height="3" start_angle="270" 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> @@ -257,148 +244,150 @@ <!-- Close icon --> <draw_ops name="close_focused"> - <image filename="close_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="close_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_focused_prelight"> - <image filename="close_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="close_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_focused_pressed"> - <image filename="close_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="close_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused"> - <image filename="close_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="close_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused_prelight"> - <image filename="close_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="close_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="close_unfocused_pressed"> - <image filename="close_unfocused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="close_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <!-- Maximize icon --> -<draw_ops name="maximize_focused_normal"> - <image filename="maximize_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> +<draw_ops name="maximize_focused"> + <image filename="maximize_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_focused_prelight"> - <image filename="maximize_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="maximize_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_focused_pressed"> - <image filename="maximize_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="maximize_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused"> - <image filename="maximize_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="maximize_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused_prelight"> - <image filename="maximize_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="maximize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="maximize_unfocused_pressed"> - <image filename="maximize_unfocused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="maximize_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <!-- Unmaximize icon --> -<draw_ops name="unmaximize_focused_normal"> - <image filename="unmaximize_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> +<draw_ops name="unmaximize_focused"> + <image filename="unmaximize_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_focused_prelight"> - <image filename="unmaximize_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unmaximize_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_focused_pressed"> - <image filename="unmaximize_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unmaximize_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_unfocused"> - <image filename="unmaximize_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unmaximize_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_unfocused_prelight"> - <image filename="unmaximize_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unmaximize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unmaximize_unfocused_pressed"> - <image filename="unmaximize_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unmaximize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <!-- Minimize icon --> -<draw_ops name="minimize_focused_normal"> - <image filename="minimize_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> +<draw_ops name="minimize_focused"> + <image filename="minimize_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_focused_prelight"> - <image filename="minimize_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="minimize_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_focused_pressed"> - <image filename="minimize_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="minimize_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused"> - <image filename="minimize_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="minimize_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused_prelight"> - <image filename="minimize_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="minimize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="minimize_unfocused_pressed"> - <image filename="minimize_unfocused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="minimize_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <!-- Menu icon --> -<draw_ops name="menu_focused_normal"> - <image filename="menu_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> +<draw_ops name="menu_focused"> + <image filename="menu_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="menu_focused_prelight"> - <image filename="menu_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="menu_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="menu_focused_pressed"> - <image filename="menu_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="menu_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="menu_unfocused"> - <image filename="menu_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="menu_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="menu_unfocused_prelight"> - <image filename="menu_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="menu_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="menu_unfocused_pressed"> - <image filename="menu_unfocused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="menu_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> + <!-- Shade icon --> -<draw_ops name="shade_focused_normal"> - <image filename="shade_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> +<draw_ops name="shade_focused"> + <image filename="shade_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_focused_prelight"> - <image filename="shade_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="shade_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_focused_pressed"> - <image filename="shade_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="shade_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused"> - <image filename="shade_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="shade_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused_prelight"> - <image filename="shade_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="shade_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="shade_unfocused_pressed"> - <image filename="shade_unfocused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="shade_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <!-- Unshade icon --> -<draw_ops name="unshade_focused_normal"> - <image filename="unshade_focused_normal.png" x="1" y="2" width="object_width" height="object_height" /> +<draw_ops name="unshade_focused"> + <image filename="unshade_focused_normal.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_focused_prelight"> - <image filename="unshade_focused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unshade_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_focused_pressed"> - <image filename="unshade_focused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unshade_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused"> - <image filename="unshade_unfocused.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unshade_unfocused.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused_prelight"> - <image filename="unshade_unfocused_prelight.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unshade_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> <draw_ops name="unshade_unfocused_pressed"> - <image filename="unshade_unfocused_pressed.png" x="1" y="2" width="object_width" height="object_height" /> + <image filename="unshade_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" /> </draw_ops> + <!-- FRAME STYLES --> <frame_style name="normal_focused" geometry="normal"> <piece position="entire_background" draw_ops="entire_background_focused" /> @@ -408,19 +397,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -474,19 +463,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -540,19 +529,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -607,19 +596,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -674,19 +663,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -740,19 +729,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -944,19 +933,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -1011,19 +1000,19 @@ <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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_normal" /> + <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" /> @@ -1098,25 +1087,16 @@ <!-- 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_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" /> @@ -1161,18 +1141,6 @@ <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_style_set> - - <!-- WINDOWS --> <window type="normal" style_set="normal_style_set" /> <window type="dialog" style_set="dialog_style_set" /> @@ -1180,6 +1148,5 @@ <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> +</metacity_theme> \ No newline at end of file diff --git a/install.sh b/install.sh index 33ae2f4..f717bdb 100755 --- a/install.sh +++ b/install.sh @@ -67,7 +67,20 @@ elif [ "$UID" -ne "$ROOT_UID" ]; then ;; esac fi - cp -R ./Paper/ $HOME/.local/share/themes/ + # .local/share/themes + if [ -d $HOME/.local/share/themes ]; then + cp -R ./Paper/ $HOME/.local/share/themes/ + else + mkdir -p $HOME/.local/share/themes + cp -R ./Paper/ $HOME/.local/share/themes/ + fi + # ./themes + if [ -d $HOME/./themes ]; then + cp -R ./Paper/ $HOME/./themes/ + else + mkdir -p $HOME/./themes + cp -R ./Paper/ $HOME/.local/share/themes/ + fi echo "Installation complete!" fi }