diff --git a/Paper/gtk-3.0/apps/gnome.css b/Paper/gtk-3.0/apps/gnome.css index 030d810..c8c64b8 100644 --- a/Paper/gtk-3.0/apps/gnome.css +++ b/Paper/gtk-3.0/apps/gnome.css @@ -67,6 +67,3 @@ CheeseThumbView /* Cheese */ { -EogScrollView-shadow-type: none; } - - - diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css index 1f2e18b..e6629fe 100644 --- a/Paper/gtk-3.0/apps/nautilus.css +++ b/Paper/gtk-3.0/apps/nautilus.css @@ -100,7 +100,7 @@ NautilusWindow .dynamic-notebook tab.right:active { } .nautilus-desktop.nautilus-canvas-item:active { - color: @theme_text_color; + color: @text; } .nautilus-desktop.nautilus-canvas-item:selected { diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css index 656d67e..c55a41d 100644 --- a/Paper/gtk-3.0/widgets/menus.css +++ b/Paper/gtk-3.0/widgets/menus.css @@ -29,7 +29,6 @@ .popup { padding: 4px 0; background-color: @base; - color: @foreground; } /*Context Menu*/ @@ -43,13 +42,11 @@ padding: 0 1px; background-color: @base; background-image: none; - color: @foreground; } .content-view .menu .menuitem:active, .content-view .menu .menuitem:hover { background-color: @selection; - color: @base; } /* Menu Item */ @@ -61,7 +58,6 @@ padding-left: 6px; padding-right: 6px; border:none; - color: @foreground; -GtkMenuItem-arrow-scaling: 0.5; -gtk-icon-style: symbolic; @@ -72,7 +68,6 @@ .menu .menuitem:active, .popup .menuitem:active { background-color: @selection; - color: @selection_foreground; -gtk-icon-style: symbolic; } @@ -82,7 +77,6 @@ .menu .menuitem:hover, .popup .menuitem:hover{ background-color: @selection; - color: @selection_foreground; -gtk-icon-style: symbolic; } @@ -91,19 +85,16 @@ .menu .menuitem:backdrop { box-shadow: none; border: none; - color: @backdrop_text; } .menuitem:insensitive, .menu .menuitem:insensitive { box-shadow: none; border: none; - color: @insensitive_text; } /* Arrows */ .menu .menuitem.arrow { - color: @foreground; } .menu .menuitem.arrow { @@ -118,7 +109,6 @@ padding-left: 2px; padding-right: 2px; border: none; - color: @separator; -GtkMenuItem-horizontal-padding: 0; -GtkWidget-separator-height: 1; } @@ -127,26 +117,22 @@ border: none; background-color: @base; background-image: none; - color: @foreground; } .menuitem .entry:active, .menuitem .entry:focus { border: none; - color: @foreground; } /* Accelerators */ .menuitem .accelerator, .menuitem .accelerator:insensitive { background: none; - color: alpha(@foreground, 0.7); } .menuitem .accelerator:hover, .menuitem .accelerator:active { background: none; - color: alpha (@foreground, 0.3); } @@ -163,116 +149,3 @@ } /* Something is utterly broken where I've had to do this ugly bit of styling. */ - -/* Images */ -.menuitem GtkImage, -.menu .menuitem GtkImage, -.popup .menuitem GtkImage, -.menu .menuitem .menu .menuitem GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem GtkImage { - color: @foreground; -} - -.menu .menuitem:active GtkImage, -.menu .menuitem .menu .menuitem:active GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:active GtkImage, -.menu .menuitem:hover GtkImage, -.menu .menuitem .menu .menuitem:hover GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:hover GtkImage, -.menu .menuitem:focus GtkImage, -.menu .menuitem .menu .menuitem:focus GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:focus GtkImage, -.menuitem:active GtkImage, -.menuitem:focus GtkImage, -.menuitem:hover GtkImage { - color: @selected_foreground; -} - -.menu .menuitem:backdrop GtkImage, -.menu .menuitem .menu .menuitem:backdrop GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:backdrop GtkImage, -.menu .menuitem:active:backdrop GtkImage, -.menu .menuitem .menu .menuitem:active:backdrop GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:active:backdrop GtkImage, -.menu .menuitem:backdrop:hover GtkImage, -.menu .menuitem .menu .menuitem:backdrop:hover GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:backdrop:hover GtkImage, -.menuitem:backdrop GtkImage, -.menuitem:backdrop:hover GtkImage, -.menuitem:active:backdrop GtkImage { - color: @backdrop_text; - -gtk-image-effect: dim; -} - -.menu .menuitem:insensitive GtkImage, -.menu .menuitem .menu .menuitem:insensitive GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:insensitive GtkImage, -.menuitem:insensitive GtkImage { - color: @insensitive_text; - -gtk-image-effect: dim; -} - -.menu .menuitem:insensitive:backdrop GtkImage, -.menu .menuitem .menu .menuitem:insensitive:backdrop GtkImage, -.menu .menuitem .menu .menuitem .menu .menuitem:insensitive:backdrop GtkImage, -.menuitem:insensitive:backdrop GtkImage { - color: mix(@backdrop_text, @insensitive_text, 0.5); - -gtk-image-effect: dim; -} - -/* Labels */ -.menuitem GtkLabel, -.menu .menuitem GtkLabel, -.popup .menuitem GtkLabel, -.menu .menuitem .menu .menuitem GtkLabel, -.menu .menuitem .menu .menuitem .menu .menuitem GtkLabel { - color: @foreground; -} - -.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, -.menu .menuitem .menu .menuitem:hover GtkLabel, -.menu .menuitem .menu .menuitem .menu .menuitem:hover GtkLabel, -.menu .menuitem:focus GtkLabel, -.menu .menuitem .menu .menuitem:focus GtkLabel, -.menu .menuitem .menu .menuitem .menu .menuitem:focus GtkLabel, -.menuitem:active GtkLabel, -.menuitem:focus GtkLabel, -.menuitem:hover GtkLabel { - color: @selected_foreground; -} - -.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, -.menu .menuitem .menu .menuitem:active:backdrop GtkLabel, -.menu .menuitem .menu .menuitem .menu .menuitem:active:backdrop GtkLabel, -.menu .menuitem:backdrop:hover GtkLabel, -.menu .menuitem .menu .menuitem:backdrop:hover GtkLabel, -.menu .menuitem .menu .menuitem .menu .menuitem:backdrop:hover GtkLabel, -.menuitem:backdrop GtkLabel, -.menuitem:backdrop:hover GtkLabel, -.menuitem:active:backdrop GtkLabel { - color: @backdrop_text; -} - -.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 { - color: @insensitive_text; -} - -.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 { - color: mix(@backdrop_text, @insensitive_text, 0.5); -} \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/sidebar.css b/Paper/gtk-3.0/widgets/sidebar.css index 777a269..91e2872 100644 --- a/Paper/gtk-3.0/widgets/sidebar.css +++ b/Paper/gtk-3.0/widgets/sidebar.css @@ -29,10 +29,6 @@ color: @foreground; } -.sidebar .separator { - color: transparent; -} - GtkDialog .sidebar, GtkDialog .sidebar .view, GtkDialog .sidebar GtkScrolledWindow { @@ -110,7 +106,7 @@ GtkDialog .sidebar .view:hover:selected:backdrop { border-width: 0; -GtkPaned-handle-size: 1; background-image: none; - background-color: shade (@background, 0.75); + /*background-color: shade (@background, 0.75);*/ } .sidebar .scrollbar.trough, diff --git a/Paper/gtk-3.0/widgets/tooltips.css b/Paper/gtk-3.0/widgets/tooltips.css index f736b3d..24c8d87 100644 --- a/Paper/gtk-3.0/widgets/tooltips.css +++ b/Paper/gtk-3.0/widgets/tooltips.css @@ -8,7 +8,7 @@ border-style: none; border-radius: 5px; - background-color: alpha(@panel, 0.9); + background-color: alpha(@panel, 0.95); color: white; text-shadow: 1px 1px #000; diff --git a/src/wm/wm-assets.svg b/src/wm/wm-assets.svg index d35f044..51732a6 100644 --- a/src/wm/wm-assets.svg +++ b/src/wm/wm-assets.svg @@ -34,17 +34,17 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="135.52074" - inkscape:cy="62.31017" + inkscape:cx="133.049" + inkscape:cy="77.4181" inkscape:current-layer="layer4" showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:showpageshadow="false" - inkscape:window-width="1366" - inkscape:window-height="711" - inkscape:window-x="0" - inkscape:window-y="27" + inkscape:window-width="1301" + inkscape:window-height="744" + inkscape:window-x="65" + inkscape:window-y="24" width="400px" height="300px" inkscape:snap-nodes="true"