From 095430f18dd40c8d84db21bd14d5e1c66610c6d0 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 5 Jul 2012 20:51:57 +0200 Subject: [PATCH] Merge fixed from Ozone3 to Box --- .../gtk-3.0/apps/gnome-panel.css | 2 +- .../Lubuntu-default/gtk-3.0/apps/nautilus.css | 14 +++---- .../Lubuntu-default/gtk-3.0/apps/unity.css | 2 +- .../gtk-3.0/gtk-widgets-backdrop.css | 26 ++++++------- .../Lubuntu-default/gtk-3.0/gtk-widgets.css | 38 +++++++++---------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css index 09928d9..dad0040 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/gnome-panel.css @@ -73,7 +73,7 @@ PanelApplet .button:prelight { } ClockBox { - text-shadow: 0 1 shade (@dark_bg_color, 1.08); + text-shadow: 0 1px shade (@dark_bg_color, 1.08); } WnckPager, WnckTasklist { diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css index 087640a..ae2c30c 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/nautilus.css @@ -11,7 +11,7 @@ NautilusWindow * { /* desktop mode */ .nautilus-desktop.nautilus-canvas-item { color: @bg_color; - text-shadow: 1 1 alpha (#000000, 0.8); + text-shadow: 1px 1px alpha (#000000, 0.8); } .nautilus-desktop.nautilus-canvas-item:active { @@ -74,12 +74,12 @@ NautilusSearchBar .entry { .nautilus-cluebar-label { font: bold; - text-shadow: 0 1 shade (@cluebar_color, 1.06); + text-shadow: 0 1px shade (@cluebar_color, 1.06); } .nautilus-cluebar-label:backdrop { color: mix (@fg_color, @cluebar_color, 0.2); - text-shadow: 0 1 shade (@cluebar_color, 1.02); + text-shadow: 0 1px shade (@cluebar_color, 1.02); } #nautilus-search-button *:active, @@ -108,18 +108,18 @@ NautilusWindow .sidebar .view { background-color: @dark_bg_color; color: @fg_color; - text-shadow: 0 1 shade (@dark_bg_color, 1.04); + text-shadow: 0 1px shade (@dark_bg_color, 1.04); } NautilusWindow .sidebar:backdrop, NautilusWindow .sidebar .view:backdrop { color: mix (@fg_color, @dark_bg_color, 0.2); - text-shadow: 0 1 shade (@dark_bg_color, 1.02); + text-shadow: 0 1px shade (@dark_bg_color, 1.02); } NautilusWindow .sidebar row:selected { color: @selected_fg_color; - text-shadow: 0 -1 shade (@selected_bg_color, 0.8); + text-shadow: 0 -1px shade (@selected_bg_color, 0.8); } NautilusWindow .sidebar row:selected:backdrop { @@ -129,7 +129,7 @@ NautilusWindow .sidebar row:selected:backdrop { border-top-color: shade (@dark_bg_color, 0.88); color: @fg_color; - text-shadow: 0 1 shade (@dark_bg_color, 0.96); + text-shadow: 0 1px shade (@dark_bg_color, 0.96); } NautilusWindow .sidebar .frame { diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css index 74feeaf..0a3ff6c 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/apps/unity.css @@ -18,7 +18,7 @@ UnityPanelWidget, .unity-panel .menuitem { border-width: 1px 1px 0 1px; - icon-shadow: 0 1 shade (@dark_bg_color, 1.06); + icon-shadow: 0 1px shade (@dark_bg_color, 1.06); } .unity-panel.menubar.menuitem:hover, diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css index 5c85bd3..23e9e15 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-backdrop.css @@ -16,7 +16,7 @@ GtkWindow:backdrop { **********/ *:insensitive:backdrop { color: mix (shade (@bg_color, 0.6), @bg_color, 0.2); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.5); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); } *:active:backdrop { @@ -93,7 +93,7 @@ GtkScale.slider.vertical:backdrop, border-left-color: shade (@bg_color, 0.82); color: mix (@fg_color, @bg_color, 0.2); - text-shadow: 0 1 alpha (shade (@button_bg_color, 1.25), 0.16); + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.16); -unico-border-gradient: none; -unico-glow-radius: 0; @@ -183,7 +183,7 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop, from (mix (shade (@backdrop_selected_bg_color, 1.16), @bg_color, 0.3)), to (mix (shade (@backdrop_selected_bg_color, 0.84), @bg_color, 0.3))); - text-shadow: 0 1 alpha (shade (@backdrop_selected_bg_color, 1.26), 0.4); + text-shadow: 0 1px alpha (shade (@backdrop_selected_bg_color, 1.26), 0.4); -unico-focus-border-color: @transparent; -unico-focus-outer-stroke-color: alpha (@backdrop_selected_bg_color, 0.2); @@ -425,7 +425,7 @@ column-header .button:backdrop, from (shade (@bg_color, 1.04)), to (shade (@bg_color, 0.98))); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.4); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.4); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 0.88)), @@ -772,7 +772,7 @@ GtkScrolledWindow.frame:backdrop { } .sidebar row:selected:backdrop { - text-shadow: 0 1 shade (@backdrop_selected_bg_color, 0.7); + text-shadow: 0 1px shade (@backdrop_selected_bg_color, 0.7); } .sidebar .frame:backdrop { @@ -847,7 +847,7 @@ GtkSwitch.trough:backdrop { to (shade (@bg_color, 0.96))); color: mix (@fg_color, @bg_color, 0.17); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.3); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.3); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 0.75)), @@ -863,7 +863,7 @@ GtkSwitch.trough:active:backdrop { to (shade (@backdrop_selected_bg_color, 0.99))); color: @backdrop_selected_fg_color; - text-shadow: 0 1 alpha (shade (@backdrop_selected_bg_color, 1.25), 0.4); + text-shadow: 0 1px alpha (shade (@backdrop_selected_bg_color, 1.25), 0.4); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@backdrop_selected_bg_color, 0.75)), @@ -879,7 +879,7 @@ GtkSwitch.trough:insensitive:backdrop { to (shade (@bg_color, 0.99))); color: mix (shade (@bg_color, 0.6), @bg_color, 0.17); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.5); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 0.8)), @@ -934,7 +934,7 @@ GtkTextView:backdrop { padding: 2px; color: shade (#a39e9a, 0.86); /* metacity unfocused color */ - text-shadow: 0 1 shade (@dark_bg_color, 1.06); + text-shadow: 0 1px shade (@dark_bg_color, 1.06); -unico-border-gradient: none; -unico-inner-stroke-gradient: none; @@ -942,7 +942,7 @@ GtkTextView:backdrop { } .primary-toolbar :insensitive:backdrop { - text-shadow: 0 -1 shade (@dark_bg_color, 0.82); + text-shadow: 0 -1px shade (@dark_bg_color, 0.82); } .primary-toolbar GtkComboBox:backdrop, @@ -956,7 +956,7 @@ GtkTextView:backdrop { padding: 2px; color: shade (#a39e9a, 0.86); /* metacity unfocused color */ - text-shadow: 0 1 shade (@dark_bg_color, 1.06); + text-shadow: 0 1px shade (@dark_bg_color, 1.06); transition: 0ms ease-in-out; @@ -1025,7 +1025,7 @@ GtkTextView:backdrop { from (shade (@dark_bg_color, 0.9)), to (shade (@dark_bg_color, 0.95))); - text-shadow: 0 1 shade (@dark_bg_color, 0.95); + text-shadow: 0 1px shade (@dark_bg_color, 0.95); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.75)), @@ -1159,7 +1159,7 @@ GtkTextView:backdrop { border-width: 1px 0 1px 1px; padding: 1px; - icon-shadow: 0 1 shade (@bg_color, 1.16); + icon-shadow: 0 1px shade (@bg_color, 1.16); -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 1.09)), diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css index 2adc57a..865ad2e 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css @@ -84,7 +84,7 @@ GtkWindow { **********/ *:insensitive { color: shade (@bg_color, 0.6); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.5); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); } *:active { @@ -188,7 +188,7 @@ GtkAssistant .sidebar { border-width: 0 1px 0 0; padding: 12px; color: mix (@fg_color, @bg_color, 0.40); - text-shadow: 0 1 shade (@bg_color, 1.04); + text-shadow: 0 1px shade (@bg_color, 1.04); -unico-border-gradient: none; -unico-inner-stroke-right-color: shade (@bg_color, 0.94); -unico-inner-stroke-width: 0 1px 0 0; @@ -222,7 +222,7 @@ GtkComboBox, border-style: solid; color: @fg_color; - text-shadow: 0 1 alpha (shade (@button_bg_color, 1.25), 0.4); + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); transition: 100ms ease-in-out; @@ -285,7 +285,7 @@ GtkComboBox, from (shade (@button_insensitive_bg_color, 1.04)), to (shade (@button_insensitive_bg_color, 0.96))); - text-shadow: 0 1 alpha (shade (@button_bg_color, 1.25), 0.4); + text-shadow: 0 1px alpha (shade (@button_bg_color, 1.25), 0.4); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@button_insensitive_bg_color, 0.8)), @@ -319,7 +319,7 @@ GtkScale.slider.vertical, border-left-color: shade (@bg_color, 0.78); padding: 3px; - text-shadow: 0 1 alpha (shade (@bg_color, 1.26), 0.5); + text-shadow: 0 1px alpha (shade (@bg_color, 1.26), 0.5); -unico-border-gradient: none; -unico-glow-color: shade (@bg_color, 1.02); @@ -406,7 +406,7 @@ GtkComboBox.combobox-entry .button:insensitive, from (mix (shade (@selected_bg_color, 1.16), @bg_color, 0.3)), to (mix (shade (@selected_bg_color, 0.84), @bg_color, 0.3))); - text-shadow: 0 1 alpha (shade (@selected_bg_color, 1.26), 0.4); + text-shadow: 0 1px alpha (shade (@selected_bg_color, 1.26), 0.4); -unico-focus-border-color: @transparent; -unico-focus-outer-stroke-color: alpha (@selected_bg_color, 0.2); @@ -662,7 +662,7 @@ column-header .button, from (shade (@bg_color, 1.08)), to (shade (@bg_color, 0.92))); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.4); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.4); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 0.8)), @@ -1005,7 +1005,7 @@ DbusmenuGtkMenu .menu, border-width: 0; color: @dark_fg_color; - text-shadow: 0 1 shade (@bg_color, 1.1); + text-shadow: 0 1px shade (@bg_color, 1.1); -unico-border-gradient: none; } @@ -1091,7 +1091,7 @@ DbusmenuGtkMenu .menuitem, .menuitem:insensitive, .menuitem *:insensitive { color: mix (@fg_color, @bg_color, 0.5); - text-shadow: 0 1 shade (@bg_color, 1.14); + text-shadow: 0 1px shade (@bg_color, 1.14); } Genericmenuitem .menuitem:insensitive, @@ -1103,7 +1103,7 @@ DbusmenuGtkMenu .menuitem *:insensitive, .primary-toolbar .menuitem:insensitive, .primary-toolbar .menuitem *:insensitive { color: mix (@fg_color, @bg_color, 0.5); - text-shadow: 0 1 shade (@bg_color, 1.1); + text-shadow: 0 1px shade (@bg_color, 1.1); } Genericmenuitem .menuitem.check:active, @@ -1597,7 +1597,7 @@ DbusmenuGtkMenu .menuitem.separator, } .sidebar row:selected { - text-shadow: 0 1 shade (@selected_bg_color, 0.7); + text-shadow: 0 1px shade (@selected_bg_color, 0.7); } .sidebar .frame { @@ -1673,7 +1673,7 @@ GtkSwitch.trough { to (shade (@bg_color, 0.89))); color: @fg_color; - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.5); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 0.6)), @@ -1690,7 +1690,7 @@ GtkSwitch.trough:active { to (shade (@selected_bg_color, 0.99))); color: @selected_fg_color; - text-shadow: 0 -1 shade (@selected_bg_color, 0.7); + text-shadow: 0 -1px shade (@selected_bg_color, 0.7); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@selected_bg_color, 0.7)), @@ -1706,7 +1706,7 @@ GtkSwitch.trough:insensitive { to (shade (@bg_color, 0.99))); color: shade (@bg_color, 0.6); - text-shadow: 0 1 alpha (shade (@bg_color, 1.25), 0.5); + text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 0.7)), @@ -1768,7 +1768,7 @@ GtkTextView { padding: 2px; color: @fg_color; - text-shadow: 0 1 shade (@bg_color, 1.1); + text-shadow: 0 1px shade (@bg_color, 1.1); -unico-border-gradient: none; -unico-inner-stroke-gradient: none; @@ -1777,7 +1777,7 @@ GtkTextView { } .primary-toolbar :insensitive { - text-shadow: 0 1 shade (@dark_bg_color, 1.1); + text-shadow: 0 1px shade (@dark_bg_color, 1.1); } .primary-toolbar GtkComboBox, @@ -1791,7 +1791,7 @@ GtkTextView { padding: 2px; color: @dark_fg_color; - text-shadow: 0 1 alpha (shade (@dark_bg_color, 1.25), 0.32); + text-shadow: 0 1px alpha (shade (@dark_bg_color, 1.25), 0.32); transition: 0ms ease-in-out; @@ -1851,7 +1851,7 @@ GtkTextView { from (shade (@dark_bg_color, 0.9)), to (shade (@dark_bg_color, 0.95))); - text-shadow: 0 1 shade (@dark_bg_color, 0.99); + text-shadow: 0 1px shade (@dark_bg_color, 0.99); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.76)), @@ -1983,7 +1983,7 @@ GtkTextView { border-width: 1px 0 1px 1px; padding: 1px; - icon-shadow: 0 1 shade (@bg_color, 1.16); + icon-shadow: 0 1px shade (@bg_color, 1.16); -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@bg_color, 1.16)),