Merge fixed from Ozone3 to Box

ubuntu/bionic
Julien Lavergne 13 years ago
parent b73028e8d4
commit 095430f18d

@ -73,7 +73,7 @@ PanelApplet .button:prelight {
} }
ClockBox { ClockBox {
text-shadow: 0 1 shade (@dark_bg_color, 1.08); text-shadow: 0 1px shade (@dark_bg_color, 1.08);
} }
WnckPager, WnckTasklist { WnckPager, WnckTasklist {

@ -11,7 +11,7 @@ NautilusWindow * {
/* desktop mode */ /* desktop mode */
.nautilus-desktop.nautilus-canvas-item { .nautilus-desktop.nautilus-canvas-item {
color: @bg_color; 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 { .nautilus-desktop.nautilus-canvas-item:active {
@ -74,12 +74,12 @@ NautilusSearchBar .entry {
.nautilus-cluebar-label { .nautilus-cluebar-label {
font: bold; font: bold;
text-shadow: 0 1 shade (@cluebar_color, 1.06); text-shadow: 0 1px shade (@cluebar_color, 1.06);
} }
.nautilus-cluebar-label:backdrop { .nautilus-cluebar-label:backdrop {
color: mix (@fg_color, @cluebar_color, 0.2); 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, #nautilus-search-button *:active,
@ -108,18 +108,18 @@ NautilusWindow .sidebar .view {
background-color: @dark_bg_color; background-color: @dark_bg_color;
color: @fg_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:backdrop,
NautilusWindow .sidebar .view:backdrop { NautilusWindow .sidebar .view:backdrop {
color: mix (@fg_color, @dark_bg_color, 0.2); 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 { NautilusWindow .sidebar row:selected {
color: @selected_fg_color; 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 { NautilusWindow .sidebar row:selected:backdrop {
@ -129,7 +129,7 @@ NautilusWindow .sidebar row:selected:backdrop {
border-top-color: shade (@dark_bg_color, 0.88); border-top-color: shade (@dark_bg_color, 0.88);
color: @fg_color; 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 { NautilusWindow .sidebar .frame {

@ -18,7 +18,7 @@ UnityPanelWidget,
.unity-panel .menuitem { .unity-panel .menuitem {
border-width: 1px 1px 0 1px; 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, .unity-panel.menubar.menuitem:hover,

@ -16,7 +16,7 @@ GtkWindow:backdrop {
**********/ **********/
*:insensitive:backdrop { *:insensitive:backdrop {
color: mix (shade (@bg_color, 0.6), @bg_color, 0.2); 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 { *:active:backdrop {
@ -93,7 +93,7 @@ GtkScale.slider.vertical:backdrop,
border-left-color: shade (@bg_color, 0.82); border-left-color: shade (@bg_color, 0.82);
color: mix (@fg_color, @bg_color, 0.2); 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-border-gradient: none;
-unico-glow-radius: 0; -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)), 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))); 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-border-color: @transparent;
-unico-focus-outer-stroke-color: alpha (@backdrop_selected_bg_color, 0.2); -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)), from (shade (@bg_color, 1.04)),
to (shade (@bg_color, 0.98))); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 0.88)), from (shade (@bg_color, 0.88)),
@ -772,7 +772,7 @@ GtkScrolledWindow.frame:backdrop {
} }
.sidebar row:selected: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 { .sidebar .frame:backdrop {
@ -847,7 +847,7 @@ GtkSwitch.trough:backdrop {
to (shade (@bg_color, 0.96))); to (shade (@bg_color, 0.96)));
color: mix (@fg_color, @bg_color, 0.17); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 0.75)), from (shade (@bg_color, 0.75)),
@ -863,7 +863,7 @@ GtkSwitch.trough:active:backdrop {
to (shade (@backdrop_selected_bg_color, 0.99))); to (shade (@backdrop_selected_bg_color, 0.99)));
color: @backdrop_selected_fg_color; 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@backdrop_selected_bg_color, 0.75)), from (shade (@backdrop_selected_bg_color, 0.75)),
@ -879,7 +879,7 @@ GtkSwitch.trough:insensitive:backdrop {
to (shade (@bg_color, 0.99))); to (shade (@bg_color, 0.99)));
color: mix (shade (@bg_color, 0.6), @bg_color, 0.17); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 0.8)), from (shade (@bg_color, 0.8)),
@ -934,7 +934,7 @@ GtkTextView:backdrop {
padding: 2px; padding: 2px;
color: shade (#a39e9a, 0.86); /* metacity unfocused color */ 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-border-gradient: none;
-unico-inner-stroke-gradient: none; -unico-inner-stroke-gradient: none;
@ -942,7 +942,7 @@ GtkTextView:backdrop {
} }
.primary-toolbar :insensitive: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, .primary-toolbar GtkComboBox:backdrop,
@ -956,7 +956,7 @@ GtkTextView:backdrop {
padding: 2px; padding: 2px;
color: shade (#a39e9a, 0.86); /* metacity unfocused color */ 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; transition: 0ms ease-in-out;
@ -1025,7 +1025,7 @@ GtkTextView:backdrop {
from (shade (@dark_bg_color, 0.9)), from (shade (@dark_bg_color, 0.9)),
to (shade (@dark_bg_color, 0.95))); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 0.75)), from (shade (@dark_bg_color, 0.75)),
@ -1159,7 +1159,7 @@ GtkTextView:backdrop {
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
padding: 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, -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 1.09)), from (shade (@bg_color, 1.09)),

@ -84,7 +84,7 @@ GtkWindow {
**********/ **********/
*:insensitive { *:insensitive {
color: shade (@bg_color, 0.6); 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 { *:active {
@ -188,7 +188,7 @@ GtkAssistant .sidebar {
border-width: 0 1px 0 0; border-width: 0 1px 0 0;
padding: 12px; padding: 12px;
color: mix (@fg_color, @bg_color, 0.40); 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-border-gradient: none;
-unico-inner-stroke-right-color: shade (@bg_color, 0.94); -unico-inner-stroke-right-color: shade (@bg_color, 0.94);
-unico-inner-stroke-width: 0 1px 0 0; -unico-inner-stroke-width: 0 1px 0 0;
@ -222,7 +222,7 @@ GtkComboBox,
border-style: solid; border-style: solid;
color: @fg_color; 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; transition: 100ms ease-in-out;
@ -285,7 +285,7 @@ GtkComboBox,
from (shade (@button_insensitive_bg_color, 1.04)), from (shade (@button_insensitive_bg_color, 1.04)),
to (shade (@button_insensitive_bg_color, 0.96))); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@button_insensitive_bg_color, 0.8)), from (shade (@button_insensitive_bg_color, 0.8)),
@ -319,7 +319,7 @@ GtkScale.slider.vertical,
border-left-color: shade (@bg_color, 0.78); border-left-color: shade (@bg_color, 0.78);
padding: 3px; 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-border-gradient: none;
-unico-glow-color: shade (@bg_color, 1.02); -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)), from (mix (shade (@selected_bg_color, 1.16), @bg_color, 0.3)),
to (mix (shade (@selected_bg_color, 0.84), @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-border-color: @transparent;
-unico-focus-outer-stroke-color: alpha (@selected_bg_color, 0.2); -unico-focus-outer-stroke-color: alpha (@selected_bg_color, 0.2);
@ -662,7 +662,7 @@ column-header .button,
from (shade (@bg_color, 1.08)), from (shade (@bg_color, 1.08)),
to (shade (@bg_color, 0.92))); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 0.8)), from (shade (@bg_color, 0.8)),
@ -1005,7 +1005,7 @@ DbusmenuGtkMenu .menu,
border-width: 0; border-width: 0;
color: @dark_fg_color; 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; -unico-border-gradient: none;
} }
@ -1091,7 +1091,7 @@ DbusmenuGtkMenu .menuitem,
.menuitem:insensitive, .menuitem:insensitive,
.menuitem *:insensitive { .menuitem *:insensitive {
color: mix (@fg_color, @bg_color, 0.5); 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, Genericmenuitem .menuitem:insensitive,
@ -1103,7 +1103,7 @@ DbusmenuGtkMenu .menuitem *:insensitive,
.primary-toolbar .menuitem:insensitive, .primary-toolbar .menuitem:insensitive,
.primary-toolbar .menuitem *:insensitive { .primary-toolbar .menuitem *:insensitive {
color: mix (@fg_color, @bg_color, 0.5); 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, Genericmenuitem .menuitem.check:active,
@ -1597,7 +1597,7 @@ DbusmenuGtkMenu .menuitem.separator,
} }
.sidebar row:selected { .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 { .sidebar .frame {
@ -1673,7 +1673,7 @@ GtkSwitch.trough {
to (shade (@bg_color, 0.89))); to (shade (@bg_color, 0.89)));
color: @fg_color; 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 0.6)), from (shade (@bg_color, 0.6)),
@ -1690,7 +1690,7 @@ GtkSwitch.trough:active {
to (shade (@selected_bg_color, 0.99))); to (shade (@selected_bg_color, 0.99)));
color: @selected_fg_color; 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@selected_bg_color, 0.7)), from (shade (@selected_bg_color, 0.7)),
@ -1706,7 +1706,7 @@ GtkSwitch.trough:insensitive {
to (shade (@bg_color, 0.99))); to (shade (@bg_color, 0.99)));
color: shade (@bg_color, 0.6); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 0.7)), from (shade (@bg_color, 0.7)),
@ -1768,7 +1768,7 @@ GtkTextView {
padding: 2px; padding: 2px;
color: @fg_color; 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-border-gradient: none;
-unico-inner-stroke-gradient: none; -unico-inner-stroke-gradient: none;
@ -1777,7 +1777,7 @@ GtkTextView {
} }
.primary-toolbar :insensitive { .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, .primary-toolbar GtkComboBox,
@ -1791,7 +1791,7 @@ GtkTextView {
padding: 2px; padding: 2px;
color: @dark_fg_color; 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; transition: 0ms ease-in-out;
@ -1851,7 +1851,7 @@ GtkTextView {
from (shade (@dark_bg_color, 0.9)), from (shade (@dark_bg_color, 0.9)),
to (shade (@dark_bg_color, 0.95))); 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, -unico-border-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@dark_bg_color, 0.76)), from (shade (@dark_bg_color, 0.76)),
@ -1983,7 +1983,7 @@ GtkTextView {
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
padding: 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, -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
from (shade (@bg_color, 1.16)), from (shade (@bg_color, 1.16)),

Loading…
Cancel
Save